summaryrefslogtreecommitdiffstats
path: root/pkgs/desktops/cinnamon
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-14 14:50:51 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-14 23:55:47 +0100
commitad80ae008a5ad4ff4b569eabba6608aca7acacb4 (patch)
treeb169363bfc867b3056a89a387ba2e9024c8680a3 /pkgs/desktops/cinnamon
parent07f07f2d300e2a80c68b030a58692c2543c23646 (diff)
cinnamon: remove dead packages
Broken since April 2014. Never more than a handful of basic framework packages, had most of its work ahead of it. Almost immediately abandoned, and the maintainer vanished. Close #2132.
Diffstat (limited to 'pkgs/desktops/cinnamon')
-rw-r--r--pkgs/desktops/cinnamon/automount-plugin.patch448
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-control-center.nix41
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-desktop.nix42
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-session.nix49
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix53
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-translations.nix28
-rw-r--r--pkgs/desktops/cinnamon/cjs.nix42
-rw-r--r--pkgs/desktops/cinnamon/dpms.patch30
-rw-r--r--pkgs/desktops/cinnamon/gtkdoc.patch41
-rw-r--r--pkgs/desktops/cinnamon/keyboard.patch4729
-rw-r--r--pkgs/desktops/cinnamon/muffin.nix47
-rw-r--r--pkgs/desktops/cinnamon/region.patch5314
-rw-r--r--pkgs/desktops/cinnamon/remove-sessionmigration.patch19
-rw-r--r--pkgs/desktops/cinnamon/systemd-support.patch536
-rw-r--r--pkgs/desktops/cinnamon/timeout.patch26
15 files changed, 0 insertions, 11445 deletions
diff --git a/pkgs/desktops/cinnamon/automount-plugin.patch b/pkgs/desktops/cinnamon/automount-plugin.patch
deleted file mode 100644
index 3d90da99f088..000000000000
--- a/pkgs/desktops/cinnamon/automount-plugin.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in
---- cinnamon-settings-daemon-2.0.6.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-03 10:50:04.000000000 -0500
-+++ cinnamon-settings-daemon-2.0.6/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-05 15:33:21.112912392 -0500
-@@ -2,6 +2,7 @@
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins" path="/org/cinnamon/settings-daemon/plugins/">
- <child name="a11y-keyboard" schema="org.cinnamon.settings-daemon.plugins.a11y-keyboard"/>
- <child name="a11y-settings" schema="org.cinnamon.settings-daemon.plugins.a11y-settings"/>
-+ <child name="automount" schema="org.cinnamon.settings-daemon.plugins.automount"/>
- <child name="clipboard" schema="org.cinnamon.settings-daemon.plugins.clipboard"/>
- <child name="color" schema="org.cinnamon.settings-daemon.plugins.color"/>
- <child name="cursor" schema="org.cinnamon.settings-daemon.plugins.cursor"/>
-@@ -42,6 +43,18 @@
- <_summary>Priority to use for this plugin</_summary>
- <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
- </key>
-+ </schema>
-+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.automount" path="/org/cinnamon/settings-daemon/plugins/automount/">
-+ <key name="active" type="b">
-+ <default>true</default>
-+ <_summary>Activation of this plugin</_summary>
-+ <_description>Whether this plugin would be activated by cinnamon-settings-daemon or not</_description>
-+ </key>
-+ <key name="priority" type="i">
-+ <default>97</default>
-+ <_summary>Priority to use for this plugin</_summary>
-+ <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
-+ </key>
- </schema>
- <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.clipboard" path="/org/cinnamon/settings-daemon/plugins/clipboard/">
- <key name="active" type="b">
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in 1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in 2013-10-08 22:35:10.771472456 +0200
-@@ -0,0 +1,8 @@
-+[Cinnamon Settings Plugin]
-+Module=automount
-+IAge=0
-+_Name=Automount
-+_Description=Automounter plugin
-+Authors=Tomas Bzatek
-+Copyright=Copyright © 2010 Red Hat, Inc.
-+Website=
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c 2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c 1970-01-01 01:00:00.000000000 +0100
-@@ -1,65 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2010 Red Hat, Inc.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
-- *
-- * Author: Tomas Bzatek <tbzatek@redhat.com>
-- */
--
--#include "config.h"
--
--#include <glib.h>
--#include <glib/gi18n.h>
--#include <unistd.h>
--#include <gtk/gtk.h>
--
--#include "csd-automount-manager.h"
--
--int
--main (int argc,
-- char **argv)
--{
-- GMainLoop *loop;
-- CsdAutomountManager *manager;
-- GError *error = NULL;
--
-- g_type_init ();
-- gtk_init (&argc, &argv);
--
-- bindtextdomain (GETTEXT_PACKAGE, CINNAMON_SETTINGS_LOCALEDIR);
-- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-- textdomain (GETTEXT_PACKAGE);
--
-- loop = g_main_loop_new (NULL, FALSE);
-- manager = csd_automount_manager_new ();
--
-- csd_automount_manager_start (manager, &error);
--
-- if (error != NULL) {
-- g_printerr ("Unable to start the mount manager: %s",
-- error->message);
--
-- g_error_free (error);
-- _exit (1);
-- }
--
-- g_main_loop_run (loop);
--
-- csd_automount_manager_stop (manager);
-- g_main_loop_unref (loop);
--
-- return 0;
--}
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in 2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in 1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
--[Desktop Entry]
--_Name=Mount Helper
--_Comment=Automount and autorun plugged devices
--Exec=@LIBEXECDIR@/cinnamon-fallback-mount-helper
--Icon=drive-optical
--Terminal=false
--Type=Application
--Categories=
--NoDisplay=true
--OnlyShowIn=GNOME;
--X-GNOME-Autostart-Notify=true
--
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c 1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c 2013-10-08 22:35:10.771472456 +0200
-@@ -0,0 +1,106 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#include "config.h"
-+
-+#include <glib/gi18n-lib.h>
-+#include <gmodule.h>
-+
-+#include "cinnamon-settings-plugin.h"
-+#include "csd-automount-plugin.h"
-+#include "csd-automount-manager.h"
-+
-+struct CsdAutomountPluginPrivate {
-+ CsdAutomountManager *manager;
-+};
-+
-+#define CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginPrivate))
-+
-+CINNAMON_SETTINGS_PLUGIN_REGISTER (CsdAutomountPlugin, csd_automount_plugin)
-+
-+static void
-+csd_automount_plugin_init (CsdAutomountPlugin *plugin)
-+{
-+ plugin->priv = CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE (plugin);
-+
-+ g_debug ("Automount plugin initializing");
-+
-+ plugin->priv->manager = csd_automount_manager_new ();
-+}
-+
-+static void
-+csd_automount_plugin_finalize (GObject *object)
-+{
-+ CsdAutomountPlugin *plugin;
-+
-+ g_return_if_fail (object != NULL);
-+ g_return_if_fail (CSD_IS_AUTOMOUNT_PLUGIN (object));
-+
-+ g_debug ("Automount plugin finalizing");
-+
-+ plugin = CSD_AUTOMOUNT_PLUGIN (object);
-+
-+ g_return_if_fail (plugin->priv != NULL);
-+
-+ if (plugin->priv->manager != NULL) {
-+ g_object_unref (plugin->priv->manager);
-+ }
-+
-+ G_OBJECT_CLASS (csd_automount_plugin_parent_class)->finalize (object);
-+}
-+
-+static void
-+impl_activate (CinnamonSettingsPlugin *plugin)
-+{
-+ gboolean res;
-+ GError *error;
-+
-+ g_debug ("Activating automount plugin");
-+
-+ error = NULL;
-+ res = csd_automount_manager_start (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager, &error);
-+ if (! res) {
-+ g_warning ("Unable to start automount manager: %s", error->message);
-+ g_error_free (error);
-+ }
-+}
-+
-+static void
-+impl_deactivate (CinnamonSettingsPlugin *plugin)
-+{
-+ g_debug ("Deactivating automount plugin");
-+ csd_automount_manager_stop (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager);
-+}
-+
-+static void
-+csd_automount_plugin_class_init (CsdAutomountPluginClass *klass)
-+{
-+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+ CinnamonSettingsPluginClass *plugin_class = CINNAMON_SETTINGS_PLUGIN_CLASS (klass);
-+
-+ object_class->finalize = csd_automount_plugin_finalize;
-+
-+ plugin_class->activate = impl_activate;
-+ plugin_class->deactivate = impl_deactivate;
-+
-+ g_type_class_add_private (klass, sizeof (CsdAutomountPluginPrivate));
-+}
-+
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h 1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h 2013-10-08 22:35:10.771472456 +0200
-@@ -0,0 +1,60 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#ifndef __CSD_AUTOMOUNT_PLUGIN_H__
-+#define __CSD_AUTOMOUNT_PLUGIN_H__
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+#include <gmodule.h>
-+
-+#include "cinnamon-settings-plugin.h"
-+
-+G_BEGIN_DECLS
-+
-+#define CSD_TYPE_AUTOMOUNT_PLUGIN (csd_automount_plugin_get_type ())
-+#define CSD_AUTOMOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPlugin))
-+#define CSD_AUTOMOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
-+#define CSD_IS_AUTOMOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CSD_TYPE_AUTOMOUNT_PLUGIN))
-+#define CSD_IS_AUTOMOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CSD_TYPE_AUTOMOUNT_PLUGIN))
-+#define CSD_AUTOMOUNT_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
-+
-+typedef struct CsdAutomountPluginPrivate CsdAutomountPluginPrivate;
-+
-+typedef struct
-+{
-+ CinnamonSettingsPlugin parent;
-+ CsdAutomountPluginPrivate *priv;
-+} CsdAutomountPlugin;
-+
-+typedef struct
-+{
-+ CinnamonSettingsPluginClass parent_class;
-+} CsdAutomountPluginClass;
-+
-+GType csd_automount_plugin_get_type (void) G_GNUC_CONST;
-+
-+/* All the plugins must implement this function */
-+G_MODULE_EXPORT GType register_cinnamon_settings_plugin (GTypeModule *module);
-+
-+G_END_DECLS
-+
-+#endif /* __CSD_AUTOMOUNT_PLUGIN_H__ */
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am 2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am 2013-10-08 22:48:19.240865461 +0200
-@@ -1,38 +1,87 @@
--libexec_PROGRAMS = cinnamon-fallback-mount-helper
-+NULL =
-
--cinnamon_fallback_mount_helper_SOURCES = \
-- cinnamon-fallback-mount-helper.c \
-- csd-automount-manager.c \
-- csd-automount-manager.h \
-- csd-autorun.c \
-- csd-autorun.h
-+plugin_name = automount
-
--cinnamon_fallback_mount_helper_CPPFLAGS = \
-+libexec_PROGRAMS = csd-test-automount
-+
-+csd_test_automount_SOURCES = \
-+ test-automount.c \
-+ csd-automount-manager.h \
-+ csd-automount-manager.c \
-+ csd-autorun.c \
-+ csd-autorun.h \
-+ $(NULL)
-+
-+csd_test_automount_CPPFLAGS = \
- -I$(top_srcdir)/cinnamon-settings-daemon \
-+ -I$(top_srcdir)/plugins/common \
- -DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- $(AM_CPPFLAGS)
-
--cinnamon_fallback_mount_helper_CFLAGS = \
-+csd_test_automount_CFLAGS = \
-+ $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(SYSTEMD_CFLAGS) \
- $(AUTOMOUNT_CFLAGS)
-+ $(AM_CFLAGS)
-+
-+csd_test_automount_LDADD = \
-+ $(top_builddir)/cinnamon-settings-daemon/libcsd.la \
-+ $(SETTINGS_PLUGIN_LIBS) \
-+ $(SYSTEMD_LIBS) \
-+ $(AUTOMOUNT_LIBS) \
-+ $(NULL)
-+
-+plugin_LTLIBRARIES = \
-+ libautomount.la \
-+ $(NULL)
-+
-+libautomount_la_SOURCES = \
-+ csd-automount-plugin.h \
-+ csd-automount-plugin.c \
-+ csd-automount-manager.h \
-+ csd-automount-manager.c \
-+ csd-autorun.c \
-+ csd-autorun.h \
-+ $(NULL)
-+
-+libautomount_la_CPPFLAGS = \
-+ -I$(top_srcdir)/cinnamon-settings-daemon \
-+ -DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-+ $(AM_CPPFLAGS)
-+
-+libautomount_la_CFLAGS = \
-+ $(SETTINGS_PLUGIN_CFLAGS) \
-+ $(SYSTEMD_CFLAGS) \
-+ $(AUTOMOUNT_CFLAGS) \
-+ $(AM_CFLAGS)
-+
-+libautomount_la_LDFLAGS = \
-+ $(CSD_PLUGIN_LDFLAGS) \
-+ $(NULL)
-
--cinnamon_fallback_mount_helper_LDADD = \
-+libautomount_la_LIBADD = \
- $(SETTINGS_PLUGIN_LIBS) \
- $(SYSTEMD_LIBS) \
- $(AUTOMOUNT_LIBS) \
-- $(top_builddir)/cinnamon-settings-daemon/libcsd.la
-+ $(NULL)
-
--autostartdir = $(datadir)/applications
--autostart_in_files = cinnamon-fallback-mount-helper.desktop.in
--autostart_in_in_files = cinnamon-fallback-mount-helper.desktop.in.in
--autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-+plugin_in_files = \
-+ automount.cinnamon-settings-plugin.in \
-+ $(NULL)
-
--$(autostart_in_files): $(autostart_in_in_files)
-- @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+plugin_DATA = $(plugin_in_files:.cinnamon-settings-plugin.in=.cinnamon-settings-plugin)
-
--@INTLTOOL_DESKTOP_RULE@
-+EXTRA_DIST = \
-+ $(plugin_in_files) \
-+ $(NULL)
-
--EXTRA_DIST = $(autostart_in_in_files)
-+CLEANFILES = \
-+ $(plugin_DATA) \
-+ $(NULL)
-
--CLEANFILES = $(autostart_DATA) $(autostart_in_files)
-+DISTCLEANFILES = \
-+ $(plugin_DATA) \
-+ $(NULL)
-+
-+@CSD_INTLTOOL_PLUGIN_RULE@
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c 1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c 2013-10-08 22:42:53.759486525 +0200
-@@ -0,0 +1,7 @@
-+#define NEW csd_automount_manager_new
-+#define START csd_automount_manager_start
-+#define STOP csd_automount_manager_stop
-+#define MANAGER CsdAutomountManager
-+#include "csd-automount-manager.h"
-+
-+#include "test-plugin.h"
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in cinnamon-settings-daemon-2.0.1/po/POTFILES.in
---- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in 2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/po/POTFILES.in 2013-10-08 22:35:10.771472456 +0200
-@@ -18,8 +18,9 @@
- plugins/a11y-keyboard/csd-a11y-preferences-dialog.c
- [type: gettext/glade]plugins/a11y-keyboard/csd-a11y-preferences-dialog.ui
- [type: gettext/ini]plugins/a11y-settings/a11y-settings.cinnamon-settings-plugin.in
--plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
-+[type: gettext/ini]plugins/automount/automount.cinnamon-settings-plugin.in
- plugins/automount/csd-automount-manager.c
-+plugins/automount/csd-automount-plugin.c
- plugins/automount/csd-autorun.c
- [type: gettext/ini]plugins/background/background.cinnamon-settings-plugin.in
- [type: gettext/ini]plugins/clipboard/clipboard.cinnamon-settings-plugin.in
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip cinnamon-settings-daemon-2.0.1/po/POTFILES.skip
---- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip 2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/po/POTFILES.skip 2013-10-08 22:37:20.224645009 +0200
-@@ -20,6 +20,5 @@
- data/org.cinnamon.settings-daemon.plugins.updates.gschema.xml.in
- data/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml.in
- data/org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml.in
--plugins/automount/gnome-fallback-mount-helper.desktop.in
- plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
- plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center.nix b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
deleted file mode 100644
index 97489a7ec087..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-control-center.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify,
-gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, libpulseaudio, isocodes, kerberos,
-libxkbfile}:
-
-let
- version = "2.0.9";
-in
-stdenv.mkDerivation {
- name = "cinnamon-control-center-${version}";
-
- src = fetchurl {
- url = "http://github.com/linuxmint/cinnamon-control-center/archive/${version}.tar.gz";
- sha256 = "0kivqdgsf8w257j2ja6fap0dpvljcnb9gphr3knp7y6ma2d1gfv3";
- };
-
- configureFlags = "--enable-systemd --disable-update-mimedb" ;
-
- patches = [ ./region.patch];
-
- buildInputs = [
- pkgconfig autoreconfHook
- glib gettext gnome_common
- intltool libxslt gtk3 cinnamon-desktop
- libnotify gnome-menus libxml2 systemd
- upower cinnamon-settings-daemon colord
- polkit ibus libcanberra_gtk3 libpulseaudio
- isocodes kerberos libxkbfile ];
-
- preBuild = "patchShebangs ./scripts";
-
- meta = {
- homepage = "http://cinnamon.linuxmint.com";
- description = "The cinnamon session files" ;
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.roelof ];
-
- broken = true;
- };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
deleted file mode 100644
index 8ead149fc2b1..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, intltool
-, glib, gobjectIntrospection, gdk_pixbuf, gtk3, gnome_common
-, xorg, xkeyboard_config
-}:
-
-let
- version = "2.0.4";
-in
-stdenv.mkDerivation {
- name = "cinnamon-desktop-${version}";
-
- src = fetchurl {
- url = "http://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz";
- sha256 = "1cywin712558pv58c0cr73m25hfcv5x8pv5frvqjr9gwr2gpi6h3";
- };
-
- NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
- buildInputs = with xorg; [
- pkgconfig autoreconfHook intltool
- glib gobjectIntrospection gdk_pixbuf gtk3 gnome_common
- xkeyboard_config libxkbfile libX11 libXrandr libXext
- ];
-
- meta = {
- homepage = "http://cinnamon.linuxmint.com";
- description = "Library and data for various Cinnamon modules";
-
- longDescription = ''
- The libcinnamon-desktop library provides API shared by several applications
- on the desktop, but that cannot live in the platform for various
- reasons. There is no API or ABI guarantee, although we are doing our
- best to provide stability. Documentation for the API is available with
- gtk-doc.
- '';
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.roelof ];
-
- broken = true;
- };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix
deleted file mode 100644
index d84438b7bd14..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-session.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib
-, upower, json_glib,intltool, systemd, hicolor_icon_theme, xorg, makeWrapper, cinnamon-desktop }:
-
-let
- version = "2.0.6";
-in
-stdenv.mkDerivation {
- name = "cinnamon-session-${version}";
-
- src = fetchurl {
- url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz";
- sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3";
- };
-
-
- configureFlags = "--enable-systemd --disable-gconf" ;
-
- patches = [ ./remove-sessionmigration.patch ./timeout.patch];
-
- buildInputs = [
- pkgconfig autoreconfHook
- glib gettext gnome_common
- gtk3 dbus_glib upower json_glib
- intltool systemd xorg.xtrans
- makeWrapper
- cinnamon-desktop /*gschemas*/
- ];
-
- preBuild = "patchShebangs ./scripts";
-
-
- postFixup = ''
- rm $out/share/icons/hicolor/icon-theme.cache
-
- for f in "$out/bin/"*; do
- wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- meta = {
- homepage = "http://cinnamon.linuxmint.com";
- description = "The cinnamon session files" ;
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.roelof ];
-
- broken = true;
- };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
deleted file mode 100644
index 550a7acaf62e..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3,
-libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, libpulseaudio, upower, libcanberra_gtk3, colord,
-systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}:
-
-let
- version = "2.0.10";
-in
-stdenv.mkDerivation {
- name = "cinnamon-settings-daemon-${version}";
-
- src = fetchurl {
- url = "http://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz";
- sha256 = "10r75xsngb7ipv9fy07dyfb256bqybzcxbwny60sgjhrksk3v9mg";
- };
-
- NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
- configureFlags = "--enable-systemd" ;
-
- patches = [ ./systemd-support.patch ./automount-plugin.patch ./dpms.patch];
-
- buildInputs = [
- pkgconfig autoreconfHook
- glib gettext gnome_common
- intltool gtk3 libnotify lcms2
- libgnomekbd libxklavier colord
- libcanberra libpulseaudio upower
- libcanberra_gtk3 cinnamon-desktop
- systemd libxslt docbook_xsl makeWrapper
- gsettings_desktop_schemas
- ];
-
- preBuild = "patchShebangs ./scripts";
-
- #ToDo: missing org.cinnamon.gschema.xml, probably not packaged yet
- postFixup = ''
- for f in "$out/libexec/"*; do
- wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
-
- meta = {
- homepage = "http://cinnamon.linuxmint.com";
- description = "The cinnamon session files" ;
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.roelof ];
-
- broken = true;
- };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix
deleted file mode 100644
index 91a7acdef82b..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-translations.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-let
- version = "2.0.3";
-in
-stdenv.mkDerivation {
- name = "cinnamon-translations-${version}";
-
- src = fetchurl {
- url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
- sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
- };
-
- installPhase =
- ''
- mkdir -pv $out/share/cinnamon/locale
- cp -av "mo-export/"* $out/share/cinnamon/locale/
- '';
-
- meta = {
- homepage = "http://cinnamon.linuxmint.com";
- description = "Translations files for the Cinnamon desktop" ;
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.roelof ];
-
- broken = true;
- };
-}
diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix
deleted file mode 100644
index 5d5847615653..000000000000
--- a/pkgs/desktops/cinnamon/cjs.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, python
-, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection
-}:
-
-let
- version="2.0.0";
-in
-stdenv.mkDerivation rec {
- name = "cjs-${version}";
-
- src = fetchurl {
- url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz";
- sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig";
- };
-
- buildInputs = [
- pkgconfig autoreconfHook python
- dbus_glib cairo spidermonkey_185
- gobjectIntrospection
- ];
-
- preBuild = "patchShebangs ./scripts";
-
- meta = {
- homepage = "http://cinnamon.linuxmint.com";
- description = "JavaScript bindings for Cinnamon" ;
-
- longDescription = ''
- This module contains JavaScript bindings based on gobject-introspection.
-
- Because JavaScript is pretty free-form, consistent coding style and unit tests
- are critical to give it some structure and keep it readable.
- We propose that all GNOME usage of JavaScript conform to the style guide
- in doc/Style_Guide.txt to help keep things sane.
- '';
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.roelof ];
-
- broken = true;
- };
-}
diff --git a/pkgs/desktops/cinnamon/dpms.patch b/pkgs/desktops/cinnamon/dpms.patch
deleted file mode 100644
index a73f33dc6182..000000000000
--- a/pkgs/desktops/cinnamon/dpms.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
--- a/plugins/power/csd-power-manager.c
-+++ b/plugins/power/csd-power-manager.c
-@@ -33,6 +33,8 @@
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-
-+#include <X11/extensions/dpms.h>
-+
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libcinnamon-desktop/gnome-rr.h>
-
-@@ -3967,6 +3790,17 @@ csd_power_manager_start (CsdPowerManager
- /* set the initial dim time that can adapt for the user */
- refresh_idle_dim_settings (manager);
-
-+ /* Make sure that Xorg's DPMS extension never gets in our way. The defaults seem to have changed in Xorg 1.14
-+ * being "0" by default to being "600" by default
-+ * https://bugzilla.gnome.org/show_bug.cgi?id=709114
-+ */
-+ gdk_error_trap_push ();
-+ int dummy;
-+ if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) {
-+ DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0);
-+ }
-+ gdk_error_trap_pop_ignored ();
-+
- manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
- disable_builtin_screensaver,
- NULL);
diff --git a/pkgs/desktops/cinnamon/gtkdoc.patch b/pkgs/desktops/cinnamon/gtkdoc.patch
deleted file mode 100644
index 6398306a76ae..000000000000
--- a/pkgs/desktops/cinnamon/gtkdoc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/meta/prefs.h
-+++ b/src/meta/prefs.h
-@@ -310,13 +310,13 @@ typedef struct
- */
- GSList *bindings;
-
-- /** for keybindings that can have shift or not like Alt+Tab */
-+ /* for keybindings that can have shift or not like Alt+Tab */
- gboolean add_shift:1;
-
-- /** for keybindings that apply only to a window */
-+ /* for keybindings that apply only to a window */
- gboolean per_window:1;
-
-- /** for keybindings not added with meta_display_add_keybinding() */
-+ /* for keybindings not added with meta_display_add_keybinding() */
- gboolean builtin:1;
- } MetaKeyPref;
-
-@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi
- MetaPlacementMode meta_prefs_get_placement_mode (void);
-
- #endif
--
--
---- a/src/core/workspace.c
-+++ b/src/core/workspace.c
-@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen)
- return workspace;
- }
-
--/** Foreach function for workspace_free_struts() */
-+/* Foreach function for workspace_free_struts() */
- static void
- free_this (gpointer candidate, gpointer dummy)
- {
-@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace
- {
- return workspace->screen;
- }
--
diff --git a/pkgs/desktops/cinnamon/keyboard.patch b/pkgs/desktops/cinnamon/keyboard.patch
deleted file mode 100644
index f67d961ff58f..000000000000
--- a/pkgs/desktops/cinnamon/keyboard.patch
+++ /dev/null
@@ -1,4729 +0,0 @@
-
-diff -uNrp a/cinnamon-settings-daemon/main