From fd08e4bef91e92b40b7e760d714dc5925294c72b Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Thu, 21 Dec 2017 22:26:12 +0100
Subject: [PATCH] cinnamon: update to 3.6.7.

---
 srcpkgs/cinnamon/patches/set_wheel.patch | 43 +++---------------------
 srcpkgs/cinnamon/template                |  6 ++--
 2 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
index ebba58dd6e7..86228d1895d 100644
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ b/srcpkgs/cinnamon/patches/set_wheel.patch
@@ -1,39 +1,6 @@
---- ./files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig	2015-11-08 23:37:01.916659699 -0500
-+++ ./files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py	2015-11-08 23:40:33.305652057 -0500
-@@ -147,7 +147,7 @@
- 
- 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
-@@ -219,13 +219,7 @@
-         newpass = self.new_password.get_text()
-         self.user.set_password(newpass, "")
-         mask = self.group_mask.get_text()
--        if "nopasswdlogin" in mask:
--            subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
--            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):
-@@ -563,7 +557,7 @@
-         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):
-@@ -808,11 +802,11 @@
+--- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig	2017-12-18 13:53:18.000000000 +0100
++++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py	2017-12-21 22:15:03.058109278 +0100
+@@ -839,11 +833,11 @@
              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])
@@ -41,10 +8,10 @@
 +            # 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])
-+                os.system("usermod %s -G %s,wheel" % (username, username)) 
++                subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username]) 
              else:
 -                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+                os.system("usermod %s -G %s" % (username, username))
++                subprocess.call(["usermod", username, "-G", "%s" % username])
              self.load_groups()
          dialog.destroy()
  
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 168add9d39c..43d3c2337fd 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=3.2.8
+version=3.6.7
 revision=1
 wrksrc="Cinnamon-${version}"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
@@ -19,12 +19,12 @@ depends="
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*} cinnamon-translations>=${version%.*} nemo>=${version%.*}
  gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
  python-cairo python-dbus python-pam python-pexpect python-inotify python-lxml python-Pillow
- polkit-gnome upower0 libkeybinder3"
+ polkit-gnome upower libkeybinder3"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=b67ef52f239026930ba351f327e8298361dabf881a0af6c299530e83c62fac9a
+checksum=ddd29e1a2e044dfa54a5c57b21f9704512845824a101eca37266109560c70d08
 
 pycompile_dirs="
  /usr/share/cinnamon/cinnamon-slideshow