cinnamon: update to 6.6. xapps: update to 3.2.2, rename to xapp.

common/shlibs

@@ -2965,7 +2965,7 @@ libpcre2-posix.so.3 libpcre2-10.39_1
 libui.so.0 libui-alpha3.1_1
 libgnome-autoar-0.so.0 gnome-autoar-0.1.1_1
 libgnome-autoar-gtk-0.so.0 gnome-autoar-0.1.1_1
-libxapp.so.1 xapps-1.0.2_1
+libxapp.so.1 xapp-3.2.2_1
 libite.so.5 libite-2.0.1_1
 liblog4cplus-2.1.so.9 log4cplus-2.1.2_1
 liblog4cplusU-2.1.so.9 log4cplus-2.1.2_1

srcpkgs/cinnamon-control-center/template

@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=6.4.2
+version=6.6.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -18,7 +18,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=2dfeb547d22c5ce3663120830dd96cccd3673c208f62c498b12346a485a57c1e
+checksum=2de5fbc5a9fcc2e1dad9c595dfb1d9047ff885d391f45d6ffe8b6711bb4e24e4
 # requires X and wacom devices?
 make_check=no
 

srcpkgs/cinnamon-desktop/template

@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=6.4.2
+version=6.6.2
 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=f11d063c7ecb86b98803e9a22ade0655d979b334f6c90fdd1cc6f50bbe6e9992
+checksum=4ed0d52a072551c6d536f1be68d4fcdb4166454fc9e48567ab2550282086b0f4
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"

srcpkgs/cinnamon-menus/template

@@ -1,7 +1,7 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=6.4.0
-revision=2
+version=6.6.0
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="glib-devel pkg-config"
@@ -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=9cad5ac61900492f66c91810fd13bed9dc37b49ec0b9bbc0bbe9ebf48ee45452
+checksum=87596380720077991f58afdbbabe72d9afd10f56d64043076cf7b09bc6b0f3c1
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

srcpkgs/cinnamon-screensaver/template

@@ -1,22 +1,22 @@
 # Template file for 'cinnamon-screensaver'
 pkgname=cinnamon-screensaver
-version=6.4.1
-revision=3
+version=6.6.1
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext 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"
 depends="cinnamon-translations hicolor-icon-theme python3-gobject
- python3-setproctitle python3-xapp xapps"
+ python3-setproctitle python3-xapp xapp"
 conf_files="/etc/pam.d/${pkgname}"
 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/cinnamon-screensaver/archive/${version}.tar.gz"
-checksum=413e5a178d5a0a81dfa876f829b5f29531033b38c4b2ea6b8b11863c32f07c11
+checksum=d873cc22eb50db8b9339b546b9133945eee3a1458682136cb475a49252568fad
 
 python_version=3
 pycompile_dirs="/usr/share/cinnamon-screensaver"

srcpkgs/cinnamon-session/template

@@ -1,17 +1,17 @@
 # Template file for 'cinnamon-session'
 pkgname=cinnamon-session
-version=6.4.2
+version=6.6.3
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="pkg-config gettext dbus-glib-devel glib-devel 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"
+ elogind-devel libXtst-devel xapp-devel"
 depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
 short_desc="Cinnamon session handler"
 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=e4f0380ef45be08366fcdfbda431c6b0b20760d251ea78b810b4e0e223134690
+checksum=ac7426dc383bbec3bd1576cb569d0837d95a87ec166a897263e0941be95feed6

srcpkgs/cinnamon-settings-daemon/template

@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-settings-daemon'
 pkgname=cinnamon-settings-daemon
-version=6.4.3
+version=6.6.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,13 +14,10 @@ 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=e7acab8453d084dbc97347145be287a65fc513b1a5629d16587be60367a97fdd
+checksum=c55cd5037adeb05a25c21fd4a9c03bd147e2917727c189a58e79c9dbfcaf489c
 
 cinnamon-settings-daemon-devel_package() {
 	short_desc+=" - development files"
-	depends="libglib-devel ${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-	}
+	depends="glib-devel ${sourcepkg}>=${version}_${revision}"
+	metapackage=yes
 }

srcpkgs/cinnamon-translations/template

@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=6.4.2
+version=6.6.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=7312137f0d3fc416108ae0e239b6ed81737412acd32abb7618e2b65fda3bd75f
+checksum=88ff13650c301e015fee8678f4e0d8e83e648ca86768519ab91697c0d5f0e679
 
 do_install() {
 	vmkdir usr

srcpkgs/cinnamon/template

@@ -1,14 +1,14 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=6.4.13
-revision=2
+version=6.6.7
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="pkg-config gettext glib-devel xmlto perl cjs
  gtk-doc python3-libsass"
 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
+ startup-notification-devel pulseaudio-devel dbus-glib-devel xapp-devel
  NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel
  gcr-devel"
 depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
@@ -19,14 +19,14 @@ depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
  polkit-gnome upower libkeybinder3 python3-dbus python3-gobject
  python3-pam python3-pexpect python3-Pillow python3-inotify python3-tinycss2
  python3-pytz python3-distro python3-requests libtimezonemap
- xdg-desktop-portal-xapp gettext"
+ xdg-desktop-portal-xapp gettext ibus"
 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=32de89ebd195ea27d9a220715e70c65664058d3e89a380f83addc07c81692d2d
+checksum=220f9ba77860d63708e682aa3fdc48cd8597b41b698467f116e477b45d514249
 
 python_version=3
 pycompile_dirs="