tetromino 15/06/14 01:59:41 Added: cinnamon-2.6.7-set-wheel.patch cinnamon-2.6.7-optional-networkmanager.patch Log: Version bump (bug #549916), see http://segfault.linuxmint.com/2015/06/cinnamon-2-6/ for release notes. Drop old. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.1 gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch?rev=1.1&content-type=text/plain Index: cinnamon-2.6.7-set-wheel.patch =================================================================== >From 387df8aa7c950ab546a52edb36b39db5252dcd1e Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue <e...@gentoo.org> 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 1.1 gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch?rev=1.1&content-type=text/plain Index: cinnamon-2.6.7-optional-networkmanager.patch =================================================================== >From 3dbb6dc0b3dd08e6d5ae24fa079d9443c1b66ab9 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <tetrom...@gentoo.org> Date: Sat, 10 May 2014 15:14:05 -0400 Subject: [PATCH] Make networkmanager dependency optional for Gentoo --- configure.ac | 35 ++++++++++++++++++++++++++++++++++- js/misc/config.js.in | 2 ++ src/Makefile.am | 5 ++++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b5668f4..5f600dd 100644 --- a/configure.ac +++ b/configure.ac @@ -82,7 +82,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_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 atk-bridge-2.0) + atk-bridge-2.0) + +########################## +# 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 0b0a4a9..cf3a606 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -290,7 +290,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.4.3