[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/files/, gnome-extra/cinnamon/

[Pacho Ramos]

commit:     0ee44a691cc7d89a97230afd67e5d729c0b164d7
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 15:00:04 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 16:26:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee44a69

gnome-extra/cinnamon: Drop old

Package-Manager: portage-2.3.0_rc1

 gnome-extra/cinnamon/Manifest                      |   1 -
 gnome-extra/cinnamon/cinnamon-2.8.6.ebuild         | 247 ---------------------
 .../cinnamon/files/cinnamon-2.4.5-background.patch |  26 ---
 .../cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch |  43 ----
 .../cinnamon-2.4.5-optional-networkmanager.patch   |  89 --------
 .../cinnamon/files/cinnamon-2.4.5-set-wheel.patch  |  70 ------
 .../cinnamon-2.6.13-test-recorder-includes.patch   |  36 ---
 .../cinnamon/files/cinnamon-2.6.7-set-wheel.patch  |  73 ------
 8 files changed, 585 deletions(-)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 0bece92..a48cff1 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-2.8.6.tar.gz 3025161 SHA256 c262ae64320d4db8bffdfa7f05ab5a82449e96035b35dd8fb9353741323cb9a2 SHA512 fb683aaea1704eec5a1d2221d55c5e0e6530897f7aefc6ff9b9ff9d15818737a0d5d15aaa1d1f830e1f01e462324db026ac8c4475e39630cd6fd4a67dca9bddf WHIRLPOOL 488c215daf441be87d8f552bd4f0d8e55683286db143b2fbe5f8dd43a53df8e5c1e03b9230708ca149b85e3d9a93df58618b50afa014755a5ea943e33123edb8
 DIST cinnamon-2.8.8.tar.gz 3026643 SHA256 33f838cb9c1d4213ebb18d5869949757dda97a6e0745f224d06be75de69caee7 SHA512 e41fae744ea2dfcb3589a47f689b230369a8dc4c3682f3cc15836a9be6c67fd1cd872223084b518cd422057431ea77f7df67055757b5cd43e5e96cb3cb3a2ec5 WHIRLPOOL 1cb5e0b13814d4b21e7711ad0d5754aa85c36e4616d48e7dbebad1bd7d34b928a5b4d4d55b6fd12fb2b44c96b22535ca68b3b6542af99306a609cbc58ea59784

diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
deleted file mode 100644
index 6601403..0000000
--- a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python_targets_python2_7
-	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
-"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.8.0
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.5[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[python_targets_python2_7]
-	dev-python/gconf-python:2[python_targets_python2_7]
-	dev-python/lxml[python_targets_python2_7]
-	dev-python/pexpect[python_targets_python2_7]
-	dev-python/pycairo[python_targets_python2_7]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[python_targets_python2_7]
-	dev-python/pypam[python_targets_python2_7]
-	dev-python/pillow[python_targets_python2_7]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die
-	fi
-
-	epatch_user
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-}

diff --git a/gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch
deleted file mode 100644
index 7277fb2..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Sun, 11 Jan 2015 20:33:37 +0100
-Subject: [PATCH 1/5] Use gnome backgrounds since Cinnamon isn't providing any
-
-https://github.com/linuxmint/Cinnamon/issues/3575
----
- files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-index bf6dc39..83a8b04 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-@@ -198,7 +198,7 @@ class Module:
-     def get_system_backgrounds(self):
-         picture_list = []
-         folder_list = []
--        properties_dir = "/usr/share/cinnamon-background-properties"
-+        properties_dir = "/usr/share/gnome-background-properties"
-         backgrounds = []
-         if os.path.exists(properties_dir):
-             for i in os.listdir(properties_dir):
--- 
-2.2.1
-

diff --git a/gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch
deleted file mode 100644
index 1af0e64..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b048ad4144607cad258e4193235abeb3930ffcab Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Sun, 11 Jan 2015 20:51:55 +0100
-Subject: [PATCH 5/5] Fix theme compatibility with Gnome 3.14
-
-from Fedora/Arch
-
-https://github.com/linuxmint/Cinnamon/issues/3577
----
- data/theme/cinnamon.css                              | 3 ++-
- files/usr/lib/cinnamon-settings/modules/cs_themes.py | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/data/theme/cinnamon.css b/data/theme/cinnamon.css
-index 9539586..d931b86 100644
---- a/data/theme/cinnamon.css
-+++ b/data/theme/cinnamon.css
-@@ -1444,7 +1444,8 @@ StScrollBar StButton#vhandle:hover {
- }
- .applet-box:hover .applet-icon {
- 	color: #fff;
--	icon-shadow: white 0px 0px 3px;
-+/* Broken with GNOME 3.14 (icon-size is not honoured)
-+ *	icon-shadow: white 0px 0px 3px;*/
- }
- 
- /* ===================================================================
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_themes.py b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
-index 3002499..ab8b0b3 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
-@@ -244,7 +244,7 @@ class Module:
-     
-     def _load_icon_themes(self):
-         dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
-+        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:
--- 
-2.2.1
-

diff --git a/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch
deleted file mode 100644
index 2fe3eff..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From e89cbae294685195de51aca1e8e6cd400dc0822b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-Date: Sat, 10 May 2014 15:14:05 -0400
-Subject: [PATCH 3/5] Make networkmanager dependency optional for Gentoo
-
----
- configure.ac         | 36 ++++++++++++++++++++++++++++++++++--
- js/misc/config.js.in |  2 ++
- src/Makefile.am      |  5 ++++-
- 3 files changed, 40 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1977da8..920d256 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
- 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
-                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
-                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
--                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
-+
-+##########################
-+# Check for NetworkManager
-+##########################
-+NM_MIN_VERSION=0.9
-+AC_ARG_ENABLE(networkmanager,
-+              AS_HELP_STRING([--disable-networkmanager],
-+                             [disable NetworkManager support @<:@default=auto@:>@]),,
-+              [enable_networkmanager=auto])
-+
-+if test "x$enable_networkmanager" != "xno"; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER,
-+                     [libnm-glib libnm-util gnome-keyring-1],
-+                     [have_networkmanager=yes],
-+                     [have_networkmanager=no])
-+
-+   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
-+   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
-+else
-+   have_networkmanager="no  (disabled)"
-+fi
-+
-+if test "x$have_networkmanager" = "xyes"; then
-+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-+else
-+   if test "x$enable_networkmanager" = "xyes"; then
-+      AC_MSG_ERROR([Couldn't find NetworkManager.])
-+   fi
-+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-+fi
-+
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
- 
- PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION)
- 
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 704989b..df7e014 100644
---- a/js/misc/config.js.in
-+++ b/js/misc/config.js.in
-@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- const GJS_VERSION = '@GJS_VERSION@';
- /* 1 if gnome-bluetooth is available, 0 otherwise */
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-+/* 1 if networkmanager is available, 0 otherwise */
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* The system TLS CA list */
- const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c0c6e7e..fc2dd14 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -286,7 +286,10 @@ libcinnamon_la_LIBADD =		\
- libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
- 
- Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
-+if HAVE_NETWORKMANAGER
-+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
-+endif
- Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
--- 
-2.2.1
-

diff --git a/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch
deleted file mode 100644
index db27d4c..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 916b13aa2b86eb7e14f539293a0059a95c936393 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Sun, 11 Jan 2015 20:50:13 +0100
-Subject: [PATCH 4/5] Use wheel group instead of sudo
-
-from Fedora/Arch
-
-https://github.com/linuxmint/Cinnamon/issues/3576
----
- .../cinnamon-settings-users/cinnamon-settings-users.py  | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-index c4de658..d9062dc 100755
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -145,12 +145,11 @@ class EditableEntry (Gtk.Notebook):
- 
- class PasswordDialog(Gtk.Dialog):
- 
--    def __init__ (self, user, password_mask, group_mask):            
-+    def __init__ (self, user, password_mask):
-         super(PasswordDialog, self).__init__()
- 
-         self.user = user
-         self.password_mask = password_mask
--        self.group_mask = group_mask
- 
-         self.set_modal(True)
-         self.set_skip_taskbar_hint(True)
-@@ -216,12 +215,6 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
-         newpass = self.new_password.get_text()
-         self.user.set_password(newpass, "")
--        os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
--        mask = self.group_mask.get_text()
--        mask = mask.split(", ")
--        mask.remove("nopasswdlogin")
--        mask = ", ".join(mask)
--        self.group_mask.set_text(mask)        
-         self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-         self.destroy()  
- 
-@@ -516,7 +509,7 @@ class Module:
-         model, treeiter = self.users_treeview.get_selection().get_selected()
-         if treeiter != None:
-             user = model[treeiter][INDEX_USER_OBJECT]       
--            dialog = PasswordDialog(user, self.password_mask, self.groups_label)                
-+            dialog = PasswordDialog(user, self.password_mask)
-             response = dialog.run()
- 
-     def _on_groups_button_clicked(self, widget): 
-@@ -753,11 +746,11 @@ class Module:
-             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
-             piter = self.users.append(None, [new_user, pixbuf, description])
--            # Add the user to his/her own group and sudo if Administrator was selected
-+            # Add the user to his/her own group and wheel if Administrator was selected
-             if dialog.account_type_combo.get_active() == 1:
--                os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) 
-+                os.system("usermod %s -G %s,wheel" % (username, username))
-             else:
--                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+                os.system("usermod %s -G %s" % (username, username))
-             self.load_groups()
-         dialog.destroy()
- 
--- 
-2.2.1
-

