eva 15/01/11 22:46:15
Added: cinnamon-2.4.5-gnome-3.14.patch
cinnamon-2.4.5-set-wheel.patch
cinnamon-2.4.5-optional-networkmanager.patch
cinnamon-2.4.5-background.patch
Log:
Version bump for Cinnamon 2.4, bug #529880.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
C6085806)
Revision Changes Path
1.1 gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch?rev=1.1&content-type=text/plain
Index: cinnamon-2.4.5-gnome-3.14.patch
===================================================================
>From b048ad4144607cad258e4193235abeb3930ffcab Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <[email protected]>
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
1.1 gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch?rev=1.1&content-type=text/plain
Index: cinnamon-2.4.5-set-wheel.patch
===================================================================
>From 916b13aa2b86eb7e14f539293a0059a95c936393 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <[email protected]>
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
1.1
gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch?rev=1.1&content-type=text/plain
Index: cinnamon-2.4.5-optional-networkmanager.patch
===================================================================
>From e89cbae294685195de51aca1e8e6cd400dc0822b Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <[email protected]>
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
1.1 gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch?rev=1.1&content-type=text/plain
Index: cinnamon-2.4.5-background.patch
===================================================================
>From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <[email protected]>
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
