commit: 7e53e87235caa74039ec782888d2f0c665214d13
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 22:07:23 2017 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 22:15:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e53e872
gnome-extra/cinnamon: Bump min dep versions and reapply wheel patch
Package-Manager: Portage-2.3.13, Repoman-2.3.3
...cinnamon-3.6.6.ebuild => cinnamon-3.6.6-r1.ebuild} | 6 ++++--
gnome-extra/cinnamon/cinnamon-3.6.6.ebuild | 14 +++++++-------
.../cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch | 19 +++++++++++++++++++
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
b/gnome-extra/cinnamon/cinnamon-3.6.6-r1.ebuild
similarity index 97%
copy from gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
copy to gnome-extra/cinnamon/cinnamon-3.6.6-r1.ebuild
index 16d2c5e028c..8ecd59c4bce 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r1.ebuild
@@ -87,8 +87,6 @@ RDEPEND="${COMMON_DEPEND}
>=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
@@ -147,6 +145,10 @@ src_prepare() {
# Fix automagic gnome-bluetooth dep, bug #398145
eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+ # Use wheel group instead of sudo (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3576
+ eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.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
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
index 16d2c5e028c..23734530bbd 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild
@@ -41,9 +41,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libxml2:2
gnome-base/gconf:2[introspection]
gnome-base/librsvg
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
- >=gnome-extra/cinnamon-menus-3.0[introspection]
- >=gnome-extra/cjs-3.2.0
+ >=gnome-extra/cinnamon-desktop-3.6:0=[introspection]
+ >=gnome-extra/cinnamon-menus-3.6[introspection]
+ >=gnome-extra/cjs-3.6.0
>=media-libs/clutter-1.10:1.0[introspection]
media-libs/cogl:1.0=[introspection]
>=gnome-base/gsettings-desktop-schemas-2.91.91
@@ -57,7 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=x11-libs/startup-notification-0.11
x11-libs/libX11
>=x11-libs/libXfixes-5.0
- >=x11-wm/muffin-3.2.0[introspection]
+ >=x11-wm/muffin-3.6.0[introspection]
networkmanager? (
gnome-base/libgnome-keyring
>=net-misc/networkmanager-0.8.999:=[introspection] )
@@ -107,9 +107,9 @@ RDEPEND="${COMMON_DEPEND}
x11-themes/gnome-themes-standard
x11-themes/adwaita-icon-theme
- >=gnome-extra/nemo-2.4
- >=gnome-extra/cinnamon-control-center-2.4
- >=gnome-extra/cinnamon-screensaver-2.4
+ >=gnome-extra/nemo-3.6
+ >=gnome-extra/cinnamon-control-center-3.6
+ >=gnome-extra/cinnamon-screensaver-3.6
gnome-extra/polkit-gnome
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
new file mode 100644
index 00000000000..50512c3ab37
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch
@@ -0,0 +1,19 @@
+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 = "<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:
+- 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()
+
