[arch-commits] Commit in cinnamon/trunk (2 files)

[Eli Schwartz]

    Date: Sunday, December 16, 2018 @ 03:41:23
  Author: eschwartz
Revision: 416424

upgpkg: cinnamon 4.0.7-1

upstream release

Added:
  cinnamon/trunk/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
Modified:
  cinnamon/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch |   38 ++++++++++
 PKGBUILD                                                        |   11 +-
 2 files changed, 44 insertions(+), 5 deletions(-)

Added: 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
===================================================================
--- 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch	                        (rev 0)
+++ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch	2018-12-16 03:41:23 UTC (rev 416424)
@@ -0,0 +1,38 @@
+From ad1e03d6b652b4c7ce0bd9469087b40989824f5c Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93 at gmail.com>
+Date: Tue, 20 Mar 2018 14:11:02 -0400
+Subject: [PATCH] cinnamon-settings: don't rely on the presence of
+ cinnamon-control-center
+
+The existence of the cinnamon-control-center binary does not even tell
+us what control center libraries are available. So instead, do the same
+thing we did for cinnamon-settings modules, and check if the library
+exists.
+---
+ files/usr/bin/cinnamon-settings | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings
+index fcd1fee9e..e20ba0b78 100755
+--- a/files/usr/bin/cinnamon-settings
++++ b/files/usr/bin/cinnamon-settings
+@@ -7,6 +7,7 @@ Usage:  cinnamon-settings [optional module name]
+ 
+ import os
+ import sys
++import sysconfig
+ 
+ if len(sys.argv) > 1:
+     module = sys.argv[1]
+@@ -14,7 +15,7 @@ if len(sys.argv) > 1:
+         os.execvp("/usr/share/cinnamon/cinnamon-settings/xlet-settings.py", (" ", module[0:-1]) + tuple(sys.argv[2:]))
+     elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module):
+         os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
+-    elif os.path.exists("/usr/bin/cinnamon-control-center"):
++    elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)):
+         os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
+     elif os.path.exists("/usr/bin/gnome-control-center"):
+         print ("Unknown module %s, calling gnome-control-center" % module)
+-- 
+2.20.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-16 03:40:24 UTC (rev 416423)
+++ PKGBUILD	2018-12-16 03:41:23 UTC (rev 416424)
@@ -5,7 +5,7 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=4.0.6
+pkgver=4.0.7
 pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('x86_64')
@@ -24,11 +24,11 @@
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
-        "0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch::${url}/pull/7382.patch"
+        "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch"
         "set_wheel.patch"
         "default-theme.patch")
-sha512sums=('e4e6fea1d4ca10e6838af364f2239b691efa94c71959970be8d00c47066fc8891dd11babd0954e0700e7b88a2253460862316be47923895cbb52a4e860b618af'
-            'a0a9f4d25053fe96f9b1495394adb829252367099931d3f0e9bdfd2371093b4e86ff13fc945301b3a59691bbb7ee14da89e68c4ef3d8e7a1b5ec6bdedccb9137'
+sha512sums=('0dd789ddea530feac09906599e2d501403a76a90074381c9878067eb3e212fd94c575799c362c0e3b9ee0d22decf258abcb5aa53e774180d221498f49a79cca7'
+            'eb418d545826b27f6a6b9eb8795fb042f9f2d7952ae19893dda30ce378eb5312bee08e569252672de875dcab848343dee816fad60bcb292f39c7246d9f0e4602'
             'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
             '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
 
@@ -36,7 +36,8 @@
     cd "${srcdir}"/Cinnamon-${pkgver}
 
     # Check for the cc-panel module path, not for the irrelevant binary
-    patch -p1 -i ../0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch
+    # https://github.com/linuxmint/Cinnamon/pull/7382
+    patch -p1 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
 
     # Use wheel group instread of sudo (taken from Fedora)
     patch -Np1 -i ../set_wheel.patch