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

[Balló György]

    Date: Wednesday, October 1, 2014 @ 08:07:34
  Author: bgyorgy
Revision: 119914

upgpkg: cinnamon 2.2.16-2

Some fixes for GNOME 3.14

Added:
  cinnamon/trunk/gnome-3.14.patch
Modified:
  cinnamon/trunk/PKGBUILD

------------------+
 PKGBUILD         |   17 +++++++++++------
 gnome-3.14.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-01 05:53:10 UTC (rev 119913)
+++ PKGBUILD	2014-10-01 06:07:34 UTC (rev 119914)
@@ -6,15 +6,15 @@
 
 pkgname=cinnamon
 pkgver=2.2.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
 depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
-         'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
-         'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
-         'librsvg' 'networkmanager' 'muffin' 'python2-dbus' 'python2-pillow'
+         'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' 'gconf'
+         'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg'
+         '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')
@@ -23,10 +23,12 @@
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "calendar-applet-upower-support.patch"
-        "set_wheel.patch")
+        "set_wheel.patch"
+        "gnome-3.14.patch")
 sha256sums=('1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793'
             '9ba15442531537759a78a4ab6d0be55dc2fa84a5157bb3fd912c259bfe24dcd8'
-            '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444')
+            '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444'
+            'da763a88b4ee2e889afffd189b877708ca34b704fe7e9b62c0cc2bd970564058')
 
 prepare() {
   cd ${srcdir}/Cinnamon*
@@ -41,6 +43,9 @@
   # Use wheel group instread of sudo
   patch -Np1 -i ../set_wheel.patch
 
+  # Some fixes for GNOME 3.14
+  patch -Np1 -i ../gnome-3.14.patch
+
   # Add polkit agent to required components
   sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
 

Added: gnome-3.14.patch
===================================================================
--- gnome-3.14.patch	                        (rev 0)
+++ gnome-3.14.patch	2014-10-01 06:07:34 UTC (rev 119914)
@@ -0,0 +1,25 @@
+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
+@@ -91,7 +91,7 @@
+     
+     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: