Date: Friday, November 27, 2020 @ 17:19:09 Author: eschwartz Revision: 764455
upgpkg: cinnamon 4.8.0-1: upstream release port to meson; reroll patches and sed paths Modified: cinnamon/trunk/PKGBUILD cinnamon/trunk/default-theme.patch ---------------------+ PKGBUILD | 48 +++++++++++++++++++++++------------------------- default-theme.patch | 20 ++++++++++---------- 2 files changed, 33 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-27 17:18:43 UTC (rev 764454) +++ PKGBUILD 2020-11-27 17:19:09 UTC (rev 764455) @@ -5,7 +5,7 @@ # Contributor: CReimer pkgname=cinnamon -pkgver=4.6.7 +pkgver=4.8.0 pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('x86_64') @@ -22,24 +22,30 @@ 'gnome-panel: fallback mode' 'metacity: fallback mode' 'system-config-printer: printer settings') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +makedepends=('meson' 'samurai' 'gobject-introspection' 'intltool') options=('!emptydirs') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" + "${url}/commit/244fe7893d11ec92b507090eb0b40dc9679c6639.patch" "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch" "set_wheel.diff" "default-theme.patch") -sha512sums=('4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070' +sha512sums=('bd8c17c853454a1a7b9c92f93510dd69794ebbd8b5655d282cc69b240e7f23c403ed1fc13234cbb9ddb2dfea7fada277feeab90468cb6deee5b52e545f819bec' + 'ebaf67f40f9539f12e001d2bab8133120e66233bba7e7cb495a627dd105683678ead694181b8cb71d7cbbe9d1b10bd4c63c1d11c15f0f70544dec5b79ce5ff17' '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374' 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c' - '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') -b2sums=('bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b' + 'ee7dedd59ea370cf81d75def49060f9a29b22e7b025ca7d5db87a0102d50f138c79aa562b0d36a748c4b1c59a37f600ba1f60ff6caf303cf5b6fc4d110d051b4') +b2sums=('e0981f8234a65f841b1e9ce37b800679d639a52d245afa66df475509e7ed11148176fee14a33bcc53576f24f162cbc84baf0a24d4d333cc49af569917b99ca9e' + '0cd7ca8d5d5ca90aacd95b627eda194f14ab1f1b3494d90da063140acd6b986d8676462bf5e0c3a3695160867bd5788d91cbbe1f4c045a49b869237d2c35f960' '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008' '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160' - '3a7515cc7b0ca1549289be62f6d5cbd79f4b076892194f4b6264555322d430a3d6474db9ec62439f3ba41d43d1017dc39a4c44add2e5e5c09f32012b772a7041') + '86c3a29acd132ca321f08fd81dd5a45707accdc035b2aeec95bf358b29072ff1eedb77b2566cf48d7253d1d791599f0f44938c4600761d711cb18b59019f1c62') prepare() { cd "${srcdir}"/${pkgname}-${pkgver} + # fix meson porting bug: https://github.com/linuxmint/cinnamon/pull/9725 + patch -p1 -i ../244fe7893d11ec92b507090eb0b40dc9679c6639.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 @@ -51,40 +57,32 @@ patch -Np1 -i ../default-theme.patch # Replace MintInstall with GNOME Software - sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in + sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml # Add polkit agent to required components sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ - files/cinnamon*.session.in + cinnamon*.session.in # https://github.com/linuxmint/cinnamon/issues/3575#issuecomment-374887122 # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py - - NOCONFIGURE=1 ./autogen.sh } build() { - cd "${srcdir}"/${pkgname}-${pkgver} + mkdir -p "${srcdir}"/${pkgname}-${pkgver}/builddir + cd "${srcdir}"/${pkgname}-${pkgver}/builddir - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/cinnamon \ - --localstatedir=/var \ - --disable-static \ - --disable-gtk-doc \ - --disable-schemas-compile \ - --enable-compile-warnings=yes + meson --prefix=/usr \ + --libexecdir=lib/cinnamon \ + --buildtype=plain \ + .. - # https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make + samu } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver}/builddir - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" samu install } Modified: default-theme.patch =================================================================== --- default-theme.patch 2020-11-27 17:18:43 UTC (rev 764454) +++ default-theme.patch 2020-11-27 17:19:09 UTC (rev 764455) @@ -1,25 +1,25 @@ -From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 +From b1f277d53ccd79bba9ba4cd1c0c2683d4f41068c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> Date: Sat, 22 Nov 2014 22:39:39 +0100 Subject: [PATCH] Set default theme to 'cinnamon' --- - data/org.cinnamon.gschema.xml.in | 2 +- + data/org.cinnamon.gschema.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 91fa171..9f56e4c 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -581,7 +581,7 @@ +diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml +index 86b14e26c..93c3e14c5 100644 +--- a/data/org.cinnamon.gschema.xml ++++ b/data/org.cinnamon.gschema.xml +@@ -645,7 +645,7 @@ <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" gettext-domain="@GETTEXT_PACKAGE@"> <key name="name" type="s"> - <default>""</default> + <default>"cinnamon"</default> - <_summary>Theme name</_summary> - <_description> + <summary>Theme name</summary> + <description> The name of the theme -- -2.1.3 +2.29.2