diff --git a/gnome-extra/cinnamon/files/cinnamon-2.6.13-test-recorder-includes.patch b/gnome-extra/cinnamon/files/cinnamon-2.6.13-test-recorder-includes.patch
deleted file mode 100644
index 3ed2c3a..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.6.13-test-recorder-includes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From cf960f096e426521fc898733580d47c725e52953 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-Date: Sun, 6 Sep 2015 14:53:48 -0400
-Subject: [PATCH] build: append ST_CFLAGS when building test-recorder
-
-test-recorder #includes st.h, which pulls in lots of headers, some of which
-might not be in TEST_CINNAMON_RECORDER_CFLAGS, depending on how clutter and
-gstreamer were configured.
-
-Fixes build failure reported at https://bugs.gentoo.org/559794 :
-
-In file included from ./st/st-bin.h:27:0,
-                 from st.h:4,
-                 from cinnamon-recorder.c:19:
-./st/st-types.h:26:21: fatal error: gtk/gtk.h: No such file or directory
----
- src/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3d8fdd3..e6e54a9 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -199,7 +199,8 @@ libcinnamon_la_SOURCES += $(cinnamon_recorder_sources) $(cinnamon_recorder_non_g
- 
- noinst_PROGRAMS += test-recorder
- 
--test_recorder_CPPFLAGS = $(TEST_CINNAMON_RECORDER_CFLAGS)
-+test_recorder_CPPFLAGS = $(TEST_CINNAMON_RECORDER_CFLAGS) \
-+                       $(ST_CFLAGS)
- test_recorder_LDADD = $(TEST_CINNAMON_RECORDER_LIBS) \
-                        libst-1.0.la
- 
--- 
-2.5.1
-

diff --git a/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch
deleted file mode 100644
index 386f815..0000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 387df8aa7c950ab546a52edb36b39db5252dcd1e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Sun, 11 Jan 2015 20:50:13 +0100
-Subject: [PATCH] Use wheel group instead of sudo
-
-from Fedora/Arch
-
-https://github.com/linuxmint/Cinnamon/issues/3576
----
- .../cinnamon-settings-users.py                       | 20 ++++++--------------
- 1 file changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-index 6fa9374..364c155 100755
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -146,12 +146,11 @@ class EditableEntry (Gtk.Notebook):
- 
- class PasswordDialog(Gtk.Dialog):
- 
--    def __init__ (self, user, password_mask, group_mask):            
-+    def __init__ (self, user, password_mask):
-         super(PasswordDialog, self).__init__()
- 
-         self.user = user
-         self.password_mask = password_mask
--        self.group_mask = group_mask
- 
-         self.set_modal(True)
-         self.set_skip_taskbar_hint(True)
-@@ -217,14 +216,7 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
-         newpass = self.new_password.get_text()
-         self.user.set_password(newpass, "")
--        mask = self.group_mask.get_text()
--        if "nopasswdlogin" in mask:
--            os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
--            mask = mask.split(", ")
--            mask.remove("nopasswdlogin")
--            mask = ", ".join(mask)
--            self.group_mask.set_text(mask)
--            self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-+        self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-         self.destroy()  
- 
-     def set_passwords_visibility(self):
-@@ -522,7 +514,7 @@ class Module:
-         model, treeiter = self.users_treeview.get_selection().get_selected()
-         if treeiter != None:
-             user = model[treeiter][INDEX_USER_OBJECT]       
--            dialog = PasswordDialog(user, self.password_mask, self.groups_label)                
-+            dialog = PasswordDialog(user, self.password_mask)
-             response = dialog.run()
- 
-     def _on_groups_button_clicked(self, widget): 
-@@ -766,11 +758,11 @@ class Module:
-             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
-             piter = self.users.append(None, [new_user, pixbuf, description])
--            # Add the user to his/her own group and sudo if Administrator was selected
-+            # Add the user to his/her own group and wheel if Administrator was selected
-             if dialog.account_type_combo.get_active() == 1:
--                os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) 
-+                os.system("usermod %s -G %s,wheel" % (username, username))
-             else:
--                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+                os.system("usermod %s -G %s" % (username, username))
-             self.load_groups()
-         dialog.destroy()
- 
--- 
-2.4.3
-