Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Update Cinnamon packages
@ 2023-06-23 14:07 mhmdanas
  2023-06-29 17:00 ` [PR REVIEW] " sgn
                   ` (35 more replies)
  0 siblings, 36 replies; 37+ messages in thread
From: mhmdanas @ 2023-06-23 14:07 UTC (permalink / raw)
  To: ml

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

There is a new 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: 31062 bytes --]

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

---
 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 d7c330972a1a..a3a13f18cdf8 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.1
+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=b2d7aebe0fd5b25d7d951ef79685ac72e655d23ec54763cce4aaf625b47f9675
 # requires X and wacom devices?
 make_check=no
 

From 4fbd19b06fcb5d14918e4a532ffd6eef18628457 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 18:32:36 +0100
Subject: [PATCH 02/21] 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 f7ea2b43ac00..affc86f87fc9 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 98093bdb558ba2a57a5c9b48d15f264bd6d71678 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 20:21:02 +0100
Subject: [PATCH 03/21] 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 bd8f0665b150..e923c3cc8632 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 e5ebe7d3e7d60d80aab3265f7837bf4b4e4fac5d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 20:27:16 +0100
Subject: [PATCH 04/21] cinnamon-screensaver: update to 5.8.0.

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

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 2c29d7744e89..f02144e4d0df 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.0
+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 libwebkit2gtk41-devel"
 depends="cinnamon-translations hicolor-icon-theme python3-gobject
  python3-setproctitle python3-xapp xapps"
 conf_files="/etc/pam.d/${pkgname}"
@@ -17,7 +16,7 @@ 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
+checksum=7ecf9354ea0ce057fc6c4ee267393c144f06a9fb80b797d34fe5a1423c9faefc
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"

From ac3323e5bccdf5578a04447c6f49ace2d05575d4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:46 +0100
Subject: [PATCH 05/21] 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 0972d9f69fb3..6dad113168c6 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 07d9cfa788c68c13e55140c7b8ac3fc096c6fc33 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:32:48 +0100
Subject: [PATCH 06/21] 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 3067648d1163..514e30fa031f 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 80a963417b8c5f4be6258929fe2a1821d1e24732 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:32:21 +0100
Subject: [PATCH 07/21] cinnamon-translations: update to 5.8.1.

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

diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index c7382d4bfad9..d444bc786b32 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.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext"
@@ -9,7 +9,7 @@ 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
+checksum=1cfd2065386bf444841f7818e833d9aadb19706a7dee5c3902b4e13b3d6a3851
 
 do_install() {
 	vmkdir usr

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

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

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 5df0651e77c7..ae2ca353db90 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,31 +1,32 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=5.4.9
-revision=2
-build_helper=gir
+version=5.8.2
+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
+ cinnamon-session>=${version%.*} muffin>=${version%.*} gsound touchegg
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
  cinnamon-translations>=${version%.*} nemo>=${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=d32b5f4a9d8010b04362ca3e6e58de6bcdf71bc5152990060d9925a2abf83927
 
 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 2069c86ad25c067edf09c3dde3ce7b253f72aa88 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 20:23:12 +0100
Subject: [PATCH 09/21] cjs: update to 5.8.0.

---
 srcpkgs/cjs/patches/fix-configure.diff | 11 +++++++++++
 srcpkgs/cjs/template                   | 17 ++++++-----------
 2 files changed, 17 insertions(+), 11 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 000000000000..24c1a0b63e7b
--- /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 b0fafe6603f8..6c0f54f235cb 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,26 +1,21 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=5.4.1
+version=5.8.0
 revision=1
 build_style=meson
-build_helper=gir
+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"
+hostmakedepends="pkg-config glib-devel dbus"
+makedepends="dbus-glib-devel readline-devel gtk+3-devel mozjs102
+ mozjs102-devel"
 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
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

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

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

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 6c30d4452451..5a7c83bfb9b1 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.0
+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=05480fa3d3cd58f6a79f71c2f0c91cef25578ac840a2d9524cd04cb9824e07b7
 
 post_install() {
 	vmkdir usr/share/gir-1.0

From a808703645030b219edb571c9080dc09821f054b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:34 +0100
Subject: [PATCH 11/21] 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 a7788a0acafa..e225728007f8 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="mobinmob <mobinmob@disroot.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 1f6c0978327b46f59c39e1c21d4a126fa999ce9a Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:26 +0100
Subject: [PATCH 12/21] nemo-compare: update to 5.8.0.

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

diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index 9e8cb9e4b46e..eeffc1f34734 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.0
+revision=1
 build_wrksrc=nemo-compare
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="mobinmob <mobinmob@disroot.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
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From 9e419c8005bb57fbd8b43d6664b98334d8cdb88f Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:11 +0100
Subject: [PATCH 13/21] 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 153f10e52906..a70f18d08157 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="mobinmob <mobinmob@disroot.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 d4f3db79523745c387495d9b455180199a4dea1d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 20:59:19 +0100
Subject: [PATCH 14/21] 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 78dfb5698051..4b8f36f7589a 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 103a8ccf350f8ebdada291337f1f45dd169b6fa2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:21 +0100
Subject: [PATCH 15/21] 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 9bc7f196636d..36b062cd0bff 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="mobinmob <mobinmob@disroot.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 f366bed77401b892c6f39d5a16f5386084a69d33 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 19:59:04 +0100
Subject: [PATCH 16/21] 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 beb14c4662a4..9814ea530e43 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="mobinmob <mobinmob@disroot.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 8808393497c405c215ad118c3a2a77a9a85a0d99 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 22:12:07 +0100
Subject: [PATCH 17/21] 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 5218bc746ab4..e75e98cbb4c9 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="mobinmob <mobinmob@disroot.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 e7d7326d57304f9001acf32cfdfe68751221eef4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 20:50:12 +0100
Subject: [PATCH 18/21] 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 b3f7679db2a0..1ad29395961f 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="mobinmob <mobinmob@disroot.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 595b30500edef80ca37fb29e60104d18c52297f4 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 19:45:01 +0100
Subject: [PATCH 19/21] 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 b9d7d46361ec..985208357e2a 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 b72137b1903c8dabf0f7d642424dba3fa559b0b2 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 18:43:46 +0100
Subject: [PATCH 20/21] 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 3bc356e7f835..03b3b494120e 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 d7396e7f774d336c4bd13dbd717296bf559d963d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 21:53:59 +0100
Subject: [PATCH 21/21] xreader: update to 3.8.1.

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index ee6d5e9b67f3..a38bb9cecd3e 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.1
+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=d6cb9786024b9ebf3bfc4c9fb580167eca5cdb8cfbab13f49109fb932c1bc210
 # XX dogtail is needed for testing (not in repo)
 # XX tests need xorg running
 make_check=no

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
@ 2023-06-29 17:00 ` sgn
  2023-06-29 17:01 ` sgn
                   ` (34 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2023-06-29 17:00 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1246906890

Comment:
Why do we need this patch.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
  2023-06-29 17:00 ` [PR REVIEW] " sgn
@ 2023-06-29 17:01 ` sgn
  2023-06-30 16:10 ` mhmdanas
                   ` (33 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2023-06-29 17:01 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1246907454

Comment:
We may need `gtk4-devel`

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
  2023-06-29 17:00 ` [PR REVIEW] " sgn
  2023-06-29 17:01 ` sgn
@ 2023-06-30 16:10 ` mhmdanas
  2023-06-30 16:17 ` mhmdanas
                   ` (32 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-06-30 16:10 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1248049310

Comment:
Without this, `do_configure` fails with this error:

```
installed-tests/js/meson.build:206:3: ERROR: Unknown variable "have_gtk4".
```

I also plan to submit a fix upstream.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (2 preceding siblings ...)
  2023-06-30 16:10 ` mhmdanas
@ 2023-06-30 16:17 ` mhmdanas
  2023-06-30 16:27 ` mhmdanas
                   ` (31 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-06-30 16:17 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1248055791

Comment:
Reading through meson.build, it seems that gtk4-devel is only needed for tests (and gtk+3-devel doesn't seem to be needed at all).

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (3 preceding siblings ...)
  2023-06-30 16:17 ` mhmdanas
@ 2023-06-30 16:27 ` mhmdanas
  2023-06-30 18:56 ` [PR PATCH] [Updated] " mhmdanas
                   ` (30 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-06-30 16:27 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1248055791

Comment:
Reading through meson.build, it seems that gtk4-devel is only needed for some tests (and gtk+3-devel doesn't seem to be needed at all).

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (4 preceding siblings ...)
  2023-06-30 16:27 ` mhmdanas
@ 2023-06-30 18:56 ` mhmdanas
  2023-07-05 13:31 ` dmarto
                   ` (29 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-06-30 18:56 UTC (permalink / raw)
  To: ml

[-- 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: 31352 bytes --]

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

---
 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 d7c330972a1a..a3a13f18cdf8 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.1
+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=b2d7aebe0fd5b25d7d951ef79685ac72e655d23ec54763cce4aaf625b47f9675
 # requires X and wacom devices?
 make_check=no
 

From 5189dd60b0af06158d174e688e3dfa4a9d3e1793 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 18:32:36 +0100
Subject: [PATCH 02/21] 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 f7ea2b43ac00..affc86f87fc9 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 02d154339b91c626af36fd1e12402b02797a1287 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 20:21:02 +0100
Subject: [PATCH 03/21] 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 bd8f0665b150..e923c3cc8632 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 0bc25b6afc0303da6ae26e004410800a8042bb78 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 20:27:16 +0100
Subject: [PATCH 04/21] cinnamon-screensaver: update to 5.8.0.

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

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 2c29d7744e89..f02144e4d0df 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.0
+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 libwebkit2gtk41-devel"
 depends="cinnamon-translations hicolor-icon-theme python3-gobject
  python3-setproctitle python3-xapp xapps"
 conf_files="/etc/pam.d/${pkgname}"
@@ -17,7 +16,7 @@ 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
+checksum=7ecf9354ea0ce057fc6c4ee267393c144f06a9fb80b797d34fe5a1423c9faefc
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"

From 0f88491257ebabeca4aa98e5a5d5c6b3d61e5e0c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:46 +0100
Subject: [PATCH 05/21] 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 0972d9f69fb3..6dad113168c6 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 7c2c0922917eddf84c8b67c29315b417c2b55bd7 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:32:48 +0100
Subject: [PATCH 06/21] 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 3067648d1163..514e30fa031f 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 88000ca42a6bbb27786a966bf98b2730ffeeb826 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:32:21 +0100
Subject: [PATCH 07/21] cinnamon-translations: update to 5.8.1.

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

diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index c7382d4bfad9..d444bc786b32 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.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext"
@@ -9,7 +9,7 @@ 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
+checksum=1cfd2065386bf444841f7818e833d9aadb19706a7dee5c3902b4e13b3d6a3851
 
 do_install() {
 	vmkdir usr

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

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

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 5df0651e77c7..72646225eeec 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,31 +1,32 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=5.4.9
-revision=2
-build_helper=gir
+version=5.8.3
+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
+ cinnamon-session>=${version%.*} muffin>=${version%.*} gsound touchegg
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
  cinnamon-translations>=${version%.*} nemo>=${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=ffc948d251d9ac7e38c164334e0fee77922de31724ccee63ea50c2d3a81eec89
 
 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 d870a21babb7c139ee7338a1b287253de23ff137 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 20:23:12 +0100
Subject: [PATCH 09/21] 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 000000000000..24c1a0b63e7b
--- /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 b0fafe6603f8..5b04ce5ee7e1 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 a9423f6637035247b66571addd0c218c826526d3 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:56 +0100
Subject: [PATCH 10/21] muffin: update to 5.8.0.

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

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 6c30d4452451..5a7c83bfb9b1 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.0
+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=05480fa3d3cd58f6a79f71c2f0c91cef25578ac840a2d9524cd04cb9824e07b7
 
 post_install() {
 	vmkdir usr/share/gir-1.0

From da93fe857f6785c865956e43d10b4acebccb822d Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:34 +0100
Subject: [PATCH 11/21] 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 a7788a0acafa..e225728007f8 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="mobinmob <mobinmob@disroot.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 9b6734a7080b7d1b83cd2f9f0731272feac82047 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:26 +0100
Subject: [PATCH 12/21] nemo-compare: update to 5.8.0.

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

diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index 9e8cb9e4b46e..eeffc1f34734 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.0
+revision=1
 build_wrksrc=nemo-compare
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="mobinmob <mobinmob@disroot.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
+checksum=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28

From 277718a3b4a3e373366772eaea2c7d8dc190ba2b Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:11 +0100
Subject: [PATCH 13/21] 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 153f10e52906..a70f18d08157 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="mobinmob <mobinmob@disroot.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 f7ae1c41f0e27997953fac1c63e306fc6040fee9 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 20:59:19 +0100
Subject: [PATCH 14/21] 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 78dfb5698051..4b8f36f7589a 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 6409827c2f41530de5482b4198b097fdc493cc7c Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Fri, 23 Jun 2023 12:31:21 +0100
Subject: [PATCH 15/21] 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 9bc7f196636d..36b062cd0bff 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="mobinmob <mobinmob@disroot.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 e55f298f7a7208c3d34313b6ad8a91385c56190e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 22 Jun 2023 19:59:04 +0100
Subject: [PATCH 16/21] 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 beb14c4662a4..9814ea530e43 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="mobinmob <mobinmob@disroot.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 00cdd81f13cf34441f010622d8588fb7b5ede5b7 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 22:12:07 +0100
Subject: [PATCH 17/21] 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 5218bc746ab4..e75e98cbb4c9 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="mobinmob <mobinmob@disroot.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 3ea82f00186c73e4abf5ca8a5907427cecaff2cf Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 20:50:12 +0100
Subject: [PATCH 18/21] 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 b3f7679db2a0..1ad29395961f 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="mobinmob <mobinmob@disroot.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 44d328ca43ec721471bcc09ec1d38659b0998ebd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 20 Jun 2023 19:45:01 +0100
Subject: [PATCH 19/21] 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 b9d7d46361ec..985208357e2a 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 2ca5e82c5ffd5f8b2982b7ebd89735f6ff13d798 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 18:43:46 +0100
Subject: [PATCH 20/21] 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 3bc356e7f835..03b3b494120e 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 6845f0eb1515df4112dc6d075240e4bbc5c3c9b1 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 19 Jun 2023 21:53:59 +0100
Subject: [PATCH 21/21] xreader: update to 3.8.1.

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

diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index ee6d5e9b67f3..a38bb9cecd3e 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.1
+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=d6cb9786024b9ebf3bfc4c9fb580167eca5cdb8cfbab13f49109fb932c1bc210
 # XX dogtail is needed for testing (not in repo)
 # XX tests need xorg running
 make_check=no

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (5 preceding siblings ...)
  2023-06-30 18:56 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-07-05 13:31 ` dmarto
  2023-07-05 14:33 ` mhmdanas
                   ` (28 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: dmarto @ 2023-07-05 13:31 UTC (permalink / raw)
  To: ml

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

New comment by dmarto on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1621765590

Comment:
@mhmdanas should I test this (I daily cinnamon), or should I wait for non-draft status? 

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (6 preceding siblings ...)
  2023-07-05 13:31 ` dmarto
@ 2023-07-05 14:33 ` mhmdanas
  2023-07-07 13:02 ` dmarto
                   ` (27 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-05 14:33 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1621889078

Comment:
@dmarto this should be fine to test. I've marked it as draft because of the lack of testing and because of the CI check failure on cjs.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (7 preceding siblings ...)
  2023-07-05 14:33 ` mhmdanas
@ 2023-07-07 13:02 ` dmarto
  2023-07-10 15:31 ` mhmdanas
                   ` (26 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: dmarto @ 2023-07-07 13:02 UTC (permalink / raw)
  To: ml

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

New comment by dmarto on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1625384192

Comment:
Rebased on 14cd86c79b2e1efa0da0d5ad1964def54080c439; built and running for close to an hour already, and will continue to use it.

My only request is to drop "touchegg" from `depends` as it is an optional dependency, and as one of the crazy people that daily uses a touchpad on a computer (not laptop), I also don't find it particularly good. 

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (8 preceding siblings ...)
  2023-07-07 13:02 ` dmarto
@ 2023-07-10 15:31 ` mhmdanas
  2023-07-10 23:04 ` dmarto
                   ` (25 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-10 15:31 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1629201884

Comment:
Thanks for the feedback.

> My only request is to drop "touchegg" from depends as it is an optional dependency, and as one of the crazy people that daily uses a touchpad on a computer (not laptop), I also don't find it particularly good.

Do you think adding it to `cinnamon-all` is a good idea? I added it because it was recommended in one of the package's changelogs (though I don't recall which one).

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (9 preceding siblings ...)
  2023-07-10 15:31 ` mhmdanas
@ 2023-07-10 23:04 ` dmarto
  2023-07-21 18:58 ` [PR PATCH] [Updated] " mhmdanas
                   ` (24 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: dmarto @ 2023-07-10 23:04 UTC (permalink / raw)
  To: ml

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

New comment by dmarto on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1629848444

Comment:
hah, I didn't know about `cinnamon-all`, I don't have it, but I guess it makes sense to include the dep there 

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (10 preceding siblings ...)
  2023-07-10 23:04 ` dmarto
@ 2023-07-21 18:58 ` mhmdanas
  2023-07-21 18:58 ` mhmdanas
                   ` (23 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-21 18:58 UTC (permalink / raw)
  To: ml

[-- 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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (11 preceding siblings ...)
  2023-07-21 18:58 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-07-21 18:58 ` mhmdanas
  2023-07-21 18:58 ` mhmdanas
                   ` (22 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-21 18:58 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1646122178

Comment:
@dmarto I pushed some more updates, can you please test those too?

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (12 preceding siblings ...)
  2023-07-21 18:58 ` mhmdanas
@ 2023-07-21 18:58 ` mhmdanas
  2023-07-21 18:59 ` [PR PATCH] [Updated] " mhmdanas
                   ` (21 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-21 18:58 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1646122178

Comment:
@dmarto I pushed some more updates, can you please test again?

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (13 preceding siblings ...)
  2023-07-21 18:58 ` mhmdanas
@ 2023-07-21 18:59 ` mhmdanas
  2023-07-21 18:59 ` mhmdanas
                   ` (20 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-21 18:59 UTC (permalink / raw)
  To: ml

[-- 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 6d738674cf90f72348d1b251ce594c93fa7d094e 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (14 preceding siblings ...)
  2023-07-21 18:59 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-07-21 18:59 ` mhmdanas
  2023-07-22 20:45 ` mhmdanas
                   ` (19 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-21 18:59 UTC (permalink / raw)
  To: ml

[-- 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: 32881 bytes --]

From b520b53309e64ea91bce1e681411be30df86c8f5 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] 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 f32cc21f64aaf0bd3e797917ad0026fdb3c30f05 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 b1da5149a910035d2e5f8ead8840a5f2dcf0b511 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 9c400fd041f02fa0ad09afb3edd516f41525e98d 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 0d29c724ce15a0aec7947b86ec59d398394628a0 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 1f906d8a7ffd93e9f20874a252edcfac70d419ac 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 60f0289b43c6743a6908a2aaf24407d64493561f 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 18a4e3d969af56743a0f767c7bda2cfa9ad6ac66 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 efb15cd57119092e86f262bdb4ef5d808d9eddca 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 ebb4c92236384c306a4a296da9b99b1a2448dd63 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 f831339bae810e30d64f92ccdf728bc9b0b83de3 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 321393d7aedebcfbebf2c47a72b4c7dd3eec4f3f 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 fe1491c6be5b1030ed9963b5f1c64df25acd068c 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 5119e4a82d93a8bb2152b7608397bb1363ce500f 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 156dd15b377948694004bb5448b2fcbf4fcb927e 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 8a09d7a01f3c2c6819057356d0806e86b1a50e70 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 0ff0d7b4d7a26fa8818b0db507acf0a7d9dafc83 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 74bc65a6301a590c5b9e9a4efea37540360840bd 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 29c9b445a02b92881af981e86a9f08229a99b757 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 47d6876b1d073befde544800234de509159f9e28 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 dd4073d1e5ea2739a4bb22ceb2e3d96563fccffe 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 40258f28a6d50953224b4ad93d363270f23ad199 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (15 preceding siblings ...)
  2023-07-21 18:59 ` mhmdanas
@ 2023-07-22 20:45 ` mhmdanas
  2023-07-22 20:46 ` [PR REVIEW] " mhmdanas
                   ` (18 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-22 20:45 UTC (permalink / raw)
  To: ml

[-- 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: 34097 bytes --]

From 91866f6ac0a40ac13db72801f9c1add00516990d 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] 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 a19b0279363f2ab6e79614114d75efdfa0d5b203 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 a2657e8f18d6835fb1f563a3c675ff99f1059af2 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 22d1f5d722c94d9495e2552b7c678fe1aa53dadf 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 ae57b3bfa5db7ec1a4173bd41470a95414f7ea9c 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 8b69db04e8916e89107a5229cffabd67c6222fe6 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 38748574c8a860962145d0902b6d384d765259fa 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 4c65358ba2a121c7a5725672f7b1b5a841b5cdc4 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 5f2be7db97aa7baede76bbbb34a7365dff394383 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.

---
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 +++++++++++++++++++
 srcpkgs/cjs/template                          | 29 ++++++------
 2 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch

diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 0000000000000..3c1c7e0599f47
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
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 5560d3938c366e940a8882913bdeb80ccaa4bf96 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 330a9b680466276aaab29e32e35c112b745c9cf6 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 2e25c474d0b25116635eeeac618f23a36240586d 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 cb34e71e498028d2bb5869827d7d66dc63c2a85f 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 2f5cfc08d48c547cf19ad9f741876e1d41dd81cb 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 4e45d0c43084885435e52bc3adbed1e42b6e82f4 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 13f66d7bfa94b1364246bf067a3c40be089e8df4 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 efeec2c5431cdaede264633febec67b5d1c36b58 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 aa13038e8a44b553f739c7c48556e83650dc93f9 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 bbf14b8f9c1d5f5248c87212e6b3f564bfe92d8c 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 ea2dc9d2f5074d3b867a331f486d1ca38d1e2985 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 bd798151e3431a84a8691e57c429e730941fde7e 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 138b1fc065f1d64c75fc7ad97c557153d0375d04 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (16 preceding siblings ...)
  2023-07-22 20:45 ` mhmdanas
@ 2023-07-22 20:46 ` mhmdanas
  2023-07-23  0:20 ` dmarto
                   ` (17 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-22 20:46 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1271341006

Comment:
A fix was implemented upstream (https://github.com/linuxmint/cjs/commit/fb480aae4eff422c3acd275c0108e970eafcdcb9), and I replaced my patch with it.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (17 preceding siblings ...)
  2023-07-22 20:46 ` [PR REVIEW] " mhmdanas
@ 2023-07-23  0:20 ` dmarto
  2023-07-23  0:30 ` dmarto
                   ` (16 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: dmarto @ 2023-07-23  0:20 UTC (permalink / raw)
  To: ml

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

New comment by dmarto on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1646699827

Comment:
idk, what you changed, so here is what xbps update based on https://github.com/void-linux/void-packages/commit/138b1fc065f1d64c75fc7ad97c557153d0375d04
```
Name                       Action    Version           New version            Download size
cinnamon                   update    5.8.3_1           5.8.4_1                - 
cinnamon-control-center    update    5.8.1_1           5.8.2_1                - 
cinnamon-screensaver       update    5.8.0_1           5.8.1_1                - 
cinnamon-translations      update    5.8.1_1           5.8.2_1                - 
libcinnamon-control-center update    5.8.1_1           5.8.2_1                - 
muffin                     update    5.8.0_1           5.8.1_1                - 
```

will report back, in a day :) 

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (18 preceding siblings ...)
  2023-07-23  0:20 ` dmarto
@ 2023-07-23  0:30 ` dmarto
  2023-07-24  1:00 ` dmarto
                   ` (15 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: dmarto @ 2023-07-23  0:30 UTC (permalink / raw)
  To: ml

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

New comment by dmarto on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1646699827

Comment:
idk, what you changed, so here is what xbps updated based on https://github.com/void-linux/void-packages/commit/138b1fc065f1d64c75fc7ad97c557153d0375d04
```
Name                       Action    Version           New version            Download size
cinnamon                   update    5.8.3_1           5.8.4_1                - 
cinnamon-control-center    update    5.8.1_1           5.8.2_1                - 
cinnamon-screensaver       update    5.8.0_1           5.8.1_1                - 
cinnamon-translations      update    5.8.1_1           5.8.2_1                - 
libcinnamon-control-center update    5.8.1_1           5.8.2_1                - 
muffin                     update    5.8.0_1           5.8.1_1                - 
```

will report back, in a day :) 

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (19 preceding siblings ...)
  2023-07-23  0:30 ` dmarto
@ 2023-07-24  1:00 ` dmarto
  2023-07-25 17:14 ` mhmdanas
                   ` (14 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: dmarto @ 2023-07-24  1:00 UTC (permalink / raw)
  To: ml

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

New comment by dmarto on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1646699827

Comment:
idk, what you changed, so here is what xbps updated based on https://github.com/void-linux/void-packages/commit/138b1fc065f1d64c75fc7ad97c557153d0375d04
```
Name                       Action    Version           New version            Download size
cinnamon                   update    5.8.3_1           5.8.4_1                - 
cinnamon-control-center    update    5.8.1_1           5.8.2_1                - 
cinnamon-screensaver       update    5.8.0_1           5.8.1_1                - 
cinnamon-translations      update    5.8.1_1           5.8.2_1                - 
libcinnamon-control-center update    5.8.1_1           5.8.2_1                - 
muffin                     update    5.8.0_1           5.8.1_1                - 
```

will report back, in a day :) 

edit: no issues found, all good here 

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (20 preceding siblings ...)
  2023-07-24  1:00 ` dmarto
@ 2023-07-25 17:14 ` mhmdanas
  2023-07-25 17:18 ` [PR PATCH] [Updated] " mhmdanas
                   ` (13 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-25 17:14 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#issuecomment-1650226394

Comment:
@dmarto thanks for testing. What remains at this point is fixing the `cjs` tests on musl; I opened [a ticket](https://github.com/linuxmint/cjs/issues/118) for that.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (21 preceding siblings ...)
  2023-07-25 17:14 ` mhmdanas
@ 2023-07-25 17:18 ` mhmdanas
  2023-07-25 18:45 ` mhmdanas
                   ` (12 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-25 17:18 UTC (permalink / raw)
  To: ml

[-- 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: 34659 bytes --]

From c8355837d6e173503c2c43c9ea221aacb15bbc5f 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] 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 95f87532e1c24b86a25faacf99db6bc724804011 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 f3ffda10548d04042158d74110905005d983bb45 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 cdb9f178b9a3d11f87d066ec87caf5ae273db729 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 57417bc3fb557e10d08ebbdf6340093763461d59 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 6c02b02ccf2801b7decfb0994cfa9e579c5ed6af 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 4b729669d74e30176e1d5d51860bb74089b8942e 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 e00849dee05dd1ff42e2476a097f5744cc436267 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 41d5a5a09da8a971935c9af4760fa94473cd933c 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.

---
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 +++++++++++++++++++
 srcpkgs/cjs/template                          | 29 ++++++------
 2 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch

diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 0000000000000..3c1c7e0599f47
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
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 3dd289ca99d5cd2e373a13949da95dde947d7584 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 e11e9220c03371203d780d17d183ed0a2f788680 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 5f9548132139fd3fc80f2a2ad9df3965d816c0b5 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 83a502d8786885198e9735471a703303760bff2d 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 4e5c5d6d5669db1d20f52d126e733c07e0cd0797 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, adopt.

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

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 78dfb56980515..8fa00c1b719f2 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
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="nemo-devel libglib-devel"
 depends="file-roller"
 short_desc="Nemo file roller extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 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 a8f76bcf622670230df74ec449264639a420671a 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 7d8fa4293bd84aa475a9ffacaeaa448a164018e5 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 4eae70107d65b12cfc9741efcfc70ee6bb3340ef 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 70aff9e1c14e7674845cad0de1e62b7575c53d9f 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 05745469656b5f73a5a9bda197174f7173270e27 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 2b8349365666d255411a854504d30f297b4c6274 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 3bc356e7f835e..e64051d22d76e 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"
@@ -11,10 +11,10 @@ depends="inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 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
+homepage="https://github.com/linuxmint/xapp"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog"
+distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz"
+checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From 09a29d99cec671a3897908f82e944c13cf420e46 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 01e7f268408076d4dda9115b38487d9d5372d1f1 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (22 preceding siblings ...)
  2023-07-25 17:18 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-07-25 18:45 ` mhmdanas
  2023-07-25 18:49 ` mhmdanas
                   ` (11 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-25 18:45 UTC (permalink / raw)
  To: ml

[-- 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: 34698 bytes --]

From 4b3cf74c408f7dcf20062024b53e16428b80975c 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] 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 3e2c9296d81d24cee830d10dab324f3a27b9bcf5 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 3ca7172168f494c3938e5d075fb548889cf92e16 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 d270457ff6acac09435d1c3f0d96b68140628e7b 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 f70459407ced450cbca0e98cac11bb9b9b8e1315 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 3591a68485f41e741de93ce96816df4a03ef8007 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 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 3067648d11633..e1a57b6c27814 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,8 +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
-make_check=no
+checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From cb3b9f705ea5f353971b555f8ac12d25729b9e2f 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 a2ed46d8b882a12031701d45b7323d4960d87759 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 6b865d1f2a30fff0bc2e1e417be76b1ba0267eed 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.

---
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 +++++++++++++++++++
 srcpkgs/cjs/template                          | 29 ++++++------
 2 files changed, 61 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch

diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 0000000000000..3c1c7e0599f47
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
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 e0d008dbfdba45189dfc40d254d6ecfff9016f27 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 d59069090f549e3fbc10b0f5a1858ffe42cbce41 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 378315ce608e15930eb21cbb032aa55d1247b3b0 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 c9da7a627bce9ebf610577d4d09f9ca77c71d64a 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 9d766dc290a3cb7806d107ffef2cae813d5a5ded 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, adopt.

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

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 78dfb56980515..8fa00c1b719f2 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
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="nemo-devel libglib-devel"
 depends="file-roller"
 short_desc="Nemo file roller extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 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 7d906503de2272f088a260a7b16b7ced0b049a3d 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 1f49c7d4594f8a2d2a744c405d8e2a21ac01a92d 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 e1c850b00954bd089c4142b1fd442c304d71bb21 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 272697d9fb58a0fcaaacf271430e5cb932581d37 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 0d1926b03dc9efb5ca1b1c5b2b0ad42d40ecba44 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 bcf1293857e068454c44b12bdadad2e48dbcf838 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 3bc356e7f835e..e64051d22d76e 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"
@@ -11,10 +11,10 @@ depends="inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 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
+homepage="https://github.com/linuxmint/xapp"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog"
+distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz"
+checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From 9f50217e069a564d4708e7923800d960dcab6627 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 16bedb52e3cae8808b35a31142ef003adbc9aa51 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (23 preceding siblings ...)
  2023-07-25 18:45 ` mhmdanas
@ 2023-07-25 18:49 ` mhmdanas
  2023-07-25 19:21 ` mhmdanas
                   ` (10 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-25 18:49 UTC (permalink / raw)
  To: ml

[-- 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: 35128 bytes --]

From 4b3cf74c408f7dcf20062024b53e16428b80975c 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] 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 3e2c9296d81d24cee830d10dab324f3a27b9bcf5 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 3ca7172168f494c3938e5d075fb548889cf92e16 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 d270457ff6acac09435d1c3f0d96b68140628e7b 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 f70459407ced450cbca0e98cac11bb9b9b8e1315 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 3591a68485f41e741de93ce96816df4a03ef8007 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 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 3067648d11633..e1a57b6c27814 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,8 +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
-make_check=no
+checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From cb3b9f705ea5f353971b555f8ac12d25729b9e2f 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 275072f93a0b8b9485574e28fa47b2e6f5564055 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/template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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 60c712cf19b47c869ee5c1b26afa131b6eb9bb9e 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.

---
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 +++++++++++++++++++
 .../cjs/patches/ignore-encoding-test.patch    | 11 +++++
 srcpkgs/cjs/template                          | 29 ++++++------
 3 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
 create mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch

diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 0000000000000..3c1c7e0599f47
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
diff --git a/srcpkgs/cjs/patches/ignore-encoding-test.patch b/srcpkgs/cjs/patches/ignore-encoding-test.patch
new file mode 100644
index 0000000000000..98c42ad101097
--- /dev/null
+++ b/srcpkgs/cjs/patches/ignore-encoding-test.patch
@@ -0,0 +1,11 @@
+broken on musl
+--- a/installed-tests/js/meson.build
+--- b/installed-tests/js/meson.build
+@@ -242,7 +242,6 @@ modules_tests = [
+     'Console',
+     'ESModules',
+     'AsyncMainloop',
+-    'Encoding',
+     'GLibLogWriter',
+     'Global',
+     'Timers',
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 abda005bd01db7791a5076843a17987bfca0e37d 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 e292289450d6c631299dffeea806bfe389b6c2c4 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 6ade1e95bb4cd68da3f20ae6d514ad1df3e2c9f2 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 51552f11855f28ff669c2ac8a51955c707e4ea66 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 b013321793bad3b19139b7ddaac366d5ef080b48 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, adopt.

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

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 78dfb56980515..8fa00c1b719f2 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
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="nemo-devel libglib-devel"
 depends="file-roller"
 short_desc="Nemo file roller extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 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 899f92f1191ba3e182d15b4940667d40fdab3223 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 3e5a89b8207f1243fb95a3dde8f62c72af5fdd80 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 1657a318d64dce61b7c2974dfe21bca79f1ba884 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 8800632becab361d5406a077d50fba52889865ec 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 a067d9290540de553721495ffe6b28c2fcb8f500 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 f0b4c1fcca867d4651ea9a4dd2eae60b7c8e675b 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 3bc356e7f835e..e64051d22d76e 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"
@@ -11,10 +11,10 @@ depends="inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 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
+homepage="https://github.com/linuxmint/xapp"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog"
+distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz"
+checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From c692cc44cce1949aaa286e027d597468f53f2c3b 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 d7fe467b5520e0439bd253fbe5d2e56cc479a843 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (24 preceding siblings ...)
  2023-07-25 18:49 ` mhmdanas
@ 2023-07-25 19:21 ` mhmdanas
  2023-07-26  8:21 ` [PR REVIEW] " sgn
                   ` (9 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-25 19:21 UTC (permalink / raw)
  To: ml

[-- 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: 35123 bytes --]

From fdd2a0b9655dd82b50b3d8f18cd2113e96649c05 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] 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 9832b9cb359a8eeb83d673aad7cc546a2d914762 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 591f50ca42fa5af3ed0f47fba38f6acf545f3a50 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 b8c5e651cce9eaac7b6ae2c4845e7a1b0eabc0e7 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 ae83ad2142c7ff541571437cc0b4f61af454bb34 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 1d0e30fe043d0e5878b4d2c8cdad7d4b2983ba5b 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 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 3067648d11633..e1a57b6c27814 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,8 +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
-make_check=no
+checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From 3c994ce9e8888285a69b72fe787620e819c3a9b9 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 7e70a4bfc4f6ed98c515399df43c0e2197a65cc4 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/template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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 4c8415d476e8e031155c89e2af53e83546aef1ed 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.

---
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 +++++++++++++++++++
 .../cjs/patches/ignore-encoding-test.patch    | 11 +++++
 srcpkgs/cjs/template                          | 29 ++++++------
 3 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
 create mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch

diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 0000000000000..3c1c7e0599f47
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
diff --git a/srcpkgs/cjs/patches/ignore-encoding-test.patch b/srcpkgs/cjs/patches/ignore-encoding-test.patch
new file mode 100644
index 0000000000000..98c42ad101097
--- /dev/null
+++ b/srcpkgs/cjs/patches/ignore-encoding-test.patch
@@ -0,0 +1,11 @@
+broken on musl
+--- a/installed-tests/js/meson.build
+--- b/installed-tests/js/meson.build
+@@ -242,7 +242,6 @@ modules_tests = [
+     'Console',
+     'ESModules',
+     'AsyncMainloop',
+-    'Encoding',
+     'GLibLogWriter',
+     'Global',
+     'Timers',
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index b0fafe6603f8c..e32d77e1b0156 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="dbus xvfb-run gtk+3"
 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 25bfcf455eff385bb4bfd323e67fbfbba20dd8a2 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 b9ac658912d444d75a65fbcdf034063d84eb6706 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 8b95d6aebdad072dbcf5bde5bdf8fb7777bb4e4a 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 735db92ef69c3c254387a3ef21c71977032863cd 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 38b3c8150aa3f6271e7dd50803bf6cad9da3c821 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, adopt.

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

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 78dfb56980515..8fa00c1b719f2 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
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="nemo-devel libglib-devel"
 depends="file-roller"
 short_desc="Nemo file roller extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 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 dcab267f76531bec5d7c373a6fb82f57e4f3fa53 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 b20f43572b04c1056cae20819361c650c70b23db 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 0bb56bad8733464af402c65cba9621789839f4e0 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 158662261445e2444ab4e026ddadac0ab4d7f02c 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 62c58de91508b17f19f90f2ab81fa2489eb6c499 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 99e90b6aa4103ef4dc91bf768e84efda0936e7b4 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 3bc356e7f835e..e64051d22d76e 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"
@@ -11,10 +11,10 @@ depends="inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 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
+homepage="https://github.com/linuxmint/xapp"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog"
+distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz"
+checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From 111d7ef6ad44900be5b42b7c6b81b4c37add91da 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 79b9ce1aa8ed5ea0829ffd968d6d3b6d6d6e57b7 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (25 preceding siblings ...)
  2023-07-25 19:21 ` mhmdanas
@ 2023-07-26  8:21 ` sgn
  2023-07-26 11:45 ` [PR PATCH] [Updated] " mhmdanas
                   ` (8 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2023-07-26  8:21 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1274553365

Comment:
Do not skip anything. Just build them all.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (26 preceding siblings ...)
  2023-07-26  8:21 ` [PR REVIEW] " sgn
@ 2023-07-26 11:45 ` mhmdanas
  2023-07-26 12:24 ` [PR REVIEW] " mhmdanas
                   ` (7 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-26 11:45 UTC (permalink / raw)
  To: ml

[-- 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: 34942 bytes --]

From 093ee60a32351e243c282180925526fc6cf429a6 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] 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 53fef74e6b4e9f8a55c5b44d9db524c51977077a 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 61c21ca7f0a987bb3b0405c1dfc1149d01da99b8 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 edeb84e77125fdd7013a160068243f737aa970f6 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 598acb9a875c72adc0a183164c86f4df800cfd6d 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 83e360af7042edfa241b8480032125c6afa3c499 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 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 3067648d11633..e1a57b6c27814 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,8 +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
-make_check=no
+checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From 53f347bed9e5b1dae83377650ff61a219bf74775 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 8b30239547ff9892e3c3198d58c4b0a47d5508fd 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/template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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 99dd23d802ea28ffff9a56f7a9d61ad167c92016 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.

---
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 +++++++++++++++++++
 .../cjs/patches/ignore-encoding-test.patch    | 11 +++++
 srcpkgs/cjs/template                          | 23 ++++------
 3 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
 create mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch

diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 0000000000000..3c1c7e0599f47
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
diff --git a/srcpkgs/cjs/patches/ignore-encoding-test.patch b/srcpkgs/cjs/patches/ignore-encoding-test.patch
new file mode 100644
index 0000000000000..98c42ad101097
--- /dev/null
+++ b/srcpkgs/cjs/patches/ignore-encoding-test.patch
@@ -0,0 +1,11 @@
+broken on musl
+--- a/installed-tests/js/meson.build
+--- b/installed-tests/js/meson.build
+@@ -242,7 +242,6 @@ modules_tests = [
+     'Console',
+     'ESModules',
+     'AsyncMainloop',
+-    'Encoding',
+     'GLibLogWriter',
+     'Global',
+     'Timers',
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index b0fafe6603f8c..630c217741858 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,26 +1,21 @@
 # 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="dbus xvfb-run gtk+3"
 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_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d17f822fc8179c9c2223692b1461d7caa886c898 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 5b827a424dc282a5d5628696944f7e5983cfc150 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 aa62780b135db163d3b8fa7d83e4ebe9c3a04d9a 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 ab640aae911832a8a48a441d2b0cebcbf26c5553 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 1651246ab93b501bb4cfa69efd44eee30eb88221 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, adopt.

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

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 78dfb56980515..8fa00c1b719f2 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
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="nemo-devel libglib-devel"
 depends="file-roller"
 short_desc="Nemo file roller extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 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 b8b05d2a5e633ed3293f1820838481edee554ad0 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 94619b5cf71571229ecd0d8f8336f014f895a247 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 fec6cb154796d161a223373299c10d428fe85dcd 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 cbee470043e4370d1cd9a74bac1197394539f06a 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 14cd1b0b0545de54f28cb14dd7b1146ae4eaeaab 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 be34ec3a4d16556d4d7de25b650a36d0bce6cb0c 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 3bc356e7f835e..e64051d22d76e 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"
@@ -11,10 +11,10 @@ depends="inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 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
+homepage="https://github.com/linuxmint/xapp"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog"
+distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz"
+checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From ddfa04bc4771d906a839aa459874868aadfecd6a 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 c76427b68d8f1e66ed5bf6231a49dd2a5128cb7e 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (27 preceding siblings ...)
  2023-07-26 11:45 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-07-26 12:24 ` mhmdanas
  2023-07-26 12:24 ` mhmdanas
                   ` (6 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-26 12:24 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1274879442

Comment:
Without them, buliding without tests fails with a `meson.build:272:19: ERROR: Program 'dbus-run-session' not found or not executable` error as can be seen in the CI, so I think they ought to be kept (at least the `-Dskip_dbus_tests=true`, I haven't figured out if the gtk parameter is needed too). The gjs template also does a similar thing.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (28 preceding siblings ...)
  2023-07-26 12:24 ` [PR REVIEW] " mhmdanas
@ 2023-07-26 12:24 ` mhmdanas
  2023-07-26 15:41 ` sgn
                   ` (5 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-26 12:24 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1274879442

Comment:
Without them, buliding without `-Q` fails with a `meson.build:272:19: ERROR: Program 'dbus-run-session' not found or not executable` error as can be seen in the CI, so I think they ought to be kept (at least the `-Dskip_dbus_tests=true`, I haven't figured out if the gtk parameter is needed too). The gjs template also does a similar thing.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (29 preceding siblings ...)
  2023-07-26 12:24 ` mhmdanas
@ 2023-07-26 15:41 ` sgn
  2023-07-26 15:42 ` sgn
                   ` (4 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2023-07-26 15:41 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1275163241

Comment:
Let's add it unconditionally.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (30 preceding siblings ...)
  2023-07-26 15:41 ` sgn
@ 2023-07-26 15:42 ` sgn
  2023-07-26 16:11 ` [PR PATCH] [Updated] " mhmdanas
                   ` (3 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: sgn @ 2023-07-26 15:42 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1275165392

Comment:
I meant add those `checkdepends` into `hostmakedepends`

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] Update Cinnamon packages
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (31 preceding siblings ...)
  2023-07-26 15:42 ` sgn
@ 2023-07-26 16:11 ` mhmdanas
  2023-07-28 18:37 ` [PR REVIEW] Cinnamon 5.8.x classabbyamp
                   ` (2 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-26 16:11 UTC (permalink / raw)
  To: ml

[-- 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: 34925 bytes --]

From 9543a75512f128b466c5598db4458b351d139bb5 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] 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 a263f647d4d6411e7db528d581d8b24ea42f8474 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 b1ee30c42ff88e9a14d1ac3b45d95f44905ac53d 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 bbb0f0bd14e1c3bf4ae1668c1d07a6b3a6c5080f 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 fea0c895e9f00126f92f14c519d113509bfb6924 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 e9a851ed224ee19c395d7024634cadaf0ae9dc1a 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 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 3067648d11633..e1a57b6c27814 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,8 +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
-make_check=no
+checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From 4de58b0f50731c483695618d422d6d93de6617ed 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 d7ce2b876749a3f4339d2f698280524206ea6592 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/template | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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 342aa176cee28250b3d00126e5c9a92295d6af01 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.

---
 ...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 +++++++++++++++++++
 .../cjs/patches/ignore-encoding-test.patch    | 11 +++++
 srcpkgs/cjs/template                          | 22 ++++-----
 3 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
 create mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch

diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
new file mode 100644
index 0000000000000..3c1c7e0599f47
--- /dev/null
+++ b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
@@ -0,0 +1,46 @@
+From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build                    |  4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 62a935d1..877d18df 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+ 
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+-    # FIXME: find out why GTK4 tries to acquire a message bus
+-    dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++    have_gtk4 = dependency('gtk4', required: false).found()
++
++    if have_gtk4 
++        # FIXME: find out why GTK4 tries to acquire a message bus
++        dbus_tests += 'Gtk4'
++    endif
+ endif
+ 
+     bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 7bde6204..2bb38fa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+ 
+ ### Tests and test setups ######################################################
+ 
+-if not get_option('skip_gtk_tests')
+-    have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+ 
+ # Note: The test program in test/ needs to be ported
diff --git a/srcpkgs/cjs/patches/ignore-encoding-test.patch b/srcpkgs/cjs/patches/ignore-encoding-test.patch
new file mode 100644
index 0000000000000..98c42ad101097
--- /dev/null
+++ b/srcpkgs/cjs/patches/ignore-encoding-test.patch
@@ -0,0 +1,11 @@
+broken on musl
+--- a/installed-tests/js/meson.build
+--- b/installed-tests/js/meson.build
+@@ -242,7 +242,6 @@ modules_tests = [
+     'Console',
+     'ESModules',
+     'AsyncMainloop',
+-    'Encoding',
+     'GLibLogWriter',
+     'Global',
+     'Timers',
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index b0fafe6603f8c..53e66876c529a 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,26 +1,20 @@
 # 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 dbus xvfb-run gtk+3"
+makedepends="readline-devel mozjs102-devel"
+depends="gtk+3"
 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_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 798c047f643a83920f79699265694dfb196e12ca 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 105954b34beda37d1ca56bf4ff8142c851266caf 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 ef8d0ae70c3c05e4243cb8053923d7ca402e2176 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 8463593ec38162cc39ea496d197180c5393e409e 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 b665b5e9bfbbebae14e4bed681ccd79ee1c05bf8 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, adopt.

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

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 78dfb56980515..8fa00c1b719f2 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
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="nemo-devel libglib-devel"
 depends="file-roller"
 short_desc="Nemo file roller extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
 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 98e502ea8d40fa1bfec799557ceae5eb8c11a1a9 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 e4c7f2b137f198070fcf76b24489e2bc8fb367f6 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 6a9e3dce6f6b65f62c21587f813e59f1089aa9d3 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 edf04452b081e76eec6ef8038ba0f8a79beedf7f 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 5bed3c66b44ac39520901c3d1baa7d29b5210da1 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 fafdd547701370dc71e67d38d9287d1b576dc5d9 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 3bc356e7f835e..e64051d22d76e 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"
@@ -11,10 +11,10 @@ depends="inxi xfconf"
 short_desc="Cross-desktop libraries and common resources from Linux Mint"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 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
+homepage="https://github.com/linuxmint/xapp"
+changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog"
+distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz"
+checksum=c16c633c5c7ea572d7db77be9f0fdaa57c7b9f335a62f5fcb6b87bf6473aff0f
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From d5bf3e7acd1386f1bc3f1848efcc3aa596af9b5a 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 795539a1fa17cc33d281528f0f1a2c3bded291d0 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.0.

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
 	 "
 }

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Cinnamon 5.8.x
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (32 preceding siblings ...)
  2023-07-26 16:11 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-07-28 18:37 ` classabbyamp
  2023-07-28 18:48 ` mhmdanas
  2023-07-31  9:34 ` [PR PATCH] [Merged]: " classabbyamp
  35 siblings, 0 replies; 37+ messages in thread
From: classabbyamp @ 2023-07-28 18:37 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1277955289

Comment:
is this needed?

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR REVIEW] Cinnamon 5.8.x
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (33 preceding siblings ...)
  2023-07-28 18:37 ` [PR REVIEW] Cinnamon 5.8.x classabbyamp
@ 2023-07-28 18:48 ` mhmdanas
  2023-07-31  9:34 ` [PR PATCH] [Merged]: " classabbyamp
  35 siblings, 0 replies; 37+ messages in thread
From: mhmdanas @ 2023-07-28 18:48 UTC (permalink / raw)
  To: ml

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44590#discussion_r1277972412

Comment:
For 5.8.1, yeah, see https://github.com/linuxmint/nemo-extensions/tags.

(If you mean why use 5.8.1, it has this one fix: https://github.com/linuxmint/nemo-extensions/commit/d25b09fcd00c4970c70485fb50d3595d8e6c8ef8)

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Merged]: Cinnamon 5.8.x
  2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
                   ` (34 preceding siblings ...)
  2023-07-28 18:48 ` mhmdanas
@ 2023-07-31  9:34 ` classabbyamp
  35 siblings, 0 replies; 37+ messages in thread
From: classabbyamp @ 2023-07-31  9:34 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

Cinnamon 5.8.x
https://github.com/void-linux/void-packages/pull/44590

Description:

<!-- 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
-->


^ permalink raw reply	[flat|nested] 37+ messages in thread

end of thread, other threads:[~2023-07-31  9:34 UTC | newest]

Thread overview: 37+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-23 14:07 [PR PATCH] Update Cinnamon packages mhmdanas
2023-06-29 17:00 ` [PR REVIEW] " sgn
2023-06-29 17:01 ` sgn
2023-06-30 16:10 ` mhmdanas
2023-06-30 16:17 ` mhmdanas
2023-06-30 16:27 ` mhmdanas
2023-06-30 18:56 ` [PR PATCH] [Updated] " mhmdanas
2023-07-05 13:31 ` dmarto
2023-07-05 14:33 ` mhmdanas
2023-07-07 13:02 ` dmarto
2023-07-10 15:31 ` mhmdanas
2023-07-10 23:04 ` dmarto
2023-07-21 18:58 ` [PR PATCH] [Updated] " mhmdanas
2023-07-21 18:58 ` mhmdanas
2023-07-21 18:58 ` mhmdanas
2023-07-21 18:59 ` [PR PATCH] [Updated] " mhmdanas
2023-07-21 18:59 ` mhmdanas
2023-07-22 20:45 ` mhmdanas
2023-07-22 20:46 ` [PR REVIEW] " mhmdanas
2023-07-23  0:20 ` dmarto
2023-07-23  0:30 ` dmarto
2023-07-24  1:00 ` dmarto
2023-07-25 17:14 ` mhmdanas
2023-07-25 17:18 ` [PR PATCH] [Updated] " mhmdanas
2023-07-25 18:45 ` mhmdanas
2023-07-25 18:49 ` mhmdanas
2023-07-25 19:21 ` mhmdanas
2023-07-26  8:21 ` [PR REVIEW] " sgn
2023-07-26 11:45 ` [PR PATCH] [Updated] " mhmdanas
2023-07-26 12:24 ` [PR REVIEW] " mhmdanas
2023-07-26 12:24 ` mhmdanas
2023-07-26 15:41 ` sgn
2023-07-26 15:42 ` sgn
2023-07-26 16:11 ` [PR PATCH] [Updated] " mhmdanas
2023-07-28 18:37 ` [PR REVIEW] Cinnamon 5.8.x classabbyamp
2023-07-28 18:48 ` mhmdanas
2023-07-31  9:34 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).