Re: [PR PATCH] [Updated] Update Cinnamon packages

[mhmdanas <mhmdanas@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages cinnamon-5.8.1
https://github.com/void-linux/void-packages/pull/44590

Update Cinnamon packages

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly** (I don't use Cinnamon but did briefly test the DE)

Testing from actual Cinnamon users would be appreciated.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44590.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-5.8.1-44590.patch --]
[-- Type: text/x-diff, Size: 32888 bytes --]

From 2d2cf0a47bfbbfbb8cb018b780c10e852dbcd210 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 20:17:53 +0100
Subject: [PATCH 01/22] fixup! cinnamon-control-center: update to 5.8.2.

---
 srcpkgs/cinnamon-control-center/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index d7c330972a1af..18e9a68ada5f3 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,11 +1,10 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=5.4.7
-revision=3
+version=5.8.2
+revision=1
 build_style=meson
 build_helper=gir
-hostmakedepends="gettext-devel glib-devel
- gobject-introspection intltool libtool pkg-config libxslt"
+hostmakedepends="gettext-devel glib-devel intltool pkg-config libxslt"
 makedepends="ModemManager-devel cinnamon-desktop-devel cinnamon-menus-devel
  cinnamon-settings-daemon-devel gnome-online-accounts-devel ibus-devel
  libSM-devel libcanberra-devel libgnomekbd-devel
@@ -18,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-control-center"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=b5be6a0e817f9145579a6944e92cf79a2074505a76472c072e6dfd47f4406a6c
+checksum=8905b9ddf0c9b8ef98c47c2f4a1fd5e0b944d4955a05b4534b1c54d13c7241e5
 # requires X and wacom devices?
 make_check=no
 

From e03e584f961da9fd91451b10c87b1e38cfc360fc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 18:32:36 +0100
Subject: [PATCH 02/22] cinnamon-desktop: update to 5.8.0.

---
 srcpkgs/cinnamon-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index f7ea2b43ac004..affc86f87fc96 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=5.4.2
+version=5.8.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-desktop"
 distfiles="https://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz"
-checksum=862828d97518becf9dd085d76cae9d65090811c82f1dab41392fe89a6b927371
+checksum=53080bd27527a8271d659e143a8d3b333d9b85efc82b77e571075f9cf8d3287c
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"

From c19837ff16d5a11d7609ab2433cd03baf2c6fda3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 20:21:02 +0100
Subject: [PATCH 03/22] cinnamon-menus: update to 5.8.0.

---
 srcpkgs/cinnamon-menus/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index bd8f0665b1505..e923c3cc86324 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,17 +1,17 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=5.4.0
+version=5.8.0
 revision=1
 build_style=meson
 build_helper=gir
-hostmakedepends="glib-devel gobject-introspection intltool libtool pkg-config"
-makedepends="libglib-devel gobject-introspection"
+hostmakedepends="glib-devel intltool pkg-config"
+makedepends="libglib-devel"
 short_desc="Cinnamon menu specifications"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-menus"
 distfiles="https://github.com/linuxmint/cinnamon-menus/archive/${version}.tar.gz"
-checksum=47eb864105711c28c4851b64bcc82aa5701095996698db170b86be9ebd914e07
+checksum=99c4336ea5d87f01cbf19b40c8200dde933aebd73fe87b83cc11361bea5b6626
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 3e230c5e6237c2516a96d69d1dda8def25e038d0 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 20:27:16 +0100
Subject: [PATCH 04/22] cinnamon-screensaver: update to 5.8.1.

---
 srcpkgs/cinnamon-screensaver/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 2c29d7744e894..f3651998778b7 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,14 +1,13 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=5.4.2
-revision=3
+version=5.8.1
+revision=1
 build_style=meson
-build_helper=gir
-hostmakedepends="gettext-devel glib-devel gobject-introspection
- pkg-config python3-devel"
+build_helper="gir"
+hostmakedepends="gettext-devel glib-devel pkg-config python3-devel"
 makedepends="cinnamon-desktop-devel dbus-glib-devel
  xdotool-devel gtk+3-devel libglib-devel dbus-devel libXinerama-devel
- libgnomekbd-devel pam-devel python3-devel webkit2gtk-devel"
+ libgnomekbd-devel pam-devel python3-devel"
 depends="cinnamon-translations hicolor-icon-theme python3-gobject
  python3-setproctitle python3-xapp xapps"
 conf_files="/etc/pam.d/${pkgname}"
@@ -16,8 +15,8 @@ short_desc="Cinnamon screensaver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-screensaver"
-distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=7ae54b1fc83fff3082b3b43bf5bf01f7cf49eb35cd6b5b42c0e454e2fd619748
+distfiles="https://github.com/linuxmint/cinnamon-screensaver/archive/${version}.tar.gz"
+checksum=8959f03a9e7e2b2760a8fb5c7129d2431021ca193ff4ebcac59c4bbda95a8319
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"

From baaae63b9c70ae1283a0809796bffec98add7cd0 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:46 +0100
Subject: [PATCH 05/22] cinnamon-session: update to 5.8.1.

---
 srcpkgs/cinnamon-session/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 0972d9f69fb36..6dad113168c6e 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,11 +1,11 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=5.4.0
+version=5.8.1
 revision=1
 build_style=meson
-build_helper=gir
-hostmakedepends="pkg-config gobject-introspection
- gettext-devel dbus-glib-devel glib-devel intltool xmlto"
+build_helper="gir"
+hostmakedepends="pkg-config gettext-devel dbus-glib-devel glib-devel intltool
+ xmlto"
 makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
  cinnamon-desktop-devel libcanberra-devel upower-devel
  elogind-devel libXtst-devel xapps-devel"
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-session"
 distfiles="https://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz"
-checksum=c3c9351aecebe2abbb5d61663ad19af56fc6413ad6cddb5d753a614b23ec547d
+checksum=bf8a4b622900c3b9c3d917bcacc1bbaed74aa07c69270f6fc53783a65b4687eb

From 1d7690db215c1f44eca78e5a63190fa127260dbf Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:32:48 +0100
Subject: [PATCH 06/22] cinnamon-settings-daemon: update to 5.8.1.

---
 srcpkgs/cinnamon-settings-daemon/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 3067648d11633..514e30fa031f2 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,11 +1,10 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=5.4.5
+version=5.8.1
 revision=1
 build_style=meson
-build_helper=gir
-hostmakedepends="dbus-glib-devel gettext-devel glib-devel
- gobject-introspection intltool pkg-config"
+build_helper="gir"
+hostmakedepends="dbus-glib-devel gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel elogind-devel ibus-devel json-glib-devel
  libSM-devel libcanberra-devel libgnomekbd-devel libgudev-devel libnotify-devel
  nss-devel polkit-devel pulseaudio-devel upower-devel"
@@ -15,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-settings-daemon"
 distfiles="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz"
-checksum=2ff4dd7d585ba673fc6aea1a7d8a8f7a45744df34a42ffe5df73f9cd6783f31e
+checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
 make_check=no
 
 cinnamon-settings-daemon-devel_package() {

From 8aa95d9e7bbd8a89b95f2122e732b65b694491cd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:32:21 +0100
Subject: [PATCH 07/22] cinnamon-translations: update to 5.8.2.

---
 srcpkgs/cinnamon-translations/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index c7382d4bfad90..794d42bb0dcd8 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=5.4.2
+version=5.8.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext"
@@ -8,8 +8,8 @@ short_desc="Translations for Cinnamon and Nemo"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-translations/"
-distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=ef28ba08f32d1e2c8845d6a41742553b90f1afe8d3766d3d4df5c17ee5d565d3
+distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}/cinnamon-translations-${version}.tar.gz"
+checksum=3c4454696bd5d57d96dbbde10232c72b575d6e6e5364c657836967aa783ab0c8
 
 do_install() {
 	vmkdir usr

From 906fed630c51f64a7cfd3d4f99a80354aabfbe2f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:32:07 +0100
Subject: [PATCH 08/22] cinnamon: update to 5.8.4.

---
 srcpkgs/cinnamon/sed2NWD0D |  0
 srcpkgs/cinnamon/template  | 20 +++++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/cinnamon/sed2NWD0D

diff --git a/srcpkgs/cinnamon/sed2NWD0D b/srcpkgs/cinnamon/sed2NWD0D
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 5df0651e77c7b..3d492a24dbe49 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,15 +1,15 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=5.4.9
-revision=2
-build_helper=gir
+version=5.8.4
+revision=1
 build_style=meson
-hostmakedepends="libtool pkg-config gobject-introspection gettext
- gettext-devel glib-devel intltool xmlto gtk-doc"
+build_helper="gir"
+hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
+ gtk-doc"
 makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
  startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- libgnome-keyring-devel NetworkManager-devel libcroco-devel libsoup-devel
+ libgnome-keyring-devel NetworkManager-devel libcroco-devel
  cinnamon-desktop-devel"
 depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
@@ -18,14 +18,15 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  gnome-themes-standard gnome-themes-standard-metacity gnome-backgrounds
  network-manager-applet polkit-gnome upower>=0.99.7 libkeybinder3 python3-dbus
  python3-gobject python3-pam python3-pexpect python3-Pillow python3-inotify
- python3-tinycss python3-pytz python3-distro python3-requests libtimezonemap"
+ python3-tinycss python3-pytz python3-distro python3-requests libtimezonemap
+ libsoup"
 short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz"
-checksum=19c5e85f65baacc79f961cbcebb20fb0050ad6f21678638a9dd1868d197b4727
+checksum=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
 
 python_version=3
 pycompile_dirs="
@@ -45,9 +46,6 @@ pre_configure() {
 	vsed -e '/RequiredComponents/s/$/polkit-gnome-authentication-agent-1;/' \
 		-i cinnamon2d.session.in cinnamon.session.in
 
-	# Check for the cc-panel path, not for the unneeded binary
-	vsed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
-
 	# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
 	vsed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
 		files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py

From 706fe9be8285735a1c599d5936a9c24714afb341 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 20:23:12 +0100
Subject: [PATCH 09/22] cjs: update to 5.8.0.

---
 srcpkgs/cjs/patches/fix-configure.diff | 11 ++++++++++
 srcpkgs/cjs/template                   | 29 +++++++++++++-------------
 2 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fix-configure.diff

diff --git a/srcpkgs/cjs/patches/fix-configure.diff b/srcpkgs/cjs/patches/fix-configure.diff
new file mode 100644
index 0000000000000..24c1a0b63e7b4
--- /dev/null
+++ b/srcpkgs/cjs/patches/fix-configure.diff
@@ -0,0 +1,11 @@
+--- a/installed-tests/js/meson.build	2023-06-19 19:51:58.989737570 +0100
++++ b/installed-tests/js/meson.build	2023-06-19 19:51:23.010310261 +0100
+@@ -203,7 +203,7 @@
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
++if not get_option('skip_gtk_tests') and have_gtk4
+     # FIXME: find out why GTK4 tries to acquire a message bus
+     dbus_tests += 'Gtk4'
+ endif
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index b0fafe6603f8c..5b04ce5ee7e16 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,26 +1,27 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=5.4.1
+version=5.8.0
 revision=1
 build_style=meson
-build_helper=gir
-# XXX: disable tests because they need dbus, X and GTK, same as gjs
-configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
- -Dprofiler=disabled -Dinstalled_tests=false"
-hostmakedepends="pkg-config gobject-introspection glib-devel dbus mozjs78-devel"
-makedepends="dbus-glib-devel readline-devel gobject-introspection
- gtk+3-devel mozjs78 mozjs78-devel"
+build_helper="gir"
+configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
+hostmakedepends="pkg-config glib-devel"
+makedepends="readline-devel mozjs102-devel"
+depends="gtk+3"
+checkdepends="gtk4-devel dbus xvfb-run"
 short_desc="Javascript for Cinnamon"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cjs"
 distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz"
-checksum=212fa302f15ea955af6dc87fdba3898f751d078df91cb84b0e6615d5a2b84e15
-# ΧΧ A single test fails on x86_64,  meson reports in the configure stage:
-# meson.build:663: WARNING: Your libc does not have the C.UTF-8 locale and no
-# other suitable UTF-8 fallback locale could be found. You can still build GJS,
-# but some tests will fail.
-make_check=extended
+checksum=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+make_check_pre="xvfb-run"
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dskip_dbus_tests=false -Dskip_gtk_tests=false"
+else
+	configure_args+=" -Dskip_dbus_tests=true -Dskip_gtk_tests=true"
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 67295417f998db34d552a8b1b25dcd8613d4600b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:56 +0100
Subject: [PATCH 10/22] muffin: update to 5.8.1.

---
 srcpkgs/muffin/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 6c30d44524510..eb9f61b98bdd5 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,16 +1,16 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=5.4.5
-revision=2
+version=5.8.1
+revision=1
 build_style=meson
-build_helper=gir
+build_helper="gir"
 # -Dtests requires -Dwayland, which is explicitly disabled
 configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=true
  -Dudev=true -Dsm=true -Dlibwacom=true -Dpango_ft2=true
  -Dstartup_notification=true -Dremote_desktop=true -Dintrospection=true
  -Dprofiler=false -Ddebug=false -Ddefault_driver=auto"
 hostmakedepends="gdk-pixbuf-devel gettext-devel-tools glib-devel
- gobject-introspection intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols"
 makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
  libglib-devel graphene-devel gtk+3-devel gdk-pixbuf-devel pango-devel
  cairo-devel upower-devel libXcomposite-devel libxkbcommon-devel
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/muffin"
 changelog="https://raw.githubusercontent.com/linuxmint/muffin/master/debian/changelog"
 distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz"
-checksum=e02802d72c9d5d0cdd62194528c0aff80a2e6fa5f74b49191332f316516acdb0
+checksum=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
 
 post_install() {
 	vmkdir usr/share/gir-1.0

From f4253e1c26eff0893afae5cd6cee404af32adda2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:34 +0100
Subject: [PATCH 11/22] nemo-audio-tab: update to 5.8.0.

---
 srcpkgs/nemo-audio-tab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template
index 7f595e46880c0..516cb185f821c 100644
--- a/srcpkgs/nemo-audio-tab/template
+++ b/srcpkgs/nemo-audio-tab/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo-audio-tab'
 pkgname=nemo-audio-tab
-version=5.4.1
-revision=2
+version=5.8.0
+revision=1
 build_wrksrc=nemo-audio-tab
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From 9915362f44b7a24deada73799bc2f07b60f13ba7 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:26 +0100
Subject: [PATCH 12/22] nemo-compare: update to 5.8.1.

---
 srcpkgs/nemo-compare/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index eca7719edc33f..d10780d437e83 100644
--- a/srcpkgs/nemo-compare/template
+++ b/srcpkgs/nemo-compare/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo-compare'
 pkgname=nemo-compare
-version=5.4.1
-revision=2
+version=5.8.1
+revision=1
 build_wrksrc=nemo-compare
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -11,5 +11,6 @@ short_desc="Nemo compare extention"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+# distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
+checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784

From a25110254ca3bd37011e1c6c7121b138ba52684d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:11 +0100
Subject: [PATCH 13/22] nemo-emblems: update to 5.8.0.

---
 srcpkgs/nemo-emblems/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template
index 681498ca8b080..cc311c931c5d2 100644
--- a/srcpkgs/nemo-emblems/template
+++ b/srcpkgs/nemo-emblems/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo-emblems'
 pkgname=nemo-emblems
-version=5.4.1
-revision=2
+version=5.8.0
+revision=1
 build_wrksrc=nemo-emblems
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From 954235ec7fbde4ddf48453d701a792ac2aea1654 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 20:59:19 +0100
Subject: [PATCH 14/22] nemo-fileroller: update to 5.8.0.

---
 srcpkgs/nemo-fileroller/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 78dfb56980515..4b8f36f7589a7 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-fileroller'
 pkgname=nemo-fileroller
-version=5.4.1
+version=5.8.0
 revision=1
 build_wrksrc=nemo-fileroller
 build_style=meson
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From b488e3f9bc03d43a9068d6cbc9872c6d5dea5c87 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:21 +0100
Subject: [PATCH 15/22] nemo-image-converter: update to 5.8.0.

---
 srcpkgs/nemo-image-converter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template
index f0458c09ca276..e4a69222c4545 100644
--- a/srcpkgs/nemo-image-converter/template
+++ b/srcpkgs/nemo-image-converter/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-image-converter'
 pkgname=nemo-image-converter
-version=5.4.1
+version=5.8.0
 revision=1
 build_wrksrc=nemo-image-converter
 build_style=meson
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From 477ecf1d6433752627a88426f81f1eb1ed4f4f7c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 19:59:04 +0100
Subject: [PATCH 16/22] nemo-preview: update to 5.8.0.

---
 srcpkgs/nemo-preview/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index 2cbac5160b2f3..c5591bbca361e 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,16 +1,17 @@
 # Template file for 'nemo-preview'
 pkgname=nemo-preview
-version=5.4.1
+version=5.8.0
 revision=1
 build_wrksrc=nemo-preview
 build_style=meson
 build_helper=gir
-hostmakedepends="pkg-config gettext gobject-introspection glib-devel"
-makedepends="nemo-devel  libmusicbrainz5-devel cjs-devel clutter-devel
- clutter-gtk-devel clutter-gst3-devel libxreader-devel gtksourceview4-devel webkit2gtk-devel"
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="nemo-devel libmusicbrainz5-devel cjs-devel clutter-devel
+ clutter-gtk-devel clutter-gst3-devel libxreader-devel
+ gtksourceview4-devel libwebkit2gtk41-devel"
 short_desc="Nemo preview extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From f1a4d083d93dbbcd2d4a823d74064cdd9f483274 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 22:12:07 +0100
Subject: [PATCH 17/22] nemo-python: update to 5.8.0.

---
 srcpkgs/nemo-python/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
index 630302ee848ad..4daf7fa35e2c5 100644
--- a/srcpkgs/nemo-python/template
+++ b/srcpkgs/nemo-python/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo-python'
 pkgname=nemo-python
-version=5.4.1
-revision=2
+version=5.8.0
+revision=1
 build_wrksrc=nemo-python
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From ba4127cc217763aeae4e5aa1f7dec13482c1d635 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 20:50:12 +0100
Subject: [PATCH 18/22] nemo-terminal: update to 5.8.0.

---
 srcpkgs/nemo-terminal/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template
index 5029a82836a64..ed003fa204db1 100644
--- a/srcpkgs/nemo-terminal/template
+++ b/srcpkgs/nemo-terminal/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo-terminal'
 pkgname=nemo-terminal
-version=5.4.1
-revision=2
+version=5.8.0
+revision=1
 build_wrksrc=nemo-terminal
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/${version}.tar.gz"
-checksum=6a0b83e6a9129c7217c29fbc992109d8f6eedbe8f076da863c507c0005182404
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From 2ab751803b819f63874e816b4c2cd400c78eab1b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 19:45:01 +0100
Subject: [PATCH 19/22] python3-xapp: update to 2.4.1.

---
 srcpkgs/python3-xapp/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-xapp/template b/srcpkgs/python3-xapp/template
index b9d7d46361ec8..985208357e2a8 100644
--- a/srcpkgs/python3-xapp/template
+++ b/srcpkgs/python3-xapp/template
@@ -1,15 +1,13 @@
 # Template file for 'python3-xapp'
 pkgname=python3-xapp
-version=2.2.2
-revision=2
-build_style=python3-module
-pycompile_module="xapp"
-hostmakedepends="python3-setuptools"
+version=2.4.1
+revision=1
+build_style=meson
+hostmakedepends="python3"
 depends="python3 python3-psutil xapps"
-checkdepends="python3-psutil python3-gobject gtk+3 xapps"
 short_desc="Python3 Xapp Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/linuxmint/python3-xapp"
 distfiles="https://github.com/linuxmint/python3-xapp/archive/${version}.tar.gz"
-checksum=644b44ee97616096d74fc8a4a104453154fdc1c904679077b13b2e0b9c1b3c21
+checksum=d994f922a9816c71d9b565f4b2552cba4ca33011efb1203fb8199d9b2d0d7f3d

From 854beb4dd33d94a15f1b030b3192ed91f8881c00 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 18:43:46 +0100
Subject: [PATCH 20/22] xapps: update to 2.6.1.

---
 srcpkgs/xapps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 3bc356e7f835e..03b3b494120e0 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=2.4.3
+version=2.6.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/linuxmint/xapps"
 changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
 distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=f544c2ed1902803f524fc13aaf38e1b7f6c1fa9770ca6ab2bd9306e7385b01a9
+checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From 306bb9d199dab4665a84ff50b35ace82aa64699e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 21:53:59 +0100
Subject: [PATCH 21/22] xreader: update to 3.8.2.

---
 srcpkgs/xreader/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index ee6d5e9b67f30..3712f8751c094 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,21 +1,21 @@
 # Template file for 'xreader'
 pkgname=xreader
-version=3.6.3
-revision=2
+version=3.8.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
 hostmakedepends="mate-common mathjax2"
 makedepends="djvulibre-devel libSM-devel libgnomekbd-devel libgxps-devel libsecret-devel
- libspectre-devel libxkbfile-devel poppler-glib-devel webkit2gtk-devel xapps-devel
- $(vopt_if gir 'gobject-introspection') gdk-pixbuf-devel"
+ libspectre-devel libxkbfile-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
+ gdk-pixbuf-devel"
 depends="desktop-file-utils hicolor-icon-theme mathjax2"
 short_desc="Document viewer capable of displaying formats like PDF and Postscript"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/xreader"
 distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz"
-checksum=bd7ffd121f45bf65ed0b7bd8e47685b047ad8c5ff6ec00e3a9793183b46b41b5
+checksum=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
 # XX dogtail is needed for testing (not in repo)
 # XX tests need xorg running
 make_check=no

From 87ae35ee9592eaa95e2e9d01978903cf8716f5dd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 21 Jul 2023 19:25:50 +0100
Subject: [PATCH 22/22] nemo-extensions: update to 5.8.1.

Also add touchegg to cinnamon-all depends.
---
 srcpkgs/nemo-extensions/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index ac7a2cb16a2d9..0d60f68f58313 100644
--- a/srcpkgs/nemo-extensions/template
+++ b/srcpkgs/nemo-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-extensions'
 pkgname=nemo-extensions
-version=5.4.1
+version=5.8.0
 revision=1
 build_style=meta
 depends="
@@ -31,6 +31,6 @@ cinnamon-all_package() {
 	 muffin>=${version%.*}
 	 nemo>=${version%.*}
 	 nemo-extensions>=${version}
-	 xreader xapps
+	 xreader xapps touchegg
 	 "
 }