Date: Saturday, November 19, 2022 @ 20:02:30 Author: arojas Revision: 1349740
upgpkg: cinnamon 5.6.1-1: Update to 5.6.1 Modified: cinnamon/trunk/PKGBUILD Deleted: cinnamon/trunk/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch -----------------------------------------------------------------+ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch | 38 ---------- PKGBUILD | 13 --- 2 files changed, 3 insertions(+), 48 deletions(-) Deleted: 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch =================================================================== --- 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2022-11-19 20:02:17 UTC (rev 1349739) +++ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2022-11-19 20:02:30 UTC (rev 1349740) @@ -1,38 +0,0 @@ -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 - 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 9fbdbecd2..98ca454a5 100755 ---- a/files/usr/bin/cinnamon-settings -+++ b/files/usr/bin/cinnamon-settings -@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers: - import getopt - import os - import sys -+import sysconfig - - 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"): -+ 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.22.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-19 20:02:17 UTC (rev 1349739) +++ PKGBUILD 2022-11-19 20:02:30 UTC (rev 1349740) @@ -6,7 +6,7 @@ # Contributor: CReimer pkgname=cinnamon -pkgver=5.4.12 +pkgver=5.6.1 pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=(x86_64) @@ -27,15 +27,12 @@ makedepends=(meson samurai gobject-introspection intltool) options=('!emptydirs') source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz - 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch set_wheel.diff default-theme.patch) -sha512sums=('62982a277ea00660b4e39f780d77fdca87c425f8da8dba404c2b6bd806d56c5967c6cc3999281318eace2ab902e35f4b9f8f723f9bb57abb0e7111d1a30752d7' - '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374' +sha512sums=('3ec7ce8cd1b2e98283ab84dd55a7e2e1693f6ad5cc7c6db8241808b9d96ab7c375c8739c470b99a83e3b6560ffcc50c070d2439dea71ab0d0792ef7c3bd8cd38' 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c' 'ee7dedd59ea370cf81d75def49060f9a29b22e7b025ca7d5db87a0102d50f138c79aa562b0d36a748c4b1c59a37f600ba1f60ff6caf303cf5b6fc4d110d051b4') -b2sums=('3ecd2a628ddf62bff6fe5e054f0b9c3e47efb532f6d310e5f9ddcca0763f35bc41872878d25dd3a50adb937c74a5e00dcfe7c25e3e4074d5a2fdd23745b41fff' - '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008' +b2sums=('9b7f9f9c045adb1497875d7d735b3d8b684869695c3e476f3f8f671840b31a6bd043c8d9f7aca2ab8d1e3fa90d85da454cb612e16a9489e5bfaa7df590a91d3b' '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160' '86c3a29acd132ca321f08fd81dd5a45707accdc035b2aeec95bf358b29072ff1eedb77b2566cf48d7253d1d791599f0f44938c4600761d711cb18b59019f1c62') @@ -42,10 +39,6 @@ prepare() { cd ${pkgname}-${pkgver} - # Check for the cc-panel module path, not for the irrelevant binary - # https://github.com/linuxmint/cinnamon/pull/7382 - patch --no-backup-if-mismatch -p1 < ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch - # Use wheel group instread of sudo (taken from Fedora) patch -p1 < ../set_wheel.diff
