[arch-commits] Commit in cinnamon/trunk (PKGBUILD gnome-3.14.patch set_wheel.patch)
Balló György
bgyorgy at archlinux.org
Sun Jun 28 11:51:28 UTC 2015
Date: Sunday, June 28, 2015 @ 13:51:28
Author: bgyorgy
Revision: 136032
upgpkg: cinnamon 2.6.11-1
Update to version 2.6.11
Modified:
cinnamon/trunk/PKGBUILD
cinnamon/trunk/gnome-3.14.patch
cinnamon/trunk/set_wheel.patch
------------------+
PKGBUILD | 10 +++++-----
gnome-3.14.patch | 13 -------------
set_wheel.patch | 45 ++++++++++++++++++++++++++++++++++++++++++---
3 files changed, 47 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-06-28 11:33:42 UTC (rev 136031)
+++ PKGBUILD 2015-06-28 11:51:28 UTC (rev 136032)
@@ -5,7 +5,7 @@
# Contributor: CReimer
pkgname=cinnamon
-pkgver=2.6.9
+pkgver=2.6.11
pkgrel=1
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus' 'python2-pillow'
'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
- 'network-manager-applet' 'nemo' 'polkit-gnome' 'python3')
+ 'network-manager-applet' 'nemo' 'polkit-gnome')
makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
options=('!emptydirs')
install=${pkgname}.install
@@ -25,9 +25,9 @@
"set_wheel.patch"
"gnome-3.14.patch"
"default-theme.patch")
-sha256sums=('9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756'
- '0f6a4055fc70f727b90c3d97ebc99f6bf3028b8cc7189736d8e0f1dac6fac137'
- 'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058'
+sha256sums=('ff81da04f076bd978e3a8d9001656ab60cd95a945603827f67214cb113f3fff6'
+ '2f0fec7d733aa19be426a0e1aecff1af451183de038d2868a2ee3195f227956e'
+ '5ecce3c1617c0479ef97290494aaaa4e5a58d24de31d00a527d44921e2a44d91'
'566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
prepare() {
Modified: gnome-3.14.patch
===================================================================
--- gnome-3.14.patch 2015-06-28 11:33:42 UTC (rev 136031)
+++ gnome-3.14.patch 2015-06-28 11:51:28 UTC (rev 136032)
@@ -1,16 +1,3 @@
-diff -Naur Cinnamon-2.2.16.orig/data/theme/cinnamon.css Cinnamon-2.2.16/data/theme/cinnamon.css
---- Cinnamon-2.2.16.orig/data/theme/cinnamon.css 2014-08-12 13:00:36.000000000 +0200
-+++ Cinnamon-2.2.16/data/theme/cinnamon.css 2014-10-01 02:51:45.859630151 +0200
-@@ -1445,7 +1445,8 @@
- .applet-icon: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 -Naur Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py
--- Cinnamon-2.2.16.orig/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200
+++ Cinnamon-2.2.16/files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200
Modified: set_wheel.patch
===================================================================
--- set_wheel.patch 2015-06-28 11:33:42 UTC (rev 136031)
+++ set_wheel.patch 2015-06-28 11:51:28 UTC (rev 136032)
@@ -1,6 +1,45 @@
--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -745,11 +738,11 @@ class Module:
+@@ -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,14 +215,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):
+@@ -517,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):
+@@ -756,11 +748,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])
@@ -11,7 +50,7 @@
+ os.system("usermod %s -G %s,wheel" % (username, username))
else:
- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+ os.system("usermod %s -G users,nopasswdlogin" % username)
++ os.system("usermod %s -G %s" % (username, username))
self.load_groups()
dialog.destroy()
-
+
More information about the arch-commits
mailing list