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

[Alexandre Filgueira]

    Date: Monday, April 25, 2016 @ 04:36:33
  Author: faidoc
Revision: 171757

upgpkg: cinnamon 3.0.0-1

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

------------------+
 PKGBUILD         |   11 +++--------
 gnome-3.14.patch |   12 ------------
 2 files changed, 3 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-25 02:28:26 UTC (rev 171756)
+++ PKGBUILD	2016-04-25 02:36:33 UTC (rev 171757)
@@ -5,8 +5,8 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.8.8
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/Cinnamon"
@@ -25,12 +25,10 @@
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
         "set_wheel.patch"
-        "gnome-3.14.patch"
         "default-theme.patch"
         "dont-hardcode-nemo.patch")
-sha256sums=('33f838cb9c1d4213ebb18d5869949757dda97a6e0745f224d06be75de69caee7'
+sha256sums=('aa7dc3a47980adf74070af5e6129b80c0859ee76c2e430c8204d87eece0d864f'
             '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc'
-            '31479171797f9fc88b91ef1294cc338b29c247f589ab84ff87b60bff06a6920a'
             '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5'
             '26a9fb9a3855759cc7d5fa9a195ae8860d5c6b3e12adc1bfe86269e047c119b4')
             
@@ -44,9 +42,6 @@
   # Use wheel group instread of sudo (taken from Fedora)
   patch -Np1 -i ../set_wheel.patch
 
-  # Make Adwaita icon theme selectable in theme settings
-  patch -Np1 -i ../gnome-3.14.patch
-
   # Set default theme to 'cinnamon'
   patch -Np1 -i ../default-theme.patch
 

Deleted: gnome-3.14.patch
===================================================================
--- gnome-3.14.patch	2016-04-25 02:28:26 UTC (rev 171756)
+++ gnome-3.14.patch	2016-04-25 02:36:33 UTC (rev 171757)
@@ -1,12 +0,0 @@
-diff -Naur Cinnamon-2.2.16.orig/files/usr/share/cinnamon/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/share/cinnamon/cinnamon-settings/modules/cs_themes.py	2014-08-12 13:00:36.000000000 +0200
-+++ Cinnamon-2.2.16/files/usr/share/cinnamon/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: