[arch-commits] Commit in cinnamon/trunk (PKGBUILD fix-control-center-check.patch)

[Balló György]

    Date: Sunday, March 3, 2013 @ 06:39:19
  Author: bgyorgy
Revision: 85557

upgpkg: cinnamon 1.7.1-4

Check for the cc-panel path, not for the unneeded binary

Added:
  cinnamon/trunk/fix-control-center-check.patch
Modified:
  cinnamon/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   11 ++++++++---
 fix-control-center-check.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-03 05:22:22 UTC (rev 85556)
+++ PKGBUILD	2013-03-03 05:39:19 UTC (rev 85557)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=1.7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -26,10 +26,12 @@
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
         "gnome-autogen.sh"
-        "keyboard_applet.patch")
+        "keyboard_applet.patch"
+        "fix-control-center-check.patch")
 md5sums=('13daa8fde1480bbee25eddc2e2630319'
          'a925691c9b57a6a884dcf07da057fd1f'
-         '2b1ece84416c3e4de030be15f1774d82')
+         '2b1ece84416c3e4de030be15f1774d82'
+         'fd429779aa986ffb3f481149f19a0baf')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
@@ -38,6 +40,9 @@
   # https://github.com/linuxmint/Cinnamon/issues/1337
   patch -Np1 -i ${srcdir}/keyboard_applet.patch
 
+  # Check for the cc-panel path, not for the unneeded binary
+  patch -Np1 -i ${srcdir}/fix-control-center-check.patch
+
   cp ${srcdir}/gnome-autogen.sh .
   sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am
   sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh

Added: fix-control-center-check.patch
===================================================================
--- fix-control-center-check.patch	                        (rev 0)
+++ fix-control-center-check.patch	2013-03-03 05:39:19 UTC (rev 85557)
@@ -0,0 +1,12 @@
+diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/files/usr/bin/cinnamon-settings
+--- cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings	2013-02-21 17:23:45.000000000 +0100
++++ cinnamon-1.7.1/files/usr/bin/cinnamon-settings	2013-03-03 03:03:24.151209998 +0100
+@@ -7,7 +7,7 @@
+ 	if os.path.exists("/usr/lib/cinnamon-settings/modules/cs_%s.py" % module):
+ 		print "Python module"
+ 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
+-	elif os.path.exists("/usr/bin/cinnamon-control-center"):
++	elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"):
+ 		print "Unknown module %s, using cinnamon-control-center" % module
+ 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
+ 	elif os.path.exists("/usr/bin/gnome-control-center"):