[arch-commits] Commit in cinnamon/trunk (PKGBUILD set_wheel.patch)

[Alexandre Filgueira]

    Date: Tuesday, June 2, 2015 @ 01:15:54
  Author: faidoc
Revision: 134507

upgpkg: cinnamon 2.6.6-1

Modified:
  cinnamon/trunk/PKGBUILD
  cinnamon/trunk/set_wheel.patch

-----------------+
 PKGBUILD        |    8 ++++----
 set_wheel.patch |   38 +-------------------------------------
 2 files changed, 5 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-01 23:08:38 UTC (rev 134506)
+++ PKGBUILD	2015-06-01 23:15:54 UTC (rev 134507)
@@ -5,7 +5,7 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.4.8
+pkgver=2.6.6
 pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
          'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
          'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
          'network-manager-applet' 'nemo' 'polkit-gnome')
-makedepends=('gnome-common' 'intltool' 'gobject-introspection')
+makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
 options=('!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
@@ -25,8 +25,8 @@
         "set_wheel.patch"
         "gnome-3.14.patch"
         "default-theme.patch")
-sha256sums=('5dc693cb57adce95cf917c94ee4e02fa8740e5cd5edbd8ee9cdeed81604aefd3'
-            '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
+sha256sums=('e0207d1cda13ccbe51f78be7f35096a758c94e130cca09adffb996cd9feb5918'
+            '0f6a4055fc70f727b90c3d97ebc99f6bf3028b8cc7189736d8e0f1dac6fac137'
             'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058'
             '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
 

Modified: set_wheel.patch
===================================================================
--- set_wheel.patch	2015-06-01 23:08:38 UTC (rev 134506)
+++ set_wheel.patch	2015-06-01 23:15:54 UTC (rev 134507)
@@ -1,41 +1,5 @@
 --- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
 +++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -144,12 +144,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)
-@@ -215,12 +214,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()  
- 
-@@ -515,7 +508,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): 
 @@ -745,11 +738,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)
@@ -47,7 +11,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 %s" % (username, username))
++                os.system("usermod %s -G users,nopasswdlogin" % username)
              self.load_groups()
          dialog.destroy()