Re: [PR PATCH] [Updated] Cinnamon5.4.x

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

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

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

https://github.com/mobinmob/void-packages cinnamon5.4.x
https://github.com/void-linux/void-packages/pull/37527

Cinnamon5.4.x
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/37527.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon5.4.x-37527.patch --]
[-- Type: text/x-diff, Size: 30650 bytes --]

From 157a1466c8ac360ba6c4a11787efbfd65b1ff5e7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:05 +0300
Subject: [PATCH 01/21] muffin: update to 5.4.0.

---
 common/shlibs           |  4 ++++
 srcpkgs/muffin/template | 17 ++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e04037a9f2f0..14d2f4bf90a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1490,9 +1490,13 @@ libemile.so.1 efl-1.25.1_2
 libcjs.so.0 cjs-2.0.0_1
 libmuffin.so.0 muffin-2.0.5_1
 libmuffin-cogl-pango-0.so muffin-4.0.5_1
+libmuffin-cogl-pango-0.so.0 muffin-5.4.0_1
 libmuffin-cogl-path-0.so muffin-4.0.5_1
+libmuffin-cogl-path-0.so.0 muffin-5.4.0_1
 libmuffin-cogl-0.so muffin-4.0.5_1
+libmuffin-cogl-0.so.0 muffin-5.4.0_1
 libmuffin-clutter-0.so muffin-4.0.5_1
+libmuffin-clutter-0.so.0 muffin-5.4.0_1
 libcinnamon-desktop.so.4 cinnamon-desktop-2.0.4_1
 libcinnamon-control-center.so.1 libcinnamon-control-center-2.4.2_1
 libcvc.so.0 cinnamon-desktop-3.2.0_1
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index cb8032a75d21..ebc36e8081e1 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,15 +1,14 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=5.2.1
+version=5.4.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 build_helper=gir
-configure_args="--disable-static --disable-schemas-compile --disable-gtk-doc
- --enable-compile-warnings=minimum ac_cv_path_ZENITY=/usr/bin/zenity"
-hostmakedepends="automake gdk-pixbuf-devel gettext-devel glib-devel
+hostmakedepends="gdk-pixbuf-devel gettext-devel glib-devel
  gobject-introspection gtk-doc intltool libtool pkg-config"
 makedepends="cinnamon-desktop-devel libSM-devel libinput-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ graphene-devel pipewire-devel"
 depends="zenity"
 short_desc="Cinnamon window manager based on Mutter"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -17,14 +16,10 @@ 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=356a9fce1f4e9f39a6e0156c5dcab1e4190113a191cf1422d1ea08dbea4bfda4
