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

[Eli Schwartz]

    Date: Sunday, May 17, 2020 @ 21:29:31
  Author: eschwartz
Revision: 629001

upgpkg: cinnamon 4.6.0-3: Fix FS#66669 -- desklet configuration missing python import

Modified:
  cinnamon/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-17 21:29:06 UTC (rev 629000)
+++ PKGBUILD	2020-05-17 21:29:31 UTC (rev 629001)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=4.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('x86_64')
 url="https://github.com/linuxmint/${pkgname}"
@@ -25,14 +25,17 @@
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+        "${url}/commit/ae7fe16cfd81949c4a86ddf68e52367b72784845.patch"
         "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch"
         "set_wheel.diff"
         "default-theme.patch")
 sha512sums=('e0a1203e1b6a1c6a81474d6f03a77fd5913a4ade2315d3c9b72271e9b128c98e439c9db12cffdd077f0dbdf967795f8bb0bcb0940af62f724d0e3c2414645e98'
+            '3bf0791c0c222bf313473e60177c2f1784295bc1e26980933735cd0df0a041e800933a518dc091b7faf74dbf7b3dac7d6ea5cb953ee541659ea96f67fc351c4e'
             '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374'
             'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
             '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
 b2sums=('59493f7335399096fa0f8614bd3c1a8e7f4155b3c5f1c656de66ad06d3775c3c9bdd20e334dd575ea757c7bf0e5ecd01ef9f554bb468341025697de004c76d65'
+        '15787b4bb13ce7e2b0666932e80b760107d5d7de2fb6cb19514cd56f512080d117bf90c08919be05a70685a926d7ddcc5cbd4a38aa0d2b52869ee956df9a627b'
         '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008'
         '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160'
         '3a7515cc7b0ca1549289be62f6d5cbd79f4b076892194f4b6264555322d430a3d6474db9ec62439f3ba41d43d1017dc39a4c44add2e5e5c09f32012b772a7041')
@@ -40,6 +43,9 @@
 prepare() {
     cd "${srcdir}"/${pkgname}-${pkgver}
 
+    # fix regression preventing opening of desklet settings
+    patch -p1 -i ../ae7fe16cfd81949c4a86ddf68e52367b72784845.patch
+
     # 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 -i ../0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch