From ccde9eb389f2b432738066bbe57de9b4f5bdecde Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Sun, 7 Jun 2015 20:16:30 +0200
Subject: [PATCH] cinnamon: update to 2.6.7.

---
 srcpkgs/cinnamon/patches/set_wheel.patch | 21 ++++++++++++---------
 srcpkgs/cinnamon/template                | 13 +++++++------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/cinnamon/patches/set_wheel.patch b/srcpkgs/cinnamon/patches/set_wheel.patch
index 61923fad425..6454ed4c1a9 100644
--- a/srcpkgs/cinnamon/patches/set_wheel.patch
+++ b/srcpkgs/cinnamon/patches/set_wheel.patch
@@ -14,19 +14,22 @@
  
          self.set_modal(True)
          self.set_skip_taskbar_hint(True)
-@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
+@@ -218,13 +217,7 @@ class PasswordDialog(Gtk.Dialog):
          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')
+         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):
+
 @@ -515,7 +508,7 @@ class Module:
          model, treeiter = self.users_treeview.get_selection().get_selected()
          if treeiter != None:
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index bd2fd14ba21..3d039069260 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=2.4.8
-revision=3
+version=2.6.7
+revision=1
 wrksrc="Cinnamon-${version}"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 build_style=gnu-configure
@@ -12,10 +12,10 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
 makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel
  startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel
- libgnome-keyring-devel NetworkManager-devel libcroco-devel"
+ libgnome-keyring-devel NetworkManager-devel libcroco-devel gtk+3-devel"
 depends="
- accountsservice caribou cinnamon-settings-daemon>=2.4 cinnamon-session>=2.4 muffin>=2.4
- cinnamon-control-center>=2.4 cinnamon-screensaver>=2.4 cinnamon-translations>=2.4 nemo>=2.4
+ accountsservice caribou cinnamon-settings-daemon>=${version%.*} cinnamon-session>=${version%.*} muffin>=${version%.*}
+ 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"
@@ -23,7 +23,8 @@ 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=5dc693cb57adce95cf917c94ee4e02fa8740e5cd5edbd8ee9cdeed81604aefd3
+checksum=839ab0ea86b718809e53a0209d72701638ab3ac68263f2469e70967aaf21a004
+CFLAGS+="-I/usr/include/gtk-3.0"
 
 pycompile_dirs="
  /usr/lib/cinnamon-slideshow