+checksum=a28ab1a68aef1518dcdec08f9f06fc30084c3812d164622820920f768d1e1b1e
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 post_install() {
 	vmkdir usr/share/gir-1.0
 	mv ${DESTDIR}/usr/lib/muffin/*.gir ${DESTDIR}/usr/share/gir-1.0

From c5bab2762405eafaf71b818615d69708c6518c4c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:14 +0300
Subject: [PATCH 02/21] cinnamon: update to 5.4.0.

---
 srcpkgs/cinnamon/patches/meson-0.61.patch | 53 -----------------------
 srcpkgs/cinnamon/template                 |  6 +--
 2 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/cinnamon/patches/meson-0.61.patch

diff --git a/srcpkgs/cinnamon/patches/meson-0.61.patch b/srcpkgs/cinnamon/patches/meson-0.61.patch
deleted file mode 100644
index f0937a355f92..000000000000
--- a/srcpkgs/cinnamon/patches/meson-0.61.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 37de1aaae1edd1fbcd3c2ef2ac5f4baa4c8e2751 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 11 Jan 2022 18:14:35 -0500
-Subject: [PATCH] Revert "build: disable gir install via list to pacify meson
- >= 0.60.2 (#10489)"
-
-This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48.
-
-This commit was wrong, because it tried to work around a bug in a single
-version of meson by using something that isn't, wasn't, and won't be a
-valid value.
-
-The fixed version of meson 0.60.x has been out for a while now, which
-once again accepts `false`, and 0.61.0 also accepts `false` but was
-known at the time of this workaround to not work in meson-git master
-(now meson 0.61.0).
-
-Using `false` is acceptable and the failure to accept it has been
-qualified as a meson regression. Using `[false]` is just... trying to
-fuzz meson with random objects until you get something that slips its
-way through the argument checker and produces desired effects on the
-python implementation level.
----
- src/meson.build    | 2 +-
- src/st/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index 7999c0a67b..34b130d50f 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir(
-     includes: cinnamon_gir_includes,
-     install: true,
-     install_dir_typelib: pkglibdir,
--    install_dir_gir: [false],
-+    install_dir_gir: false,
-     extra_args: [
-         '-DST_COMPILATION',
-         '--quiet',
-diff --git a/src/st/meson.build b/src/st/meson.build
-index d299727d06..ec7d7b30a1 100644
---- a/src/st/meson.build
-+++ b/src/st/meson.build
-@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir(
-     includes: st_gir_includes,
-     install: true,
-     install_dir_typelib: pkglibdir,
--    install_dir_gir: [false],
-+    install_dir_gir: false,
-     extra_args: [
-         '-DST_COMPILATION',
-         '--quiet',
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 941a394a53b9..7bf0e94b0f30 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=5.2.7
+version=5.4.0
 revision=1
 build_helper=gir
 build_style=meson
@@ -10,7 +10,7 @@ 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
  libgnome-keyring-devel NetworkManager-devel libcroco-devel libsoup-devel
- cinnamon-desktop-devel"
+ cinnamon-desktop-devel xapps-devel"
 depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  cinnamon-session>=${version%.*} muffin>=${version%.*}
  cinnamon-control-center>=${version%.*} cinnamon-screensaver>=${version%.*}
@@ -25,7 +25,7 @@ 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=735c895a4096c2f9e8f4fd206b1646741a875904b5756ba4e9e7d4a0c3d628cf
+checksum=1b40ff0bcbb84db7721623b10aa03ee20147fe3c3ed31de9a1a2bdb5d90186f9
 
 python_version=3
 pycompile_dirs="

From 15c9e87354ef3775ec30f8de882e86827ee1abb7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:23 +0300
Subject: [PATCH 03/21] cinnamon-desktop: update to 5.4.0.

---
 .../patches/0001-fix-alsa-libcvc.patch        | 35 +++++++++++++++++++
 srcpkgs/cinnamon-desktop/template             |  7 ++--
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cinnamon-desktop/patches/0001-fix-alsa-libcvc.patch

diff --git a/srcpkgs/cinnamon-desktop/patches/0001-fix-alsa-libcvc.patch b/srcpkgs/cinnamon-desktop/patches/0001-fix-alsa-libcvc.patch
new file mode 100644
index 000000000000..20fa33f5a3e9
--- /dev/null
+++ b/srcpkgs/cinnamon-desktop/patches/0001-fix-alsa-libcvc.patch
@@ -0,0 +1,35 @@
+From df723ff07eeba5867b7528f7efba25c5411659db Mon Sep 17 00:00:00 2001
+From: mobinmob <mobinmob@disroot.org>
+Date: Sun, 12 Jun 2022 09:07:04 +0300
+Subject: [PATCH] 1rst pass
+
+---
+ libcvc/meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libcvc/meson.build b/libcvc/meson.build
+index 22d9d85..67d4578 100644
+--- a/libcvc/meson.build
++++ b/libcvc/meson.build
+@@ -27,7 +27,7 @@ cvc_deps = [
+ ]
+ 
+ if use_alsa
+-  libcvc_deps += dependency('alsa')
++  cvc_deps += dependency('alsa')
+ endif
+ 
+ libcvc_headers = [
+@@ -82,8 +82,7 @@ if use_alsa
+   executable('test-audio-device-selection',
+     sources: 'test-audio-device-selection.c',
+     link_with: libcvc,
+-    dependencies: libcvc_deps,
+-    c_args: c_args
++    dependencies: cvc_deps
+   )
+ endif
+ 
+-- 
+2.36.1
+
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 605dba3f1f8a..c96f2e470a72 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,20 +1,21 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=5.2.1
+version=5.4.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dalsa=true"
 hostmakedepends="glib-devel gobject-introspection intltool pkg-config"
 makedepends="accountsservice-devel gtk+3-devel libxkbfile-devel pam-devel
- pulseaudio-devel alsa-lib-devel"
+ pulseaudio-devel alsa-lib-devel NetworkManager-devel libopencv4-devel"
 depends="xkeyboard-config"
 short_desc="Library with common API for various Cinnamon modules"
 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=3fd18225771444383d7942c93466e2f86b03f28d2b406ff90ee34567311a5c18
+checksum=c1b7ec54a5432a42f71bb4c5d4ad6f8ed5fca60b18bfd37ee0939965b56ec87e
+
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"

From d222cfcc67a891aff5570c26f1e8ab6fe097e335 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:30 +0300
Subject: [PATCH 04/21] cinnamon-session: update to 5.4.0.

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

diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index b4bb1355e7e8..0972d9f69fb3 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,10 +1,9 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=5.2.0
+version=5.4.0
 revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dgconf=false"
 hostmakedepends="pkg-config gobject-introspection
  gettext-devel dbus-glib-devel glib-devel intltool xmlto"
 makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
@@ -16,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=f7ee24258b419a12e68c129b499889b682489cc5bf4e38b0eea2c60111c67121
+checksum=c3c9351aecebe2abbb5d61663ad19af56fc6413ad6cddb5d753a614b23ec547d

From 6dc64882f6bd264d491bdcf44a2b0bd4e595b6ef Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:35 +0300
Subject: [PATCH 05/21] cinnamon-menus: update to 5.4.0.

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

diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 79514024bbdd..bd8f0665b150 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=5.2.0
+version=5.4.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -11,7 +11,7 @@ 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=fb654a214b7a7291a964b0d38b89e88ffc1a3343fa0a686f61059367bfa55e76
+checksum=47eb864105711c28c4851b64bcc82aa5701095996698db170b86be9ebd914e07
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 6833f4239965695fd7183a285a66da5c672a3a9b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:40 +0300
Subject: [PATCH 06/21] cinnamon-translations: update to 5.4.0.

---
 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 d5d86b50b9fb..dbc7b9ad470d 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.2.2
+version=5.4.0
 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=3ee2e0e7266ff95b064a9122de823d2c427a82bcfe2fb8619c45bca0549db4c0
+checksum=af18220ca3b57502702e07e49708fdcdc96e447e4246e646c482df1251630cee
 
 do_install() {
 	vmkdir usr

From 2d31d16bc8dcdeed7e0026cdd0c3a3208854848f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:46 +0300
Subject: [PATCH 07/21] cinnamon-control-center: update to 5.4.0.

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

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 692e838d5061..3fa3e5fb20c0 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=5.2.1
+version=5.4.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -18,8 +18,8 @@ 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=977ac52cf8bcdea99c03c6455f29276a57a605839cf16d190db2088df243366d
-make_check=no
+checksum=fe38e611378111b9550a690d55eb071a49fdc2d212d3f75f9efa85cbcc488397
+make_check=no # Needs x server connection.
 
 libcinnamon-control-center_package() {
 	short_desc+=" - runtime library"

From 300deb475513d87f20fe36b997b57172eebb9d18 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:53 +0300
Subject: [PATCH 08/21] cinnamon-screensaver: update to 5.4.0.

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

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 5d248ca4b24f..379be54fc9b9 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=5.2.1
+version=5.4.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -16,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=fdc141a4769c1ceb70d672269aed748df323c38e1a05e03d7c586123de327530
+checksum=24affe2cf4df22783006e5eeb3d9807080333714e80f6b45387790457660f0da
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"

From 4d8683b2a05b8491eb92d421032267c07bead4ad Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:10:59 +0300
Subject: [PATCH 09/21] cinnamon-settings-daemon: update to 5.4.0.

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

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index b7c1dd0b7728..d2c395c374b5 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=5.2.0
+version=5.4.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -15,8 +15,8 @@ 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=327dcb7dbb9986545e20e2142a6fe629aaf1bfaba29b530d06ea124cdfce6772
-make_check=no
+checksum=9810233b128b46e29f1f6b4b98d5f7ceb0d57d03406eb2ed3fd9a600050554f9
+
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From c56cd390632a69d4a2686cc7f294829e140d893c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:11:07 +0300
Subject: [PATCH 10/21] cjs: update to 5.4.0.

---
 srcpkgs/cjs/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 0c28d41045a0..99bd12e0394e 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,6 +1,6 @@
 # Template file for 'cjs'
 pkgname=cjs
-version=5.2.0
+version=5.4.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -15,13 +15,17 @@ 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=4141185cc554156ebbad80faf66c52f4287db911528e7f3ef8035f6b9c5f8f8c
+checksum=e45c4caa5003411640d6f55180512e7929e1cd1d2789b90ae321a28fdf26cc9c
 # ΧΧ 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
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 pre_configure() {
 	# The deleted lines in meson.build try to build and run a simple program,
 	# and that does not work when cross-compiling.

From 3d1c85e126c23e0377dfac2d21e852e0e924084e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:11:20 +0300
Subject: [PATCH 11/21] xapps: update to 2.2.10.

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

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index d2148b2bb005..39d01fde8700 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,6 +1,6 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=2.2.6
+version=2.2.10
 revision=1
 wrksrc="xapp-${version}"
 build_style=meson
@@ -15,7 +15,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=f3f5ab006383b9c0e231d30f8a0be727d0352fd4733ca3ea168883205793fcfd
+checksum=cc634ed20f338e202e90763b1bc31af25dd6721f261e4b4437c250a7ee514b28
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From 628ff0c541d738a096408213c5431056e32e0c25 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:11:23 +0300
Subject: [PATCH 12/21] nemo: update to 5.4.0.

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

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 75938f0d5c6c..09872f9ef650 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=5.2.4
+version=5.4.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/nemo"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=0de838e838edcf18df621d3e76c2b2b512c1ace87d13d2f8ee773ae96b63263e
+checksum=821be34acba587313fa376734e7ed74066dba3163b3b987639dcf5ff7f36c6d5
 python_version=3
 # Requires xvfb-run and dbus-run-session
 make_check=no # can't be run inside chroot due to fusermount3

From 923eee01949ba3b2829387eaf0a606428bc21836 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:11:40 +0300
Subject: [PATCH 13/21] nemo-extensions: update to 5.4.0.

---
 srcpkgs/nemo-extensions/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index fb47f3c75980..382c8e810489 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.2.0
+version=5.4.0
 revision=1
 build_style=meta
 depends="

From 262478946cad7011db278d228781f645e97d4bb0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:11:48 +0300
Subject: [PATCH 14/21] nemo-fileroller: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 5c907d6b9f04..f503d8b1454e 100644
--- a/srcpkgs/nemo-fileroller/template
+++ b/srcpkgs/nemo-fileroller/template
@@ -1,8 +1,8 @@
 # Template file for 'nemo-fileroller'
 pkgname=nemo-fileroller
-version=5.0.1
+version=5.4.0
 revision=1
-wrksrc="nemo-extensions-${pkgname}-${version}"
+wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-fileroller
 build_style=meson
 hostmakedepends="pkg-config"
@@ -12,5 +12,5 @@ short_desc="Nemo file roller 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/nemo-fileroller-${version}.tar.gz"
-checksum=736f574d69344ad9a4e903322e3650ad31aa5447ccc011845b24a5f73784f686
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba

From 643b3b8390c7607a3d61f00a684be9f7b8f7d9a0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:11:53 +0300
Subject: [PATCH 15/21] nemo-emblems: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template
index ecd44791b44f..68721ee730a1 100644
--- a/srcpkgs/nemo-emblems/template
+++ b/srcpkgs/nemo-emblems/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-emblems'
 pkgname=nemo-emblems
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-emblems
@@ -13,4 +13,8 @@ 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=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba
+
+pre_build() {
+	rm -rf debian
+}

From fb80c83a3e8db1a7d17acf7d1ba3f7ebf8d14002 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:12:03 +0300
Subject: [PATCH 16/21] nemo-compare: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index 762326163660..10951981c592 100644
--- a/srcpkgs/nemo-compare/template
+++ b/srcpkgs/nemo-compare/template
@@ -1,8 +1,8 @@
 # Template file for 'nemo-compare'
 pkgname=nemo-compare
-version=5.2.1
+version=5.4.0
 revision=1
-wrksrc="nemo-extensions-${pkgname}-${version}"
+wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-compare
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
@@ -12,5 +12,5 @@ short_desc="Nemo compare extention"
 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/nemo-compare-${version}.tar.gz"
-checksum=cd81bd4c4dc8c53c65fb9ebc4f94f8fe83c6731f570ec333390134dab202b089
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba

From 72d4507970baeba8b1ada44d29adbdadf4a170a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:12:08 +0300
Subject: [PATCH 17/21] nemo-preview: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index 4faaeb2a783b..e1d887813d91 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,8 +1,8 @@
 # Template file for 'nemo-preview'
 pkgname=nemo-preview
-version=5.2.1
+version=5.4.0
 revision=1
-wrksrc="nemo-extensions-${pkgname}-${version}"
+wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-preview
 build_style=meson
 build_helper=gir
@@ -13,5 +13,5 @@ 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/nemo-preview-${version}.tar.gz"
-checksum=eacef0d86bd75b575676386fccd11084697d64e5c9ef405db8653e95fb0e1ec4
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba

From 54ce921f349bd1e999fcf7730952c80bafbb0880 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:12:13 +0300
Subject: [PATCH 18/21] nemo-terminal: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template
index d1fac6c9623f..c2dbf67439cb 100644
--- a/srcpkgs/nemo-terminal/template
+++ b/srcpkgs/nemo-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-terminal'
 pkgname=nemo-terminal
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-terminal
@@ -13,4 +13,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=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba

From f9ed950de83d6c62560fa3475d8137d2766d676e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:12:20 +0300
Subject: [PATCH 19/21] nemo-image-converter: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template
index bfbb4318d1e0..11a0a731861e 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.2.0
+version=5.4.0
 revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-image-converter
@@ -12,5 +12,5 @@ short_desc="Nemo image converter 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/${version}.tar.gz"
-checksum=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/5.4.0.tar.gz"
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba

From 4437c49dab77d67dd519926cfd8d08e3e9c64e75 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:12:32 +0300
Subject: [PATCH 20/21] nemo-audio-tab: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template
index ad99a463436f..47f142970bca 100644
--- a/srcpkgs/nemo-audio-tab/template
+++ b/srcpkgs/nemo-audio-tab/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-audio-tab'
 pkgname=nemo-audio-tab
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-audio-tab
@@ -13,4 +13,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=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba

From 8edfcf0449b76a1270d4f2dd9f992d13658ade8d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 12 Jun 2022 15:12:37 +0300
Subject: [PATCH 21/21] nemo-python: update to 5.4.0.

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

diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
index 94cbd08a74a1..c7a97ececb48 100644
--- a/srcpkgs/nemo-python/template
+++ b/srcpkgs/nemo-python/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-python'
 pkgname=nemo-python
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-python
@@ -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/refs/tags/${version}.tar.gz"
-checksum=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5
+checksum=49a3e2f132b83fb18958648522ba2e5cb02230b9602fe57b1b5e537bf1f0e6ba