* [PR PATCH] cinnamon: update to 6.2
@ 2024-09-14 19:41 toadwastoast
2024-09-15 10:59 ` Haagen-Dazs
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-14 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is a new pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 39940 bytes --]
From 6cb27ba562e8948ff3a07168b26e75e71aaf09ff Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Sat, 14 Sep 2024 16:23:32 -0300
Subject: [PATCH] cinnamon: update to 6.2
---
srcpkgs/cinnamon-control-center/template | 13 +-
srcpkgs/cinnamon-desktop/template | 8 +-
| 6 +-
srcpkgs/cinnamon-screensaver/template | 8 +-
srcpkgs/cinnamon-session/template | 6 +-
srcpkgs/cinnamon-settings-daemon/template | 8 +-
srcpkgs/cinnamon-translations/template | 6 +-
srcpkgs/cinnamon/template | 27 ++-
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -----
.../cjs/patches/ignore-encoding-test.patch | 11 -
srcpkgs/cjs/template | 8 +-
srcpkgs/muffin/template | 11 +-
srcpkgs/nemo-audio-tab/template | 8 +-
srcpkgs/nemo-compare/template | 11 +-
srcpkgs/nemo-emblems/template | 8 +-
srcpkgs/nemo-extensions/template | 4 +-
srcpkgs/nemo-fileroller/template | 6 +-
srcpkgs/nemo-image-converter/template | 6 +-
srcpkgs/nemo-preview/template | 6 +-
srcpkgs/nemo-python/template | 6 +-
srcpkgs/nemo-terminal/template | 8 +-
srcpkgs/nemo/template | 11 +-
srcpkgs/touchegg/template | 6 +-
srcpkgs/xapps/template | 8 +-
srcpkgs/xdg-desktop-portal-xapp/template | 17 ++
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 8 +-
27 files changed, 116 insertions(+), 347 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..e6a5c4a62b5275 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel
+ colord-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme gnome-color-manager"
short_desc="Cinnamon Control Center"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index a61bb56b558796..585e76d1291229 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.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -10,11 +10,11 @@ makedepends="accountsservice-devel gtk+3-devel libxkbfile-devel pam-devel
pulseaudio-devel alsa-lib-devel"
depends="xkeyboard-config"
short_desc="Library with common API for various Cinnamon modules"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
--git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index e923c3cc863240..99d12a62d50f03 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.8.0
+version=6.2.0
revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel intltool pkg-config"
makedepends="libglib-devel"
short_desc="Cinnamon menu specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 906f49f861ea5b..d3aa5b23b4ae00 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.2.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext-devel glib-devel pkg-config python3-devel"
@@ -12,11 +12,11 @@ depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
short_desc="Cinnamon screensaver"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 6dad113168c6e1..177f9fd0f0f7b1 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.2.1
revision=1
build_style=meson
build_helper="gir"
@@ -11,8 +11,8 @@ makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
elogind-devel libXtst-devel xapps-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
short_desc="Cinnamon session handler"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index e1a57b6c278141..694b685abbcb3d 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 794d42bb0dcd8f..1df432c7c08086 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,15 +1,15 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=5.8.2
+version=6.2.2
revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..8b48e7d796edab 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo 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-tinycss2
+ python3-pytz python3-distro python3-requests libtimezonemap
+ libsoup xdg-desktop-portal-xapp gettext"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..1343ad5c1a273e 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-devel"
depends="gtk+3"
short_desc="Javascript for Cinnamon"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..1ea1ec3708df0f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,15 +19,16 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template
index 2d2ec5ac55b003..d3b44bae969579 100644
--- a/srcpkgs/nemo-audio-tab/template
+++ b/srcpkgs/nemo-audio-tab/template
@@ -1,15 +1,15 @@
# Template file for 'nemo-audio-tab'
pkgname=nemo-audio-tab
-version=5.8.0
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-audio-tab
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python python3-mutagen"
short_desc="Nemo audio tab extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..d9a728468012b9 100644
--- a/srcpkgs/nemo-compare/template
+++ b/srcpkgs/nemo-compare/template
@@ -1,16 +1,15 @@
# Template file for 'nemo-compare'
pkgname=nemo-compare
-version=5.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python meld"
short_desc="Nemo compare extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template
index 4e1cb6726d9e34..3dbec779a70943 100644
--- a/srcpkgs/nemo-emblems/template
+++ b/srcpkgs/nemo-emblems/template
@@ -1,15 +1,15 @@
# Template file for 'nemo-emblems'
pkgname=nemo-emblems
-version=5.8.0
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-emblems
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python"
short_desc="Nemo extension for changing emblems in files/dirs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index 401c7e515c5d32..784faf6de779ce 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
@@ -13,7 +13,7 @@ depends="
nemo-emblems>=${version}
nemo-terminal>=${version}"
short_desc="Extensions for nemo file manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
license="BSD-2-Clause" #no vlicense
homepage="https://github.com/linuxmint/nemo-extensions"
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 4b8f36f7589a72..6237fc559b2810 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.8.0
+version=6.2.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="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template
index e4a69222c45457..a2b6fa9b017392 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.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-image-converter
build_style=meson
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config gettext"
makedepends="nemo-devel libglib-devel"
depends="ImageMagick"
short_desc="Nemo image converter extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..153412a85b4d39 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -10,8 +10,8 @@ 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>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
index 009b05c1fb3b85..f78c34e775ceb3 100644
--- a/srcpkgs/nemo-python/template
+++ b/srcpkgs/nemo-python/template
@@ -1,14 +1,14 @@
# Template file for 'nemo-python'
pkgname=nemo-python
-version=5.8.0
+version=6.2.0
revision=2
build_wrksrc=nemo-python
build_style=meson
hostmakedepends="pkg-config"
makedepends="nemo-devel python3-devel python3-gobject-devel"
short_desc="Nemo python binding"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template
index 6f863a8aedb917..9ec25506e45295 100644
--- a/srcpkgs/nemo-terminal/template
+++ b/srcpkgs/nemo-terminal/template
@@ -1,15 +1,15 @@
# Template file for 'nemo-terminal'
pkgname=nemo-terminal
-version=5.8.0
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-terminal
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python vte3 glib gtk+3 xapps"
short_desc="Nemo terminal extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..04c02e7d749cb3 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,21 +1,22 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..e7b6db8b6477d3 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
short_desc="Multitouch gesture recognizer"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..2a76e9fcfe7268 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.5
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel pkg-config vala python3 gettext"
@@ -10,12 +10,12 @@ makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
gdk-pixbuf-devel libX11-devel libgnomekbd-devel"
depends="inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..1f1d29ee683a29
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..33ab0e8cdcf510 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,22 +1,22 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
libxml2-devel tiff-devel zlib-devel pango-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>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/xreader"
distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz"
-checksum=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
@ 2024-09-15 10:59 ` Haagen-Dazs
2024-09-15 12:09 ` toadwastoast
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Haagen-Dazs @ 2024-09-15 10:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by Haagen-Dazs on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2351535453
Comment:
We could also include `polkit-gnome` as dependency since cinnamon doesn't have its own agent.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
2024-09-15 10:59 ` Haagen-Dazs
@ 2024-09-15 12:09 ` toadwastoast
2024-09-15 12:22 ` [PR PATCH] [Updated] " toadwastoast
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-15 12:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2351565162
Comment:
> We could also include `polkit-gnome` as dependency since cinnamon doesn't have its own agent.
`polkit-gnome` already is a dependency of `cinnamon`.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
2024-09-15 10:59 ` Haagen-Dazs
2024-09-15 12:09 ` toadwastoast
@ 2024-09-15 12:22 ` toadwastoast
2024-09-16 0:43 ` toadwastoast
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-15 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 39952 bytes --]
From f88778448ef65232b5fd7a60025d911369146d2d Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Sat, 14 Sep 2024 16:23:32 -0300
Subject: [PATCH] cinnamon: update to 6.2
---
srcpkgs/cinnamon-control-center/template | 13 +-
srcpkgs/cinnamon-desktop/template | 8 +-
| 6 +-
srcpkgs/cinnamon-screensaver/template | 8 +-
srcpkgs/cinnamon-session/template | 6 +-
srcpkgs/cinnamon-settings-daemon/template | 8 +-
srcpkgs/cinnamon-translations/template | 6 +-
srcpkgs/cinnamon/template | 27 ++-
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -----
.../cjs/patches/ignore-encoding-test.patch | 11 -
srcpkgs/cjs/template | 8 +-
srcpkgs/muffin/template | 11 +-
srcpkgs/nemo-audio-tab/template | 8 +-
srcpkgs/nemo-compare/template | 11 +-
srcpkgs/nemo-emblems/template | 8 +-
srcpkgs/nemo-extensions/template | 4 +-
srcpkgs/nemo-fileroller/template | 6 +-
srcpkgs/nemo-image-converter/template | 6 +-
srcpkgs/nemo-preview/template | 6 +-
srcpkgs/nemo-python/template | 8 +-
srcpkgs/nemo-terminal/template | 8 +-
srcpkgs/nemo/template | 11 +-
srcpkgs/touchegg/template | 6 +-
srcpkgs/xapps/template | 8 +-
srcpkgs/xdg-desktop-portal-xapp/template | 17 ++
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 8 +-
27 files changed, 117 insertions(+), 348 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..e6a5c4a62b5275 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel
+ colord-devel"
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme gnome-color-manager"
short_desc="Cinnamon Control Center"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index a61bb56b558796..585e76d1291229 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.2.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dalsa=true"
@@ -10,11 +10,11 @@ makedepends="accountsservice-devel gtk+3-devel libxkbfile-devel pam-devel
pulseaudio-devel alsa-lib-devel"
depends="xkeyboard-config"
short_desc="Library with common API for various Cinnamon modules"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
--git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index e923c3cc863240..99d12a62d50f03 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.8.0
+version=6.2.0
revision=1
build_style=meson
build_helper=gir
hostmakedepends="glib-devel intltool pkg-config"
makedepends="libglib-devel"
short_desc="Cinnamon menu specifications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 906f49f861ea5b..d3aa5b23b4ae00 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.2.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext-devel glib-devel pkg-config python3-devel"
@@ -12,11 +12,11 @@ depends="cinnamon-translations hicolor-icon-theme python3-gobject
python3-setproctitle python3-xapp xapps"
conf_files="/etc/pam.d/${pkgname}"
short_desc="Cinnamon screensaver"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 6dad113168c6e1..177f9fd0f0f7b1 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.2.1
revision=1
build_style=meson
build_helper="gir"
@@ -11,8 +11,8 @@ makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
elogind-devel libXtst-devel xapps-devel"
depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
short_desc="Cinnamon session handler"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index e1a57b6c278141..694b685abbcb3d 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 794d42bb0dcd8f..1df432c7c08086 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,15 +1,15 @@
# Template file for 'cinnamon-translations'
pkgname=cinnamon-translations
-version=5.8.2
+version=6.2.2
revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
short_desc="Translations for Cinnamon and Nemo"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..8b48e7d796edab 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo 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-tinycss2
+ python3-pytz python3-distro python3-requests libtimezonemap
+ libsoup xdg-desktop-portal-xapp gettext"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..1343ad5c1a273e 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-devel"
depends="gtk+3"
short_desc="Javascript for Cinnamon"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..1ea1ec3708df0f 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,15 +19,16 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template
index 2d2ec5ac55b003..d3b44bae969579 100644
--- a/srcpkgs/nemo-audio-tab/template
+++ b/srcpkgs/nemo-audio-tab/template
@@ -1,15 +1,15 @@
# Template file for 'nemo-audio-tab'
pkgname=nemo-audio-tab
-version=5.8.0
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-audio-tab
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python python3-mutagen"
short_desc="Nemo audio tab extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..d9a728468012b9 100644
--- a/srcpkgs/nemo-compare/template
+++ b/srcpkgs/nemo-compare/template
@@ -1,16 +1,15 @@
# Template file for 'nemo-compare'
pkgname=nemo-compare
-version=5.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python meld"
short_desc="Nemo compare extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template
index 4e1cb6726d9e34..3dbec779a70943 100644
--- a/srcpkgs/nemo-emblems/template
+++ b/srcpkgs/nemo-emblems/template
@@ -1,15 +1,15 @@
# Template file for 'nemo-emblems'
pkgname=nemo-emblems
-version=5.8.0
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-emblems
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python"
short_desc="Nemo extension for changing emblems in files/dirs"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index 401c7e515c5d32..784faf6de779ce 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
@@ -13,7 +13,7 @@ depends="
nemo-emblems>=${version}
nemo-terminal>=${version}"
short_desc="Extensions for nemo file manager"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
license="BSD-2-Clause" #no vlicense
homepage="https://github.com/linuxmint/nemo-extensions"
diff --git a/srcpkgs/nemo-fileroller/template b/srcpkgs/nemo-fileroller/template
index 4b8f36f7589a72..6237fc559b2810 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.8.0
+version=6.2.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="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-image-converter/template b/srcpkgs/nemo-image-converter/template
index e4a69222c45457..a2b6fa9b017392 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.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-image-converter
build_style=meson
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config gettext"
makedepends="nemo-devel libglib-devel"
depends="ImageMagick"
short_desc="Nemo image converter extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..153412a85b4d39 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -10,8 +10,8 @@ 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>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
index 009b05c1fb3b85..6d52c001cc5f79 100644
--- a/srcpkgs/nemo-python/template
+++ b/srcpkgs/nemo-python/template
@@ -1,14 +1,14 @@
# Template file for 'nemo-python'
pkgname=nemo-python
-version=5.8.0
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-python
build_style=meson
hostmakedepends="pkg-config"
makedepends="nemo-devel python3-devel python3-gobject-devel"
short_desc="Nemo python binding"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template
index 6f863a8aedb917..9ec25506e45295 100644
--- a/srcpkgs/nemo-terminal/template
+++ b/srcpkgs/nemo-terminal/template
@@ -1,15 +1,15 @@
# Template file for 'nemo-terminal'
pkgname=nemo-terminal
-version=5.8.0
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-terminal
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
makedepends="nemo-devel libglib-devel"
depends="nemo-python vte3 glib gtk+3 xapps"
short_desc="Nemo terminal extension"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..04c02e7d749cb3 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,21 +1,22 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..e7b6db8b6477d3 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -8,12 +8,12 @@ hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
short_desc="Multitouch gesture recognizer"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..2a76e9fcfe7268 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.5
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel pkg-config vala python3 gettext"
@@ -10,12 +10,12 @@ makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel
gdk-pixbuf-devel libX11-devel libgnomekbd-devel"
depends="inxi xfconf"
short_desc="Cross-desktop libraries and common resources from Linux Mint"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..1f1d29ee683a29
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..33ab0e8cdcf510 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,22 +1,22 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
libxml2-devel tiff-devel zlib-devel pango-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>"
+maintainer="toadwastoast <toadwastoast@proton.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/xreader"
distfiles="https://github.com/linuxmint/xreader/archive/${version}.tar.gz"
-checksum=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (2 preceding siblings ...)
2024-09-15 12:22 ` [PR PATCH] [Updated] " toadwastoast
@ 2024-09-16 0:43 ` toadwastoast
2024-09-16 0:45 ` toadwastoast
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-16 0:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2351867176
Comment:
okay, so close the PR then?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (3 preceding siblings ...)
2024-09-16 0:43 ` toadwastoast
@ 2024-09-16 0:45 ` toadwastoast
2024-09-16 1:44 ` classabbyamp
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-16 0:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2351867176
Comment:
okay, so close the PR then? or do I just keep the templates as orphan?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (4 preceding siblings ...)
2024-09-16 0:45 ` toadwastoast
@ 2024-09-16 1:44 ` classabbyamp
2024-09-16 5:02 ` [PR PATCH] [Updated] " toadwastoast
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: classabbyamp @ 2024-09-16 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2351900918
Comment:
keep the templates as orphan, you can still update them
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (5 preceding siblings ...)
2024-09-16 1:44 ` classabbyamp
@ 2024-09-16 5:02 ` toadwastoast
2024-09-16 5:55 ` toadwastoast
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-16 5:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 42366 bytes --]
From d177d8e75bdd0a7f4cacc5c6019096084f9a9fb8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:32:12 -0300
Subject: [PATCH 01/24] cinnamon: update to 6.2.9
---
srcpkgs/cinnamon/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..a57cbca15fb284 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo gnome-themes-standard
+ gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
+ 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
+ libsoup xdg-desktop-portal-xapp gettext"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
From 25ace10e3d30b871f76ecfdad992def9249425bb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:37:17 -0300
Subject: [PATCH 02/24] cinnamon-control-center: update to 6.2.0
---
srcpkgs/cinnamon-control-center/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..4e2d2a7a9173b5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
-depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
+depends="libcinnamon-control-center cinnamon-settings-daemon
+ cinnamon-translations desktop-file-utils hicolor-icon-theme
+ gnome-color-manager"
short_desc="Cinnamon Control Center"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
From adf6a0d371bc853c4b38c10c94c7b0d63507ac47 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:46:16 -0300
Subject: [PATCH 03/24] cinnamon-desktop: update to 6.2.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..b0ce174b86d867 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.2.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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 134663ea9ac57d0d68c485b0c28cc5d5e59ea642 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:10 -0300
Subject: [PATCH 04/24] cinnamon-menus: update to 6.2.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..a17d8f3f040dc8 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.2.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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 1e614c6a35202d753d6cf8c30f1515bb96db9ab8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:46 -0300
Subject: [PATCH 05/24] cinnamon-screensaver: update to 6.2.0
---
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..01c4234b6fd595 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.2.0
+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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 2591004e754052604bc9af674068c630ba4b454e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:00 -0300
Subject: [PATCH 06/24] cinnamon-session: update to 6.2.1
---
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..9b4231deb31d24 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.2.1
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
From a39e64a6b6ede73cedf354150634a9ef3ecc53ef Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:29 -0300
Subject: [PATCH 07/24] cinnamon-settings-daemon: update to 6.2.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 e1a57b6c278141..b20ddf426632ad 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 7e42294d3a6971acfb163b357207a59627c8ca88 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:02 -0300
Subject: [PATCH 08/24] cinnamon-translations: update to 6.2.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 794d42bb0dcd8f..c12f2a7a366804 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.2.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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
From fd128c3a89af224497727d50946dcb6b3140e9f2 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:37 -0300
Subject: [PATCH 09/24] cjs: update to 6.2.0
---
srcpkgs/cjs/.directory | 4 ++
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
.../cjs/patches/ignore-encoding-test.patch | 11 -----
srcpkgs/cjs/template | 6 +--
4 files changed, 7 insertions(+), 60 deletions(-)
create mode 100644 srcpkgs/cjs/.directory
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
diff --git a/srcpkgs/cjs/.directory b/srcpkgs/cjs/.directory
new file mode 100644
index 00000000000000..d761f55871baa9
--- /dev/null
+++ b/srcpkgs/cjs/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2024,9,16,1,29,42.385
+Version=4
+VisibleRoles=Icons_text,Icons_size,Icons_modificationtime
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..3845b7aa8367c0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
From 4304311f3ffaa58ae8d6a411101eea28c9c23f37 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:10 -0300
Subject: [PATCH 10/24] muffin: update to 6.2.0
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..38c7d6e6ff4e63 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +28,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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
From f42258e0ae59e772e0144711eee51f452f2e1e15 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:32 -0300
Subject: [PATCH 11/24] nemo: update to 6.2.8
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..27a17798fb8ce1 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,13 +1,14 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 703aba866cdf6e1acff138f8e4b133136aa69833 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:05 -0300
Subject: [PATCH 12/24] nemo-audio-tab: update to 6.2.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 2d2ec5ac55b003..b2e309570f355f 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e67d4a1ff68f288528545aff656f3a7dff3b44f8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:46 -0300
Subject: [PATCH 13/24] nemo-compare: update to 6.2.0
---
srcpkgs/nemo-compare/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..ea4bfe7c333c97 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.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,6 +11,5 @@ short_desc="Nemo compare extension"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e98ebf37f1da18fd608c5217800d763c092dd157 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:00 -0300
Subject: [PATCH 14/24] nemo-emblems: update to 6.2.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 4e1cb6726d9e34..7a864acb5f317b 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 140de7bced9b6ae7804f8302cfcbfee59f09456b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:50 -0300
Subject: [PATCH 15/24] nemo-extensions: update to 6.2.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 401c7e515c5d32..02e81b5c2d1e6d 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
From 6ff6fc614958fb5a131fd082c5d0e428052b377b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:12 -0300
Subject: [PATCH 16/24] nemo-filleroller: update to 6.2.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 4b8f36f7589a72..f45af8bb76ab30 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 144ac072c45e9bf5da3f7f3b6de976024b3bf015 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:44 -0300
Subject: [PATCH 17/24] nemo-image-converter: update to 6.2.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 e4a69222c45457..d9868d0300a8b4 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From eb1924e5e7e6ab98e76f483fc124f0835ca5efeb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:11 -0300
Subject: [PATCH 18/24] nemo-preview: update to 6.2.0
---
srcpkgs/nemo-preview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..0313bdfeb3dc70 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -14,4 +14,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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From f6312fa87119086aacf0c3de011edd5e490d7373 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:32 -0300
Subject: [PATCH 19/24] nemo-python: update to 6.2.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 009b05c1fb3b85..e1a67bcdf9fe49 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 15f016bcb1d57bf7b96e0aace21c7343a0da67ba Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:44 -0300
Subject: [PATCH 20/24] nemo-terminal: update to 6.2.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 6f863a8aedb917..d8f17e4b7d1e30 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From b4dd23078ba76ab3012520cf607c21221a7f7f67 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:14 -0300
Subject: [PATCH 21/24] touchegg: update to 2.0.17
---
srcpkgs/touchegg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..69a3a4055ffaf1 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
From 2dfb8448733230862c03ddf4a8461dd73abe1b51 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:54 -0300
Subject: [PATCH 22/24] xapps: update to 2.8.5
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..9ebb9ee774cadc 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.5
+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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
From 49f3ba08eabe9411f78abc1e3973d46bc6db05fd Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:59:13 -0300
Subject: [PATCH 23/24] New package: xdg-desktop-portal-xapp-1.0.9
---
srcpkgs/xdg-desktop-portal-xapp/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..4cfa47a2069a28
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
From 5950bda16e0f8dbe9b680b10c4702220da37749a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 02:00:07 -0300
Subject: [PATCH 24/24] xreader: update to 4.2.2
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 6 +-
2 files changed, 3 insertions(+), 195 deletions(-)
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..3a5aad441a0d9c 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,11 +1,11 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
@@ -16,7 +16,7 @@ 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=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (6 preceding siblings ...)
2024-09-16 5:02 ` [PR PATCH] [Updated] " toadwastoast
@ 2024-09-16 5:55 ` toadwastoast
2024-09-16 6:28 ` toadwastoast
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-16 5:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 42983 bytes --]
From d177d8e75bdd0a7f4cacc5c6019096084f9a9fb8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:32:12 -0300
Subject: [PATCH 01/25] cinnamon: update to 6.2.9
---
srcpkgs/cinnamon/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..a57cbca15fb284 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo gnome-themes-standard
+ gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
+ 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
+ libsoup xdg-desktop-portal-xapp gettext"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
From 25ace10e3d30b871f76ecfdad992def9249425bb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:37:17 -0300
Subject: [PATCH 02/25] cinnamon-control-center: update to 6.2.0
---
srcpkgs/cinnamon-control-center/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..4e2d2a7a9173b5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
-depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
+depends="libcinnamon-control-center cinnamon-settings-daemon
+ cinnamon-translations desktop-file-utils hicolor-icon-theme
+ gnome-color-manager"
short_desc="Cinnamon Control Center"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
From adf6a0d371bc853c4b38c10c94c7b0d63507ac47 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:46:16 -0300
Subject: [PATCH 03/25] cinnamon-desktop: update to 6.2.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..b0ce174b86d867 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.2.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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 134663ea9ac57d0d68c485b0c28cc5d5e59ea642 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:10 -0300
Subject: [PATCH 04/25] cinnamon-menus: update to 6.2.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..a17d8f3f040dc8 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.2.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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 1e614c6a35202d753d6cf8c30f1515bb96db9ab8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:46 -0300
Subject: [PATCH 05/25] cinnamon-screensaver: update to 6.2.0
---
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..01c4234b6fd595 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.2.0
+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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 2591004e754052604bc9af674068c630ba4b454e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:00 -0300
Subject: [PATCH 06/25] cinnamon-session: update to 6.2.1
---
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..9b4231deb31d24 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.2.1
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
From a39e64a6b6ede73cedf354150634a9ef3ecc53ef Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:29 -0300
Subject: [PATCH 07/25] cinnamon-settings-daemon: update to 6.2.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 e1a57b6c278141..b20ddf426632ad 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 7e42294d3a6971acfb163b357207a59627c8ca88 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:02 -0300
Subject: [PATCH 08/25] cinnamon-translations: update to 6.2.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 794d42bb0dcd8f..c12f2a7a366804 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.2.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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
From fd128c3a89af224497727d50946dcb6b3140e9f2 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:37 -0300
Subject: [PATCH 09/25] cjs: update to 6.2.0
---
srcpkgs/cjs/.directory | 4 ++
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
.../cjs/patches/ignore-encoding-test.patch | 11 -----
srcpkgs/cjs/template | 6 +--
4 files changed, 7 insertions(+), 60 deletions(-)
create mode 100644 srcpkgs/cjs/.directory
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
diff --git a/srcpkgs/cjs/.directory b/srcpkgs/cjs/.directory
new file mode 100644
index 00000000000000..d761f55871baa9
--- /dev/null
+++ b/srcpkgs/cjs/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2024,9,16,1,29,42.385
+Version=4
+VisibleRoles=Icons_text,Icons_size,Icons_modificationtime
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..3845b7aa8367c0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
From 4304311f3ffaa58ae8d6a411101eea28c9c23f37 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:10 -0300
Subject: [PATCH 10/25] muffin: update to 6.2.0
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..38c7d6e6ff4e63 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +28,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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
From f42258e0ae59e772e0144711eee51f452f2e1e15 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:32 -0300
Subject: [PATCH 11/25] nemo: update to 6.2.8
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..27a17798fb8ce1 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,13 +1,14 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 703aba866cdf6e1acff138f8e4b133136aa69833 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:05 -0300
Subject: [PATCH 12/25] nemo-audio-tab: update to 6.2.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 2d2ec5ac55b003..b2e309570f355f 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e67d4a1ff68f288528545aff656f3a7dff3b44f8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:46 -0300
Subject: [PATCH 13/25] nemo-compare: update to 6.2.0
---
srcpkgs/nemo-compare/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..ea4bfe7c333c97 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.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,6 +11,5 @@ short_desc="Nemo compare extension"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e98ebf37f1da18fd608c5217800d763c092dd157 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:00 -0300
Subject: [PATCH 14/25] nemo-emblems: update to 6.2.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 4e1cb6726d9e34..7a864acb5f317b 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 140de7bced9b6ae7804f8302cfcbfee59f09456b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:50 -0300
Subject: [PATCH 15/25] nemo-extensions: update to 6.2.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 401c7e515c5d32..02e81b5c2d1e6d 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
From 6ff6fc614958fb5a131fd082c5d0e428052b377b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:12 -0300
Subject: [PATCH 16/25] nemo-filleroller: update to 6.2.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 4b8f36f7589a72..f45af8bb76ab30 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 144ac072c45e9bf5da3f7f3b6de976024b3bf015 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:44 -0300
Subject: [PATCH 17/25] nemo-image-converter: update to 6.2.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 e4a69222c45457..d9868d0300a8b4 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From eb1924e5e7e6ab98e76f483fc124f0835ca5efeb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:11 -0300
Subject: [PATCH 18/25] nemo-preview: update to 6.2.0
---
srcpkgs/nemo-preview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..0313bdfeb3dc70 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -14,4 +14,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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From f6312fa87119086aacf0c3de011edd5e490d7373 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:32 -0300
Subject: [PATCH 19/25] nemo-python: update to 6.2.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 009b05c1fb3b85..e1a67bcdf9fe49 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 15f016bcb1d57bf7b96e0aace21c7343a0da67ba Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:44 -0300
Subject: [PATCH 20/25] nemo-terminal: update to 6.2.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 6f863a8aedb917..d8f17e4b7d1e30 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From b4dd23078ba76ab3012520cf607c21221a7f7f67 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:14 -0300
Subject: [PATCH 21/25] touchegg: update to 2.0.17
---
srcpkgs/touchegg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..69a3a4055ffaf1 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
From 2dfb8448733230862c03ddf4a8461dd73abe1b51 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:54 -0300
Subject: [PATCH 22/25] xapps: update to 2.8.5
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..9ebb9ee774cadc 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.5
+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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
From 49f3ba08eabe9411f78abc1e3973d46bc6db05fd Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:59:13 -0300
Subject: [PATCH 23/25] New package: xdg-desktop-portal-xapp-1.0.9
---
srcpkgs/xdg-desktop-portal-xapp/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..4cfa47a2069a28
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
From 5950bda16e0f8dbe9b680b10c4702220da37749a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 02:00:07 -0300
Subject: [PATCH 24/25] xreader: update to 4.2.2
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 6 +-
2 files changed, 3 insertions(+), 195 deletions(-)
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..3a5aad441a0d9c 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,11 +1,11 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
@@ -16,7 +16,7 @@ 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=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From 17fea4b695b876cc9dff8f1d9a229c7fab3d2eac Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 02:55:53 -0300
Subject: [PATCH 25/25] Delete srcpkgs/cjs/.directory
---
srcpkgs/cjs/.directory | 4 ----
1 file changed, 4 deletions(-)
delete mode 100644 srcpkgs/cjs/.directory
diff --git a/srcpkgs/cjs/.directory b/srcpkgs/cjs/.directory
deleted file mode 100644
index d761f55871baa9..00000000000000
--- a/srcpkgs/cjs/.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2024,9,16,1,29,42.385
-Version=4
-VisibleRoles=Icons_text,Icons_size,Icons_modificationtime
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (7 preceding siblings ...)
2024-09-16 5:55 ` toadwastoast
@ 2024-09-16 6:28 ` toadwastoast
2024-09-16 6:49 ` toadwastoast
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-16 6:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 42366 bytes --]
From d177d8e75bdd0a7f4cacc5c6019096084f9a9fb8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:32:12 -0300
Subject: [PATCH 01/24] cinnamon: update to 6.2.9
---
srcpkgs/cinnamon/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..a57cbca15fb284 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo gnome-themes-standard
+ gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
+ 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
+ libsoup xdg-desktop-portal-xapp gettext"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
From 25ace10e3d30b871f76ecfdad992def9249425bb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:37:17 -0300
Subject: [PATCH 02/24] cinnamon-control-center: update to 6.2.0
---
srcpkgs/cinnamon-control-center/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..4e2d2a7a9173b5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
-depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
+depends="libcinnamon-control-center cinnamon-settings-daemon
+ cinnamon-translations desktop-file-utils hicolor-icon-theme
+ gnome-color-manager"
short_desc="Cinnamon Control Center"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
From adf6a0d371bc853c4b38c10c94c7b0d63507ac47 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:46:16 -0300
Subject: [PATCH 03/24] cinnamon-desktop: update to 6.2.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..b0ce174b86d867 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.2.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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 134663ea9ac57d0d68c485b0c28cc5d5e59ea642 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:10 -0300
Subject: [PATCH 04/24] cinnamon-menus: update to 6.2.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..a17d8f3f040dc8 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.2.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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 1e614c6a35202d753d6cf8c30f1515bb96db9ab8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:46 -0300
Subject: [PATCH 05/24] cinnamon-screensaver: update to 6.2.0
---
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..01c4234b6fd595 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.2.0
+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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 2591004e754052604bc9af674068c630ba4b454e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:00 -0300
Subject: [PATCH 06/24] cinnamon-session: update to 6.2.1
---
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..9b4231deb31d24 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.2.1
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
From a39e64a6b6ede73cedf354150634a9ef3ecc53ef Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:29 -0300
Subject: [PATCH 07/24] cinnamon-settings-daemon: update to 6.2.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 e1a57b6c278141..b20ddf426632ad 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 7e42294d3a6971acfb163b357207a59627c8ca88 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:02 -0300
Subject: [PATCH 08/24] cinnamon-translations: update to 6.2.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 794d42bb0dcd8f..c12f2a7a366804 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.2.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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
From fd128c3a89af224497727d50946dcb6b3140e9f2 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:37 -0300
Subject: [PATCH 09/24] cjs: update to 6.2.0
---
srcpkgs/cjs/.directory | 4 ++
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
.../cjs/patches/ignore-encoding-test.patch | 11 -----
srcpkgs/cjs/template | 6 +--
4 files changed, 7 insertions(+), 60 deletions(-)
create mode 100644 srcpkgs/cjs/.directory
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
diff --git a/srcpkgs/cjs/.directory b/srcpkgs/cjs/.directory
new file mode 100644
index 00000000000000..d761f55871baa9
--- /dev/null
+++ b/srcpkgs/cjs/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2024,9,16,1,29,42.385
+Version=4
+VisibleRoles=Icons_text,Icons_size,Icons_modificationtime
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..3845b7aa8367c0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
From 4304311f3ffaa58ae8d6a411101eea28c9c23f37 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:10 -0300
Subject: [PATCH 10/24] muffin: update to 6.2.0
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..38c7d6e6ff4e63 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +28,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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
From f42258e0ae59e772e0144711eee51f452f2e1e15 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:32 -0300
Subject: [PATCH 11/24] nemo: update to 6.2.8
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..27a17798fb8ce1 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,13 +1,14 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 703aba866cdf6e1acff138f8e4b133136aa69833 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:05 -0300
Subject: [PATCH 12/24] nemo-audio-tab: update to 6.2.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 2d2ec5ac55b003..b2e309570f355f 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e67d4a1ff68f288528545aff656f3a7dff3b44f8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:46 -0300
Subject: [PATCH 13/24] nemo-compare: update to 6.2.0
---
srcpkgs/nemo-compare/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..ea4bfe7c333c97 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.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,6 +11,5 @@ short_desc="Nemo compare extension"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e98ebf37f1da18fd608c5217800d763c092dd157 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:00 -0300
Subject: [PATCH 14/24] nemo-emblems: update to 6.2.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 4e1cb6726d9e34..7a864acb5f317b 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 140de7bced9b6ae7804f8302cfcbfee59f09456b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:50 -0300
Subject: [PATCH 15/24] nemo-extensions: update to 6.2.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 401c7e515c5d32..02e81b5c2d1e6d 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
From 6ff6fc614958fb5a131fd082c5d0e428052b377b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:12 -0300
Subject: [PATCH 16/24] nemo-filleroller: update to 6.2.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 4b8f36f7589a72..f45af8bb76ab30 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 144ac072c45e9bf5da3f7f3b6de976024b3bf015 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:44 -0300
Subject: [PATCH 17/24] nemo-image-converter: update to 6.2.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 e4a69222c45457..d9868d0300a8b4 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From eb1924e5e7e6ab98e76f483fc124f0835ca5efeb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:11 -0300
Subject: [PATCH 18/24] nemo-preview: update to 6.2.0
---
srcpkgs/nemo-preview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..0313bdfeb3dc70 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -14,4 +14,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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From f6312fa87119086aacf0c3de011edd5e490d7373 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:32 -0300
Subject: [PATCH 19/24] nemo-python: update to 6.2.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 009b05c1fb3b85..e1a67bcdf9fe49 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 15f016bcb1d57bf7b96e0aace21c7343a0da67ba Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:44 -0300
Subject: [PATCH 20/24] nemo-terminal: update to 6.2.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 6f863a8aedb917..d8f17e4b7d1e30 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From b4dd23078ba76ab3012520cf607c21221a7f7f67 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:14 -0300
Subject: [PATCH 21/24] touchegg: update to 2.0.17
---
srcpkgs/touchegg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..69a3a4055ffaf1 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
From 2dfb8448733230862c03ddf4a8461dd73abe1b51 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:54 -0300
Subject: [PATCH 22/24] xapps: update to 2.8.5
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..9ebb9ee774cadc 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.5
+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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
From 49f3ba08eabe9411f78abc1e3973d46bc6db05fd Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:59:13 -0300
Subject: [PATCH 23/24] New package: xdg-desktop-portal-xapp-1.0.9
---
srcpkgs/xdg-desktop-portal-xapp/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..4cfa47a2069a28
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
From 5950bda16e0f8dbe9b680b10c4702220da37749a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 02:00:07 -0300
Subject: [PATCH 24/24] xreader: update to 4.2.2
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 6 +-
2 files changed, 3 insertions(+), 195 deletions(-)
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..3a5aad441a0d9c 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,11 +1,11 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
@@ -16,7 +16,7 @@ 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=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (8 preceding siblings ...)
2024-09-16 6:28 ` toadwastoast
@ 2024-09-16 6:49 ` toadwastoast
2024-09-19 2:18 ` toadwastoast
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-16 6:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 42974 bytes --]
From d177d8e75bdd0a7f4cacc5c6019096084f9a9fb8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:32:12 -0300
Subject: [PATCH 01/25] cinnamon: update to 6.2.9
---
srcpkgs/cinnamon/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..a57cbca15fb284 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo gnome-themes-standard
+ gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
+ 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
+ libsoup xdg-desktop-portal-xapp gettext"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
From 25ace10e3d30b871f76ecfdad992def9249425bb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:37:17 -0300
Subject: [PATCH 02/25] cinnamon-control-center: update to 6.2.0
---
srcpkgs/cinnamon-control-center/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..4e2d2a7a9173b5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
-depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
+depends="libcinnamon-control-center cinnamon-settings-daemon
+ cinnamon-translations desktop-file-utils hicolor-icon-theme
+ gnome-color-manager"
short_desc="Cinnamon Control Center"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
From adf6a0d371bc853c4b38c10c94c7b0d63507ac47 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:46:16 -0300
Subject: [PATCH 03/25] cinnamon-desktop: update to 6.2.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..b0ce174b86d867 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.2.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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 134663ea9ac57d0d68c485b0c28cc5d5e59ea642 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:10 -0300
Subject: [PATCH 04/25] cinnamon-menus: update to 6.2.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..a17d8f3f040dc8 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.2.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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 1e614c6a35202d753d6cf8c30f1515bb96db9ab8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:46 -0300
Subject: [PATCH 05/25] cinnamon-screensaver: update to 6.2.0
---
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..01c4234b6fd595 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.2.0
+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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 2591004e754052604bc9af674068c630ba4b454e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:00 -0300
Subject: [PATCH 06/25] cinnamon-session: update to 6.2.1
---
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..9b4231deb31d24 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.2.1
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
From a39e64a6b6ede73cedf354150634a9ef3ecc53ef Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:29 -0300
Subject: [PATCH 07/25] cinnamon-settings-daemon: update to 6.2.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 e1a57b6c278141..b20ddf426632ad 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 7e42294d3a6971acfb163b357207a59627c8ca88 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:02 -0300
Subject: [PATCH 08/25] cinnamon-translations: update to 6.2.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 794d42bb0dcd8f..c12f2a7a366804 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.2.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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
From fd128c3a89af224497727d50946dcb6b3140e9f2 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:37 -0300
Subject: [PATCH 09/25] cjs: update to 6.2.0
---
srcpkgs/cjs/.directory | 4 ++
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
.../cjs/patches/ignore-encoding-test.patch | 11 -----
srcpkgs/cjs/template | 6 +--
4 files changed, 7 insertions(+), 60 deletions(-)
create mode 100644 srcpkgs/cjs/.directory
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
diff --git a/srcpkgs/cjs/.directory b/srcpkgs/cjs/.directory
new file mode 100644
index 00000000000000..d761f55871baa9
--- /dev/null
+++ b/srcpkgs/cjs/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2024,9,16,1,29,42.385
+Version=4
+VisibleRoles=Icons_text,Icons_size,Icons_modificationtime
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..3845b7aa8367c0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
From 4304311f3ffaa58ae8d6a411101eea28c9c23f37 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:10 -0300
Subject: [PATCH 10/25] muffin: update to 6.2.0
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..38c7d6e6ff4e63 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +28,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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
From f42258e0ae59e772e0144711eee51f452f2e1e15 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:50:32 -0300
Subject: [PATCH 11/25] nemo: update to 6.2.8
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..27a17798fb8ce1 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,13 +1,14 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 703aba866cdf6e1acff138f8e4b133136aa69833 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:05 -0300
Subject: [PATCH 12/25] nemo-audio-tab: update to 6.2.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 2d2ec5ac55b003..b2e309570f355f 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e67d4a1ff68f288528545aff656f3a7dff3b44f8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:51:46 -0300
Subject: [PATCH 13/25] nemo-compare: update to 6.2.0
---
srcpkgs/nemo-compare/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..ea4bfe7c333c97 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.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,6 +11,5 @@ short_desc="Nemo compare extension"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e98ebf37f1da18fd608c5217800d763c092dd157 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:00 -0300
Subject: [PATCH 14/25] nemo-emblems: update to 6.2.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 4e1cb6726d9e34..7a864acb5f317b 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 140de7bced9b6ae7804f8302cfcbfee59f09456b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:52:50 -0300
Subject: [PATCH 15/25] nemo-extensions: update to 6.2.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 401c7e515c5d32..02e81b5c2d1e6d 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
From 6ff6fc614958fb5a131fd082c5d0e428052b377b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:12 -0300
Subject: [PATCH 16/25] nemo-filleroller: update to 6.2.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 4b8f36f7589a72..f45af8bb76ab30 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 144ac072c45e9bf5da3f7f3b6de976024b3bf015 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:53:44 -0300
Subject: [PATCH 17/25] nemo-image-converter: update to 6.2.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 e4a69222c45457..d9868d0300a8b4 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From eb1924e5e7e6ab98e76f483fc124f0835ca5efeb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:11 -0300
Subject: [PATCH 18/25] nemo-preview: update to 6.2.0
---
srcpkgs/nemo-preview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..0313bdfeb3dc70 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -14,4 +14,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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From f6312fa87119086aacf0c3de011edd5e490d7373 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:32 -0300
Subject: [PATCH 19/25] nemo-python: update to 6.2.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 009b05c1fb3b85..e1a67bcdf9fe49 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 15f016bcb1d57bf7b96e0aace21c7343a0da67ba Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:54:44 -0300
Subject: [PATCH 20/25] nemo-terminal: update to 6.2.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 6f863a8aedb917..d8f17e4b7d1e30 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From b4dd23078ba76ab3012520cf607c21221a7f7f67 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:14 -0300
Subject: [PATCH 21/25] touchegg: update to 2.0.17
---
srcpkgs/touchegg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..69a3a4055ffaf1 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
From 2dfb8448733230862c03ddf4a8461dd73abe1b51 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:57:54 -0300
Subject: [PATCH 22/25] xapps: update to 2.8.5
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..9ebb9ee774cadc 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.5
+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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
From 49f3ba08eabe9411f78abc1e3973d46bc6db05fd Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:59:13 -0300
Subject: [PATCH 23/25] New package: xdg-desktop-portal-xapp-1.0.9
---
srcpkgs/xdg-desktop-portal-xapp/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..4cfa47a2069a28
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
From 5950bda16e0f8dbe9b680b10c4702220da37749a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 02:00:07 -0300
Subject: [PATCH 24/25] xreader: update to 4.2.2
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 6 +-
2 files changed, 3 insertions(+), 195 deletions(-)
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..3a5aad441a0d9c 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,11 +1,11 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
@@ -16,7 +16,7 @@ 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=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From 921b08dd85996f1131426a1c0840e904ef439872 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 03:49:31 -0300
Subject: [PATCH 25/25] cjs: update to 6.2.0
---
srcpkgs/cjs/.directory | 4 ----
1 file changed, 4 deletions(-)
delete mode 100644 srcpkgs/cjs/.directory
diff --git a/srcpkgs/cjs/.directory b/srcpkgs/cjs/.directory
deleted file mode 100644
index d761f55871baa9..00000000000000
--- a/srcpkgs/cjs/.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-Timestamp=2024,9,16,1,29,42.385
-Version=4
-VisibleRoles=Icons_text,Icons_size,Icons_modificationtime
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (9 preceding siblings ...)
2024-09-16 6:49 ` toadwastoast
@ 2024-09-19 2:18 ` toadwastoast
2024-09-19 3:54 ` toadwastoast
2024-09-19 4:01 ` toadwastoast
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-19 2:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 42005 bytes --]
From d177d8e75bdd0a7f4cacc5c6019096084f9a9fb8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:32:12 -0300
Subject: [PATCH 01/24] cinnamon: update to 6.2.9
---
srcpkgs/cinnamon/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..a57cbca15fb284 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo gnome-themes-standard
+ gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
+ 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
+ libsoup xdg-desktop-portal-xapp gettext"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
From 25ace10e3d30b871f76ecfdad992def9249425bb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:37:17 -0300
Subject: [PATCH 02/24] cinnamon-control-center: update to 6.2.0
---
srcpkgs/cinnamon-control-center/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..4e2d2a7a9173b5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
-depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
+depends="libcinnamon-control-center cinnamon-settings-daemon
+ cinnamon-translations desktop-file-utils hicolor-icon-theme
+ gnome-color-manager"
short_desc="Cinnamon Control Center"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
From adf6a0d371bc853c4b38c10c94c7b0d63507ac47 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:46:16 -0300
Subject: [PATCH 03/24] cinnamon-desktop: update to 6.2.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..b0ce174b86d867 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.2.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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From 134663ea9ac57d0d68c485b0c28cc5d5e59ea642 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:10 -0300
Subject: [PATCH 04/24] cinnamon-menus: update to 6.2.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..a17d8f3f040dc8 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.2.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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 1e614c6a35202d753d6cf8c30f1515bb96db9ab8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:47:46 -0300
Subject: [PATCH 05/24] cinnamon-screensaver: update to 6.2.0
---
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..01c4234b6fd595 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.2.0
+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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 2591004e754052604bc9af674068c630ba4b454e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:00 -0300
Subject: [PATCH 06/24] cinnamon-session: update to 6.2.1
---
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..9b4231deb31d24 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.2.1
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
From a39e64a6b6ede73cedf354150634a9ef3ecc53ef Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:48:29 -0300
Subject: [PATCH 07/24] cinnamon-settings-daemon: update to 6.2.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 e1a57b6c278141..b20ddf426632ad 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 7e42294d3a6971acfb163b357207a59627c8ca88 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Mon, 16 Sep 2024 01:49:02 -0300
Subject: [PATCH 08/24] cinnamon-translations: update to 6.2.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 794d42bb0dcd8f..c12f2a7a366804 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.2.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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
From c38c2f9f5275cb8d77475bc2f28f41cd71707e79 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:05:33 -0300
Subject: [PATCH 09/24] cjs: update to 6.2.0
---
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
.../cjs/patches/ignore-encoding-test.patch | 11 -----
srcpkgs/cjs/template | 8 ++--
3 files changed, 4 insertions(+), 61 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..639e4b050f4fec 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
-# Template file for 'cjs'
+ # Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
From eab5cbe11061e8b068847d606c8e37332a349f33 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:07:30 -0300
Subject: [PATCH 10/24] muffin: update to 6.2.0
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..38c7d6e6ff4e63 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +28,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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
From d32dd20e93d11f8c041e6e06857bef373ee1faac Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:08:46 -0300
Subject: [PATCH 11/24] nemo: update to 6.2.8
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..27a17798fb8ce1 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,13 +1,14 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 87d524afd95721c72ed57a716424e541893bbf69 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:09:29 -0300
Subject: [PATCH 12/24] nemo-audio-tab: update to 6.2.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 2d2ec5ac55b003..b2e309570f355f 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 15de8ee2e4cdd945d1dec4bf8edca1f1e5b80da9 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:10:17 -0300
Subject: [PATCH 13/24] nemo-compare: update to 6.2.0
---
srcpkgs/nemo-compare/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..ea4bfe7c333c97 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.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,6 +11,5 @@ short_desc="Nemo compare extension"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 9724c415a33566290627a69687178069f5e6bc65 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:10:32 -0300
Subject: [PATCH 14/24] nemo-emblems: update to 6.2.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 4e1cb6726d9e34..7a864acb5f317b 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From edf02dac4fd9ee79d239683a4b34d0b33965e2a9 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:11:02 -0300
Subject: [PATCH 15/24] nemo-extensions: update to 6.2.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 401c7e515c5d32..02e81b5c2d1e6d 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
From b0d95c3f633a300f522da6b56281298b4d6fa9e5 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:11:15 -0300
Subject: [PATCH 16/24] nemo-fileroller: update to 6.2.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 4b8f36f7589a72..f45af8bb76ab30 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 36346bd491cc56a0f874840a49fb37662d66bcd2 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:11:33 -0300
Subject: [PATCH 17/24] nemo-image-converter: update to 6.2.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 e4a69222c45457..d9868d0300a8b4 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From ab03fc61eab967fdac5223279d788842ba3e2349 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:12:00 -0300
Subject: [PATCH 18/24] nemo-preview: update to 6.2.0
---
srcpkgs/nemo-preview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..0313bdfeb3dc70 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -14,4 +14,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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From a4c246ab62afc857b6cc7f95e17cdfa8ccce959c Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:12:14 -0300
Subject: [PATCH 19/24] nemo-python: update to 6.2.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 009b05c1fb3b85..e1a67bcdf9fe49 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 9357fb2513cb338f2b2032a793f6c60397370a0b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:12:58 -0300
Subject: [PATCH 20/24] nemo-terminal: update to 6.2.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 6f863a8aedb917..d8f17e4b7d1e30 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 2c0d6517cfff87bd35a4b1eaa30f799e331f118c Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:13:26 -0300
Subject: [PATCH 21/24] touchegg: update to 2.0.17
---
srcpkgs/touchegg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..69a3a4055ffaf1 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
From e7e94edacab1be4056ea2261be7475f97ae74678 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:14:08 -0300
Subject: [PATCH 22/24] xapps: update to 2.8.5
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..9ebb9ee774cadc 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.5
+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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
From c8646d9850d847b4117894f8b3ed9cc7519d3b04 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:14:37 -0300
Subject: [PATCH 23/24] xreader: update to 4.2.2
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 6 +-
2 files changed, 3 insertions(+), 195 deletions(-)
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..3a5aad441a0d9c 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,11 +1,11 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
@@ -16,7 +16,7 @@ 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=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From a730eb98a26bfd36a5120bb5e4255946d3df8025 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 18 Sep 2024 23:15:54 -0300
Subject: [PATCH 24/24] New package: xdg-desktop-portal-xapp-1.0.9
---
srcpkgs/xdg-desktop-portal-xapp/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..4cfa47a2069a28
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (10 preceding siblings ...)
2024-09-19 2:18 ` toadwastoast
@ 2024-09-19 3:54 ` toadwastoast
2024-09-19 4:01 ` toadwastoast
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-19 3:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 40866 bytes --]
From df692b7c156568aad82bfd5d04327fb864557f6b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:37:00 -0300
Subject: [PATCH 01/23] cinnamon: update to 6.2.9
---
srcpkgs/cinnamon/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..a57cbca15fb284 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo gnome-themes-standard
+ gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
+ 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
+ libsoup xdg-desktop-portal-xapp gettext"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
From 74e4689111c8508320bc3172ada6c30bd5ee1cf4 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:37:24 -0300
Subject: [PATCH 02/23] cinnamon-control-center: update to 6.2.0
---
srcpkgs/cinnamon-control-center/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..4e2d2a7a9173b5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
-depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
+depends="libcinnamon-control-center cinnamon-settings-daemon
+ cinnamon-translations desktop-file-utils hicolor-icon-theme
+ gnome-color-manager"
short_desc="Cinnamon Control Center"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
From e1ce28efc4c4cd57593e3ef41b250fa5cf13e763 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:37:57 -0300
Subject: [PATCH 03/23] cinnamon-desktop: update to 6.2.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..b0ce174b86d867 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.2.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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From da4065e6aa49b096fc326fe0cb8e6f3a90371e98 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:38:16 -0300
Subject: [PATCH 04/23] cinnamon-menus: update to 6.2.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..a17d8f3f040dc8 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.2.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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 8137b33f3337ea7fc114d2437cc02fd8f83b20f6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:38:34 -0300
Subject: [PATCH 05/23] cinnamon-screensaver: update to 6.2.0
---
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..01c4234b6fd595 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.2.0
+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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 64215f76595247900b0008d6530bcea808dfa38a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:43:21 -0300
Subject: [PATCH 06/23] cinnamon-session: update to 6.2.1
---
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..9b4231deb31d24 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.2.1
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
From 333ed224444dda0050dbbd7db8dd1d1a47cf4148 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:44:14 -0300
Subject: [PATCH 07/23] cinnamon-settings-daemon: update to 6.2.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 e1a57b6c278141..b20ddf426632ad 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 92867a5bfbe6c028fef19a5b0f8887185d19462f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:44:32 -0300
Subject: [PATCH 08/23] cinnamon-translations: update to 6.2.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..c12f2a7a366804 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.2.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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
From ddf3a6a340cf4ee6b38c49f782f6aaef53c0b9cc Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:44:49 -0300
Subject: [PATCH 09/23] cjs: update to 6.2.0
---
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
.../cjs/patches/ignore-encoding-test.patch | 11 -----
srcpkgs/cjs/template | 6 +--
3 files changed, 3 insertions(+), 60 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..3845b7aa8367c0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
From 5461b5717fdf17400e314a7cbea5405bd167084f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:45:16 -0300
Subject: [PATCH 10/23] muffin: update to 6.2.0
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..38c7d6e6ff4e63 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +28,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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
From efa16d93c0837f9258a36d6aac7435437f1921a1 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:45:32 -0300
Subject: [PATCH 11/23] nemo: update to 6.2.8
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..27a17798fb8ce1 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,13 +1,14 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 4a527909823dbdc639337a9c99813804c6ceb5b6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:45:49 -0300
Subject: [PATCH 12/23] nemo-audio-tab: update to 6.2.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 2d2ec5ac55b003..b2e309570f355f 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 327911a38f1a2601d6f1ea9769597b04e50819ca Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:08 -0300
Subject: [PATCH 13/23] nemo-compare: update to 6.2.0
---
srcpkgs/nemo-compare/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..ea4bfe7c333c97 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.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,6 +11,5 @@ short_desc="Nemo compare extension"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 1208ba68e96ff37df3c3bca7b8e0d3dc3ca6f808 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:28 -0300
Subject: [PATCH 14/23] nemo-emblems: update to 6.2.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 4e1cb6726d9e34..7a864acb5f317b 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From f201257e49c306acc1f753b8bd76c5a8fe3f0599 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:44 -0300
Subject: [PATCH 15/23] nemo-extensions: update to 6.2.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 401c7e515c5d32..02e81b5c2d1e6d 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
From 1117d4170c38d17f12d31b8e140f624419649981 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:57 -0300
Subject: [PATCH 16/23] nemo-fileroller: update to 6.2.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 4b8f36f7589a72..f45af8bb76ab30 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 55322550016d41cfcaf5b6a071e425b981748a10 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:47:11 -0300
Subject: [PATCH 17/23] nemo-preview: update to 6.2.0
---
srcpkgs/nemo-preview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..0313bdfeb3dc70 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -14,4 +14,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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 4e7b06fa0cf529389858eb6ec25d6e869d5c2430 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:47:29 -0300
Subject: [PATCH 18/23] nemo-python: update to 6.2.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 009b05c1fb3b85..e1a67bcdf9fe49 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e2895ed811820469a0702c8dc90d7bf8e71549b8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:47:45 -0300
Subject: [PATCH 19/23] nemo-terminal: update to 6.2.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 6f863a8aedb917..d8f17e4b7d1e30 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From b1bc9a4810a0a5ee3a9fdfff1f14f431b63039e8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:48:16 -0300
Subject: [PATCH 20/23] touchegg: update to 2.0.17
---
srcpkgs/touchegg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..69a3a4055ffaf1 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
From 9fa8bdd4a62a869f3d27a54c1ee2b757715bec73 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:49:01 -0300
Subject: [PATCH 21/23] xapps: update to 2.8.5
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..9ebb9ee774cadc 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.5
+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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
From 2f08ccd36f59a9e6ef489ef996fff07f889637a9 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:49:19 -0300
Subject: [PATCH 22/23] xreader: update to 4.2.2
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 6 +-
2 files changed, 3 insertions(+), 195 deletions(-)
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..3a5aad441a0d9c 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,11 +1,11 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
@@ -16,7 +16,7 @@ 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=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From 3fadcd5509cf61e2bfb6283ee01cd731986e6a23 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:50:12 -0300
Subject: [PATCH 23/23] New package: xdg-desktop-portal-xapp-1.0.9
---
srcpkgs/xdg-desktop-portal-xapp/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..4cfa47a2069a28
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (11 preceding siblings ...)
2024-09-19 3:54 ` toadwastoast
@ 2024-09-19 4:01 ` toadwastoast
12 siblings, 0 replies; 14+ messages in thread
From: toadwastoast @ 2024-09-19 4:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by toadwastoast against master on the void-packages repository
https://github.com/toadwastoast/void-packages cinnamon
https://github.com/void-linux/void-packages/pull/52221
cinnamon: update to 6.2
Fixes #48541 and also fixes the downloading of user-made cinnamon applets, extensions and desklets. Experimental wayland session works fine too.
I removed the patches for cjs and xreader since they don't seem to be needed on version 6.2 and the packages can't be built with them enabled. Correct me if I did something wrong.
I also packaged a new cinnamon dependency, xdg-desktop-portal-xapp.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!-- 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) and (x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/52221.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cinnamon-52221.patch --]
[-- Type: text/x-diff, Size: 41975 bytes --]
From df692b7c156568aad82bfd5d04327fb864557f6b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:37:00 -0300
Subject: [PATCH 01/24] cinnamon: update to 6.2.9
---
srcpkgs/cinnamon/template | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..a57cbca15fb284 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.2.9
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
@@ -9,23 +9,22 @@ hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
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
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
-depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}
- cinnamon-session>=${version%.*} muffin>=${version%.*} gsound
- 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
- libsoup"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel"
+depends="accountsservice libcaribou cinnamon-settings-daemon
+ cinnamon-session muffin gsound cinnamon-control-center
+ cinnamon-screensaver cinnamon-translations nemo gnome-themes-standard
+ gnome-themes-standard-metacity gnome-backgrounds network-manager-applet
+ 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
+ libsoup xdg-desktop-portal-xapp gettext"
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=df80f8dad174b56fd0dc652f7af45f1638d73fedd5345af0617efe2b23edbc3c
+checksum=a0b15b98a899532d531689ea11ff6805a87fcf5994e238322b6c916bf8c29919
python_version=3
pycompile_dirs="
From 74e4689111c8508320bc3172ada6c30bd5ee1cf4 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:37:24 -0300
Subject: [PATCH 02/24] cinnamon-control-center: update to 6.2.0
---
srcpkgs/cinnamon-control-center/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..4e2d2a7a9173b5 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
-version=5.8.2
-revision=2
+version=6.2.0
+revision=1
build_style=meson
build_helper=gir
configure_args="-Donlineaccounts=false"
@@ -10,15 +10,16 @@ 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
libnotify-devel libwacom-devel libnma-devel polkit-devel
- pulseaudio-devel upower-devel libglib-devel gtk+3-devel"
-depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon>=2.4
- cinnamon-translations>=2.4 desktop-file-utils hicolor-icon-theme"
+ pulseaudio-devel upower-devel libglib-devel gtk+3-devel colord-devel"
+depends="libcinnamon-control-center cinnamon-settings-daemon
+ cinnamon-translations desktop-file-utils hicolor-icon-theme
+ gnome-color-manager"
short_desc="Cinnamon Control Center"
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=f3e5caf03c4d629fbaf883caa816fe799685438d650012621e51457583000d07
# requires X and wacom devices?
make_check=no
From e1ce28efc4c4cd57593e3ef41b250fa5cf13e763 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:37:57 -0300
Subject: [PATCH 03/24] cinnamon-desktop: update to 6.2.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..b0ce174b86d867 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.2.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=95bb6fc16597601b1febde4bd1317ba9c3ab662119b6b8e602b49e832d3f3eb7
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From da4065e6aa49b096fc326fe0cb8e6f3a90371e98 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:38:16 -0300
Subject: [PATCH 04/24] cinnamon-menus: update to 6.2.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..a17d8f3f040dc8 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.2.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=95170602c5291db6f5031dfc245ebf61872ff93860fb1fc18ec433bec638cf16
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 8137b33f3337ea7fc114d2437cc02fd8f83b20f6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:38:34 -0300
Subject: [PATCH 05/24] cinnamon-screensaver: update to 6.2.0
---
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..01c4234b6fd595 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.2.0
+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=8fdc012b630b2b1236fc57fa5f006c7c757028ae2ef4528fd05e4d68f4902eda
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 64215f76595247900b0008d6530bcea808dfa38a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:43:21 -0300
Subject: [PATCH 06/24] cinnamon-session: update to 6.2.1
---
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..9b4231deb31d24 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.2.1
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=69d39494201f2cd7e30d880813df69ddeef143befc660ed953683d5ddac6153f
From 333ed224444dda0050dbbd7db8dd1d1a47cf4148 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:44:14 -0300
Subject: [PATCH 07/24] cinnamon-settings-daemon: update to 6.2.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 e1a57b6c278141..b20ddf426632ad 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -1,20 +1,20 @@
# Template file for 'cinnamon-settings-daemon'
pkgname=cinnamon-settings-daemon
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
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"
+ nss-devel polkit-devel pulseaudio-devel upower-devel librsvg-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Cinnamon Settings Daemon"
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=ecb360017284cdf8a5776a64175ac69f730790d3031f1f4cabc5f8c52660a498
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 92867a5bfbe6c028fef19a5b0f8887185d19462f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:44:32 -0300
Subject: [PATCH 08/24] cinnamon-translations: update to 6.2.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..c12f2a7a366804 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.2.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=ef0e621492e32155a2e5ac47083c6167280f0b285bc0e4da3259a6d5c5cc366b
do_install() {
vmkdir usr
From ddf3a6a340cf4ee6b38c49f782f6aaef53c0b9cc Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:44:49 -0300
Subject: [PATCH 09/24] cjs: update to 6.2.0
---
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
.../cjs/patches/ignore-encoding-test.patch | 11 -----
srcpkgs/cjs/template | 6 +--
3 files changed, 3 insertions(+), 60 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
delete mode 100644 srcpkgs/cjs/patches/ignore-encoding-test.patch
diff --git a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch b/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
deleted file mode 100644
index 3c1c7e0599f476..00000000000000
--- a/srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 98c42ad1010977..00000000000000
--- a/srcpkgs/cjs/patches/ignore-encoding-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 319bae6b2b1302..3845b7aa8367c0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -1,19 +1,19 @@
# Template file for 'cjs'
pkgname=cjs
-version=5.8.0
+version=6.2.0
revision=1
build_style=meson
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"
+makedepends="readline-devel mozjs115-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=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
+checksum=da21f367c91af58ea0d175e292b4dc2426a61e95e50754ff1d2a8a0d52467cb0
make_check_pre="xvfb-run"
pre_configure() {
From 5461b5717fdf17400e314a7cbea5405bd167084f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:45:16 -0300
Subject: [PATCH 10/24] muffin: update to 6.2.0
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..38c7d6e6ff4e63 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
# Template file for 'muffin'
pkgname=muffin
-version=5.8.1
+version=6.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,7 +10,7 @@ configure_args="-Dopengl=true -Degl=true -Dglx=true -Dgles2=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
- intltool pkg-config wayland-devel wayland-protocols"
+ intltool pkg-config wayland-devel wayland-protocols xorg-server-xwayland"
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
@@ -19,7 +19,8 @@ makedepends="cinnamon-desktop-devel libSM-devel libinput-devel fribidi-devel
xkeyboard-config libXrender-devel libX11-devel libxcb-devel libXau-devel
libXinerama-devel libICE-devel dbus-devel libglvnd-devel
eudev-libudev-devel libgudev-devel wayland-devel libgbm-devel pipewire-devel
- libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel"
+ libcanberra-devel startup-notification-devel libXtst-devel json-glib-devel
+ elogind-devel mutter-devel"
depends="zenity"
short_desc="Cinnamon window manager based on Mutter"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +28,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=a1181d8ba3e05ccff5036df724b543e5bac0c55d1699c0a72822282dbcc050c6
+checksum=889200ceb45334899e7568f1735ec2b15e1ae042d176821a0d45c524960bee0a
post_install() {
vmkdir usr/share/gir-1.0
From efa16d93c0837f9258a36d6aac7435437f1921a1 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:45:32 -0300
Subject: [PATCH 11/24] nemo: update to 6.2.8
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..27a17798fb8ce1 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -1,13 +1,14 @@
# Template file for 'nemo'
pkgname=nemo
-version=5.8.5
-revision=2
+version=6.2.8
+revision=1
build_style=meson
build_helper=gir
pycompile_dirs="/usr/share/nemo/actions/myaction.py"
hostmakedepends="gettext-devel glib-devel intltool pkg-config"
makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libxml2-devel"
depends="cinnamon-translations dconf gvfs"
short_desc="Cinnamon file manager (nautilus fork)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,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=68d829614beeb2596aa706db5ff070fcfc0e96ab7e3d2561772b52bed6c8ca38
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 4a527909823dbdc639337a9c99813804c6ceb5b6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:45:49 -0300
Subject: [PATCH 12/24] nemo-audio-tab: update to 6.2.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 2d2ec5ac55b003..b2e309570f355f 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 327911a38f1a2601d6f1ea9769597b04e50819ca Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:08 -0300
Subject: [PATCH 13/24] nemo-compare: update to 6.2.0
---
srcpkgs/nemo-compare/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index ed5163f9fd109d..ea4bfe7c333c97 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.8.1
-revision=2
+version=6.2.0
+revision=1
build_wrksrc=nemo-compare
build_style=python3-module
hostmakedepends="pkg-config python3-setuptools"
@@ -11,6 +11,5 @@ short_desc="Nemo compare extension"
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"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=d6a5c0a23ae47283ee9b954c6250691f21d5b9dad4e3c68207b8524c3d032784
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 1208ba68e96ff37df3c3bca7b8e0d3dc3ca6f808 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:28 -0300
Subject: [PATCH 14/24] nemo-emblems: update to 6.2.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 4e1cb6726d9e34..7a864acb5f317b 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From f201257e49c306acc1f753b8bd76c5a8fe3f0599 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:44 -0300
Subject: [PATCH 15/24] nemo-extensions: update to 6.2.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 401c7e515c5d32..02e81b5c2d1e6d 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.8.0
+version=6.2.0
revision=1
build_style=meta
depends="
From 1117d4170c38d17f12d31b8e140f624419649981 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:46:57 -0300
Subject: [PATCH 16/24] nemo-fileroller: update to 6.2.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 4b8f36f7589a72..f45af8bb76ab30 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 88345cd89e94ed4ebd949e0d02a37aef9e3ff2f6 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:58:17 -0300
Subject: [PATCH 17/24] nemo-image-converter: update to 6.2.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 e4a69222c45457..d9868d0300a8b4 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.8.0
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 0e181007dffaaf90bf4c7da72f828d724dd64789 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:58:37 -0300
Subject: [PATCH 18/24] nemo-preview: update to 6.2.0
---
srcpkgs/nemo-preview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..0313bdfeb3dc70 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.2.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
@@ -14,4 +14,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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 6e15c0f93d083ccef39e7f751999e3184783efbe Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:58:56 -0300
Subject: [PATCH 19/24] nemo-python: update to 6.2.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 009b05c1fb3b85..e1a67bcdf9fe49 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From e47aadd611535e3dbd89aeeb927b11927cb88cde Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 00:59:08 -0300
Subject: [PATCH 20/24] nemo-terminal: update to 6.2.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 6f863a8aedb917..d8f17e4b7d1e30 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.8.0
-revision=2
+version=6.2.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=66140a8d7365c1333f219d3012bf51c9462df4f8b1187d08716c9c577a77af28
+checksum=b1c7e3d269ed05f472c80c16cf3f12827cbb48cb05406b276be14060225dbbc3
From 3c625aba9898e874674d828a0072cddd06ecad5d Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 01:00:02 -0300
Subject: [PATCH 21/24] touchegg: update to 2.0.17
---
srcpkgs/touchegg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index a8526763517f0d..69a3a4055ffaf1 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,6 +1,6 @@
# Template file for 'touchegg'
pkgname=touchegg
-version=2.0.13
+version=2.0.17
revision=1
build_style=cmake
configure_args="-DUSE_SYSTEMD=false"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/JoseExposito/touchegg"
changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
+checksum=0600c4c57d6c96b6f0a84a56cb4f5d8ce0fa42831bfa0d6cf94ce6a1a23823f8
system_accounts="_touchegg"
post_install() {
From 0be92215db59307a0afaa1f45ffd9add082a06ef Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 01:00:22 -0300
Subject: [PATCH 22/24] xapps: update to 2.8.5
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..9ebb9ee774cadc 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.5
+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=c1fd855bdf90b1ce53a417da06186df72ab6d59f07d75620272a9c54facd07f3
xapps-devel_package() {
short_desc+=" - development files"
From 7e8daf4f67d0c1e80e8f1bf35beda33c9c5ac94a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 01:00:37 -0300
Subject: [PATCH 23/24] xreader: update to 4.2.2
---
...8a884c8cf3257ea1f053a82784da078999ed.patch | 192 ------------------
srcpkgs/xreader/template | 6 +-
2 files changed, 3 insertions(+), 195 deletions(-)
delete mode 100644 srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
diff --git a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch b/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
deleted file mode 100644
index e81d4f95511edb..00000000000000
--- a/srcpkgs/xreader/patches/06b18a884c8cf3257ea1f053a82784da078999ed.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 06b18a884c8cf3257ea1f053a82784da078999ed Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 4 Aug 2023 09:41:57 -0400
-Subject: [PATCH] Fix building with meson 1.2.
-
-Thanks to @heftig for the patch.
-
-Fixes #612.
----
- cut-n-paste/meson.build | 3 ---
- cut-n-paste/smclient/meson.build | 6 ++++++
- cut-n-paste/synctex/meson.build | 6 ++++++
- cut-n-paste/totem-screensaver/meson.build | 6 ++++++
- cut-n-paste/zoom-control/meson.build | 6 ++++++
- libdocument/meson.build | 6 ++++--
- libmisc/meson.build | 6 ++++++
- libview/meson.build | 6 ++++++
- shell/meson.build | 26 ++++++++++++++++-------
- 9 files changed, 58 insertions(+), 13 deletions(-)
-
-diff --git a/cut-n-paste/meson.build b/cut-n-paste/meson.build
-index 0f79ebb8..5fd89d2e 100644
---- a/cut-n-paste/meson.build
-+++ b/cut-n-paste/meson.build
-@@ -2,6 +2,3 @@ subdir('zoom-control')
- subdir('totem-screensaver')
- subdir('smclient')
- subdir('synctex')
--
--cnc_includes = include_directories('zoom-control', 'totem-screensaver', 'smclient')
--synctex_includes = include_directories('synctex')
-diff --git a/cut-n-paste/smclient/meson.build b/cut-n-paste/smclient/meson.build
-index ca129a3d..5c9eea93 100644
---- a/cut-n-paste/smclient/meson.build
-+++ b/cut-n-paste/smclient/meson.build
-@@ -22,3 +22,9 @@ libsmclient = static_library(
- dependencies: smclient_deps,
- include_directories: include_dirs,
- )
-+
-+libsmclient_dep = declare_dependency(
-+ link_with: libsmclient,
-+ dependencies: smclient_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/synctex/meson.build b/cut-n-paste/synctex/meson.build
-index 0f063adb..305c4f56 100644
---- a/cut-n-paste/synctex/meson.build
-+++ b/cut-n-paste/synctex/meson.build
-@@ -14,3 +14,9 @@ libsynctex = static_library(
- synctex_sources,
- dependencies: synctex_deps,
- )
-+
-+libsynctex_dep = declare_dependency(
-+ link_with: libsynctex,
-+ dependencies: synctex_deps,
-+ include_directories: include_directories('.'),
-+)
-diff --git a/cut-n-paste/totem-screensaver/meson.build b/cut-n-paste/totem-screensaver/meson.build
-index faac9b7c..a67c2f96 100644
---- a/cut-n-paste/totem-screensaver/meson.build
-+++ b/cut-n-paste/totem-screensaver/meson.build
-@@ -15,3 +15,9 @@ libtotemscrsaver = static_library(
- dependencies: totem_screensaver_deps,
- include_directories: include_root,
- )
-+
-+libtotemscrsaver_dep = declare_dependency(
-+ link_with: libtotemscrsaver,
-+ dependencies: totem_screensaver_deps,
-+ include_directories: [include_root, include_directories('.')],
-+)
-diff --git a/cut-n-paste/zoom-control/meson.build b/cut-n-paste/zoom-control/meson.build
-index f48567fc..2c3320ac 100644
---- a/cut-n-paste/zoom-control/meson.build
-+++ b/cut-n-paste/zoom-control/meson.build
-@@ -20,3 +20,9 @@ libephyzoom = static_library(
- include_directories: include_root,
- dependencies: zoom_deps,
- )
-+
-+libephyzoom_dep = declare_dependency(
-+ link_with: libephyzoom,
-+ include_directories: [include_root, include_directories('.')],
-+ dependencies: zoom_deps,
-+)
-diff --git a/libdocument/meson.build b/libdocument/meson.build
-index 6c0d6e34..5965a582 100644
---- a/libdocument/meson.build
-+++ b/libdocument/meson.build
-@@ -121,14 +121,14 @@ libdocument_deps = [
- gmodule,
- gtk,
- math,
-+ libsynctex_dep,
- ]
-
- libdocument = library(
- 'xreaderdocument',
- libdocument_private_headers + libdocument_sources,
- dependencies: libdocument_deps,
-- include_directories: [include_root, synctex_includes],
-- link_whole: [libsynctex],
-+ include_directories: include_root,
- soversion: binary_major_version,
- version: binary_version,
- install: true,
-@@ -137,6 +137,8 @@ libdocument = library(
- # this is needed so targets that depend on generated headers can do so
- libdocument_dep = declare_dependency(
- link_with: libdocument,
-+ dependencies: libdocument_deps,
-+ include_directories: include_root,
- sources: libdoc_enums[1]
- )
-
-diff --git a/libmisc/meson.build b/libmisc/meson.build
-index 280d3b03..e0140736 100644
---- a/libmisc/meson.build
-+++ b/libmisc/meson.build
-@@ -20,3 +20,9 @@ libmisc = static_library(
- include_directories: include_dirs,
- dependencies: libmisc_deps,
- )
-+
-+libmisc_dep = declare_dependency(
-+ link_with: libmisc,
-+ include_directories: include_dirs,
-+ dependencies: libmisc_deps,
-+)
-diff --git a/libview/meson.build b/libview/meson.build
-index b1c18504..77c7f023 100644
---- a/libview/meson.build
-+++ b/libview/meson.build
-@@ -90,6 +90,12 @@ libview = library(
- install: true,
- )
-
-+libview_dep = declare_dependency(
-+ link_with: libview,
-+ include_directories: include_dirs,
-+ dependencies: libview_deps,
-+)
-+
- install_headers(
- libview_headers,
- subdir: libview_header_dir,
-diff --git a/shell/meson.build b/shell/meson.build
-index cff438b3..4060ceec 100644
---- a/shell/meson.build
-+++ b/shell/meson.build
-@@ -132,21 +132,31 @@ if get_option('enable_dbus')
- )
- endif
-
-+libshell_deps = [
-+ xreader_deps,
-+ libview_dep,
-+ libmisc_dep,
-+ libtotemscrsaver_dep,
-+ libsmclient_dep,
-+ libephyzoom_dep,
-+]
-+
- libshell = static_library(
- 'shell',
- shell_sources,
-- link_with: libview,
-- link_whole: [libmisc, libtotemscrsaver, libsmclient, libephyzoom],
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
-+)
-+
-+libshell_dep = declare_dependency(
-+ link_whole: libshell, # Need the whole lib for gresource lookup
-+ dependencies: libshell_deps,
-+ include_directories: include_dirs,
- )
-
- xreader = executable(
- 'xreader',
- 'main.c',
-- link_with: libview,
-- link_whole: libshell,
-- dependencies: xreader_deps,
-- include_directories: [include_dirs, cnc_includes],
-+ dependencies: libshell_dep,
- install: true,
- )
diff --git a/srcpkgs/xreader/template b/srcpkgs/xreader/template
index 097dd8804236c5..3a5aad441a0d9c 100644
--- a/srcpkgs/xreader/template
+++ b/srcpkgs/xreader/template
@@ -1,11 +1,11 @@
# Template file for 'xreader'
pkgname=xreader
-version=3.8.2
+version=4.2.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false) -Dthumbnailer=false"
-hostmakedepends="mathjax2 pkg-config intltool glib-devel"
+hostmakedepends="mathjax2 pkg-config intltool itstool texlive-bin glib-devel"
makedepends="djvulibre-devel libSM-devel libgxps-devel libsecret-devel
libspectre-devel poppler-glib-devel libwebkit2gtk41-devel xapps-devel
gdk-pixbuf-devel cairo-devel atk-devel libglib-devel gtk+3-devel
@@ -16,7 +16,7 @@ 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=4193fd727ccf6e259ffa9f8cd207496b9fc07b26e26fd174cac3adad94afb401
+checksum=1392286e58408c40b35afd3f8d187f4c0b575d89ff86985f334e89109b6283e6
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From a88575a1e6ff57417580b7cae8cecd3e4f198a84 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 19 Sep 2024 01:00:52 -0300
Subject: [PATCH 24/24] New package: xdg-desktop-portal-xapp-1.0.9
---
srcpkgs/xdg-desktop-portal-xapp/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-xapp/template
diff --git a/srcpkgs/xdg-desktop-portal-xapp/template b/srcpkgs/xdg-desktop-portal-xapp/template
new file mode 100644
index 00000000000000..4cfa47a2069a28
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-xapp/template
@@ -0,0 +1,17 @@
+# Template file for 'xdg-desktop-portal-xapp'
+pkgname=xdg-desktop-portal-xapp
+version=1.0.9
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
+hostmakedepends="glib-devel gettext pkg-config xdg-desktop-portal"
+makedepends="xapps-devel flatpak-devel gtk+3-devel libglib-devel
+ xdg-desktop-portal"
+depends="xdg-desktop-portal xapps"
+short_desc="Cross-desktop libraries and common resources from Linux Mint"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/linuxmint/xdg-desktop-portal-xapp"
+distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=4d767025ba3389ce25b4f3ab0ac3447fac4ff05a5f00bf72fe95384105d9afe2
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-09-19 4:01 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
2024-09-15 10:59 ` Haagen-Dazs
2024-09-15 12:09 ` toadwastoast
2024-09-15 12:22 ` [PR PATCH] [Updated] " toadwastoast
2024-09-16 0:43 ` toadwastoast
2024-09-16 0:45 ` toadwastoast
2024-09-16 1:44 ` classabbyamp
2024-09-16 5:02 ` [PR PATCH] [Updated] " toadwastoast
2024-09-16 5:55 ` toadwastoast
2024-09-16 6:28 ` toadwastoast
2024-09-16 6:49 ` toadwastoast
2024-09-19 2:18 ` toadwastoast
2024-09-19 3:54 ` toadwastoast
2024-09-19 4:01 ` toadwastoast
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).