Date: Sunday, June 30, 2019 @ 19:07:08 Author: eschwartz Revision: 486592
upgpkg: cinnamon 4.2.0-1 upstream release Modified: cinnamon/trunk/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch cinnamon/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch | 18 +++++----- PKGBUILD | 13 ++----- 2 files changed, 13 insertions(+), 18 deletions(-) Modified: 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch =================================================================== --- 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2019-06-30 19:06:56 UTC (rev 486591) +++ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2019-06-30 19:07:08 UTC (rev 486592) @@ -1,4 +1,4 @@ -From ad1e03d6b652b4c7ce0bd9469087b40989824f5c Mon Sep 17 00:00:00 2001 +From ac4d2fc9fafb38ebb02615a41b23cceca304e73a Mon Sep 17 00:00:00 2001 From: Eli Schwartz <[email protected]> Date: Tue, 20 Mar 2018 14:11:02 -0400 Subject: [PATCH] cinnamon-settings: don't rely on the presence of @@ -13,19 +13,19 @@ 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 +index 9fbdbecd2..98ca454a5 100755 --- a/files/usr/bin/cinnamon-settings +++ b/files/usr/bin/cinnamon-settings -@@ -7,6 +7,7 @@ Usage: cinnamon-settings [optional module name] - +@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers: + import getopt 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:])) + def usage(): + print("""Usage: +@@ -119,7 +120,7 @@ if len(sys.argv) > 1: + os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:])) 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"): @@ -34,5 +34,5 @@ elif os.path.exists("/usr/bin/gnome-control-center"): print ("Unknown module %s, calling gnome-control-center" % module) -- -2.20.0 +2.22.0 Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-06-30 19:06:56 UTC (rev 486591) +++ PKGBUILD 2019-06-30 19:07:08 UTC (rev 486592) @@ -5,8 +5,8 @@ # Contributor: CReimer pkgname=cinnamon -pkgver=4.0.10 -pkgrel=2 +pkgver=4.2.0 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('x86_64') url="https://github.com/linuxmint/${pkgname}"; @@ -24,13 +24,11 @@ makedepends=('intltool' 'gtk-doc' 'gobject-introspection') options=('!emptydirs') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" - "${url}/commit/c843f3664064742e2672e0fea528571a882d84ad.patch" "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch" "set_wheel.patch" "default-theme.patch") -sha512sums=('80c037b3044c8f95bc269a14039d1fbe85e2bb68a0e5eae56a8bf3aecd6fb84f4623d7cfe223f2efd918305502341f5899becefa711f06f3c17862080464effd' - '32d93fe14fa00aafc297b35a4a28c29e133444117a565ca3a9a607f589cb0fec6aa738c6a625f4bd3dd5cbc143f987ca104ebad2182407749f6993852e5cb8fd' - 'eb418d545826b27f6a6b9eb8795fb042f9f2d7952ae19893dda30ce378eb5312bee08e569252672de875dcab848343dee816fad60bcb292f39c7246d9f0e4602' +sha512sums=('dd8225ef19b9a0898783c59de0e5607951613fef39115d0a85fbdc800b8fbf04b659f87edc7c50cd91f6788995dec22d152992e7c4ebc2606fa66e1f1f5734d9' + '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374' 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c' '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') @@ -37,9 +35,6 @@ prepare() { cd "${srcdir}"/${pkgname}-${pkgver} - # https://github.com/linuxmint/cinnamon/issues/8495 fixes python-pillow 6 compat - patch -p1 -i ../c843f3664064742e2672e0fea528571a882d84ad.patch - # Check for the cc-panel module path, not for the irrelevant binary # https://github.com/linuxmint/cinnamon/pull/7382 patch -p1 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
