[PR PATCH] [WIP] cinnamon: update to 6.0.4

[PR PATCH] [WIP] cinnamon: update to 6.0.4

[Stivux]

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

There is a new pull request by Stivux against master on the void-packages repository

https://github.com/Stivux/void-packages cinnamon-desktop
https://github.com/void-linux/void-packages/pull/50548

[WIP] cinnamon: update to 6.0.4
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, (x86_64-glibc)

It is necessary to change or remove old patches for cjs

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

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

From c33ee612fb059ebaff22bb3118233419c2322c30 Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 22:56:51 +0300
Subject: [PATCH 1/9] cinnamon-desktop: update to 6.0.0.

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

diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index a61bb56b558796..c9ccffd68c5b9c 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=5.8.0
-revision=2
+version=6.0.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dalsa=true"
@@ -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=53080bd27527a8271d659e143a8d3b333d9b85efc82b77e571075f9cf8d3287c
+checksum=17473083758acac9ca580849c88a2ac4bcc2fe715ee232fbecfa0baf2204bbb5
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"

From c4dbd834d9be824ed71ebbeceb34c0c6e8572ae2 Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:01:36 +0300
Subject: [PATCH 2/9] cinnamon-menus: update to 6.0.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 e923c3cc863240..49fee3468f15a8 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.8.0
+version=6.0.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=99c4336ea5d87f01cbf19b40c8200dde933aebd73fe87b83cc11361bea5b6626
+checksum=d0afb32f4e18fe4b3fa69bd3e9754c7dc6195d33a3d9dcc2ce22e798c7f5f253
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From a5d54958c5c8c1442369b8787ed84ae75371489b Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:04:45 +0300
Subject: [PATCH 3/9] cinnamon-settings-daemon: update to 6.0.0.

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

diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index e1a57b6c278141..df78452e2b01a3 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.8.1
+version=6.0.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-settings-daemon"
 distfiles="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz"
-checksum=8b8a80b24755061128e45a064dc8320ce94b7f9bc9e13fd66fc5fae07e9de3a4
+checksum=dd08305359d4d8cae5ff5d5447d8043a4b1b4b63e08d633b9a00e9f5bb3a977b
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"

From bb2f9fd94a7e32cd85aede4f74bd0b3a7ec14b83 Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:07:45 +0300
Subject: [PATCH 4/9] xapps: update to 2.8.2.

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

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..27f37def5f48d2 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,7 +1,7 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=2.6.1
-revision=3
+version=2.8.2
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel pkg-config vala python3 gettext"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 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
+checksum=07b00d02d2bdd93c043e370305071df80f21ded6404f7309b590a8f896e635b2
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From bad8935d18ade09f389ed880a224b0b0c7c56b7d Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:11:28 +0300
Subject: [PATCH 5/9] cinnamon-session: update to 6.0.4.

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

diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 6dad113168c6e1..bb323d9cd874ee 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=5.8.1
+version=6.0.4
 revision=1
 build_style=meson
 build_helper="gir"
@@ -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=bf8a4b622900c3b9c3d917bcacc1bbaed74aa07c69270f6fc53783a65b4687eb
+checksum=453ea7729679700597b415fe483a79651d203248d3becc8ae3e2cddc524612b7

From 82a4fd3146b7f4fc23c6e476c51156ab910b1b10 Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:14:47 +0300
Subject: [PATCH 6/9] cinnamon-translations: update to 6.0.2.

---
 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 794d42bb0dcd8f..9874a1df45fa79 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.8.2
+version=6.0.2
 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}/cinnamon-translations-${version}.tar.gz"
-checksum=3c4454696bd5d57d96dbbde10232c72b575d6e6e5364c657836967aa783ab0c8
+checksum=c31982be0408971628763bff6c253fae753ee9ea57fd452abdb9c19c1943f2b4
 
 do_install() {
 	vmkdir usr

From f7974d380e75404a4cdfb176bb442b74657a2a01 Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:18:32 +0300
Subject: [PATCH 7/9] nemo: update to 6.0.2.

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

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..711affa3b480fa 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,7 +1,7 @@
 # Template file for 'nemo'
 pkgname=nemo
-version=5.8.5
-revision=2
+version=6.0.2
+revision=1
 build_style=meson
 build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo"
 changelog="https://raw.githubusercontent.com/linuxmint/nemo/5.8-maintenance/debian/changelog"
 distfiles="https://github.com/linuxmint/nemo/archive/${version}.tar.gz"
-checksum=eee308a5ae473c77bdf5fa870eff79087485b859a11de501df2d34e91bad174b
+checksum=0bbdafebefd2be7faf2263a176bbfb0deb3157da1210ddcf21986147c09775b1
 python_version=3
 # Requires xvfb-run and dbus-run-session
 make_check=no # can't be run inside chroot due to fusermount3

From 618c3334e48921296e85f5f4c0062d7a327b0140 Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:22:51 +0300
Subject: [PATCH 8/9] cinnamon-screensaver: update to 6.0.3.

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

diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 906f49f861ea5b..b4aeb677a20b98 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=5.8.1
-revision=2
+version=6.0.3
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext-devel glib-devel pkg-config python3-devel"
@@ -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/cinnamon-screensaver/archive/${version}.tar.gz"
-checksum=8959f03a9e7e2b2760a8fb5c7129d2431021ca193ff4ebcac59c4bbda95a8319
+checksum=63706e84c75d5c6c58360a502b9f94cdc1304a2b8f591cbaecf380b53c98b6c9
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"

From 21fe9d423a4f17853db4164eace16de5a5483267 Mon Sep 17 00:00:00 2001
From: Nazarov Stepan <nazarov.sp@phystech.edu>
Date: Mon, 27 May 2024 23:28:47 +0300
Subject: [PATCH 9/9] cinnamon-control-center: update to 6.0.1.

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

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 0d24f6c29e952e..eae36510ae90df 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.8.2
+version=6.0.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -17,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=8905b9ddf0c9b8ef98c47c2f4a1fd5e0b944d4955a05b4534b1c54d13c7241e5
+checksum=0181054ae73b8abbf3d7862f91a56df56f6d4aa9b28d28801813514a8bbdbeb6
 # requires X and wacom devices?
 make_check=no
 

Re: [WIP] cinnamon: update to 6.0.4

[fanyx]

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

New comment by fanyx on void-packages repository

https://github.com/void-linux/void-packages/pull/50548#issuecomment-2142818556

Comment:
Gnome Online Accounts is not compatible with cinnamon-control-center anymore and was moved to [gnome-online-accounts-gtk](https://github.com/xapp-project/gnome-online-accounts-gtk).
Dunno if we need to build this explicitly or if it gets included in cinnamon automatically.
See here: https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc
Maybe you can get more info out of it :)
gl out there!