From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- .../cinnamon-2.2.6-automagic-gnome-bluetooth.patch | 44 ---------------------- .../cinnamon/files/cinnamon-2.8.0-background.patch | 26 ------------- .../cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch | 19 ---------- .../polkit-cinnamon-authentication-agent-1.desktop | 9 ----- 4 files changed, 98 deletions(-) delete mode 100644 gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch delete mode 100644 gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch delete mode 100644 gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch delete mode 100644 gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop (limited to 'gnome-extra/cinnamon/files') diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch deleted file mode 100644 index aa2e82bd13fa..000000000000 --- a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 40750fc87b7a1cad60d0e605732b9df50dd16c11 Mon Sep 17 00:00:00 2001 -From: root -Date: Sun, 8 Jan 2012 13:55:05 +0000 -Subject: [PATCH] Fix automagic gnome-bluetooth dependency - -https://bugs.gentoo.org/show_bug.cgi?id=398145 - -Ed Catmur 2012-01-08 13:46:22 UTC -libgnome-bluetooth-applet is a private library so they shouldn't be linking -against it anyway. I tried to work out how to tell libtool to add it to rpath -but got totally lost. - -I'll see if I can work out how to fix the automagic gnome-bluetooth dependency -so I can at least merge USE=-bluetooth. ---- - configure.ac | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c0e43e1..bc764e1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) - PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0) - - AC_MSG_CHECKING([for bluetooth support]) -+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) -+AS_IF([test "x$with_bluetooth" != "xno"], [ - PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], - [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` - BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` -@@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], - [AC_DEFINE([HAVE_BLUETOOTH],[0]) - AC_SUBST([HAVE_BLUETOOTH],[0]) - AC_MSG_RESULT([no])]) -+], [AC_DEFINE([HAVE_BLUETOOTH],[0]) -+ AC_SUBST([HAVE_BLUETOOTH],[0]) -+ AC_MSG_RESULT([no])]) - - MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin` - MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin` --- -1.9.2 - diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch deleted file mode 100644 index d9c14144cb52..000000000000 --- a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -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/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py -+++ b/files/usr/share/cinnamon/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-3.6.6-wheel-sudo.patch b/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch deleted file mode 100644 index 50512c3ab371..000000000000 --- a/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -index 8028727..85497c8 100755 ---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -839,11 +839,11 @@ class Module: - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) - description = "%s\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: -- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username]) - else: -- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) -+ subprocess.call(["usermod", username, "-G", "%s" % username]) - self.load_groups() - dialog.destroy() - diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop deleted file mode 100644 index 24e14f267e23..000000000000 --- a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=PolicyKit Authentication Agent -Exec=/usr/libexec/polkit-gnome-authentication-agent-1 -Terminal=false -Type=Application -Categories= -NoDisplay=true -OnlyShowIn=X-Cinnamon; -X-GNOME-AutoRestart=true -- cgit v1.2.3