* [PR PATCH] cinnamon: update to 6.2
@ 2024-09-14 19:41 toadwastoast
2024-09-15 10:59 ` Haagen-Dazs
` (33 more replies)
0 siblings, 34 replies; 35+ 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] 35+ 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
` (32 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (31 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (30 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (29 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (28 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (27 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (26 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (25 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (24 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (23 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (22 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
` (21 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ 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
2024-11-26 16:46 ` SpaceCheeseWizard
` (20 subsequent siblings)
33 siblings, 0 replies; 35+ 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] 35+ messages in thread
* Re: cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (12 preceding siblings ...)
2024-09-19 4:01 ` toadwastoast
@ 2024-11-26 16:46 ` SpaceCheeseWizard
2024-12-11 19:46 ` [PR REVIEW] " classabbyamp
` (19 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: SpaceCheeseWizard @ 2024-11-26 16:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by SpaceCheeseWizard on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2501380796
Comment:
I'm new to git, is there a way I can help this get merged?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (14 preceding siblings ...)
2024-12-11 19:46 ` [PR REVIEW] " classabbyamp
@ 2024-12-11 19:46 ` classabbyamp
2024-12-11 19:46 ` classabbyamp
` (17 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2024-12-11 19:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#discussion_r1880823192
Comment:
new packages shouldn't be orphaned
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (15 preceding siblings ...)
2024-12-11 19:46 ` classabbyamp
@ 2024-12-11 19:46 ` classabbyamp
2024-12-12 0:29 ` [PR PATCH] [Updated] " toadwastoast
` (16 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2024-12-11 19:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#discussion_r1880822318
Comment:
restore the version restrictions on the dependencies, this is to prevent broken partial upgrades
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR REVIEW] cinnamon: update to 6.2
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (13 preceding siblings ...)
2024-11-26 16:46 ` SpaceCheeseWizard
@ 2024-12-11 19:46 ` classabbyamp
2024-12-11 19:46 ` classabbyamp
` (18 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2024-12-11 19:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#discussion_r1880821497
Comment:
```suggestion
depends="libcinnamon-control-center>=${version}_${revision} cinnamon-settings-daemon
```
that shouldn't have been removed, probably
^ permalink raw reply [flat|nested] 35+ 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
` (16 preceding siblings ...)
2024-12-11 19:46 ` classabbyamp
@ 2024-12-12 0:29 ` toadwastoast
2024-12-12 0:34 ` cinnamon: update to 6.4 toadwastoast
` (15 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 0:29 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: 43672 bytes --]
From 01ce76cfe13fee1339ad0ab8e22531d9c93e1a52 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:00:16 -0300
Subject: [PATCH 01/25] New package: python3-libsass-0.23.0
---
srcpkgs/python3-libsass/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-libsass/template
diff --git a/srcpkgs/python3-libsass/template b/srcpkgs/python3-libsass/template
new file mode 100644
index 00000000000000..00f4427f0f83ce
--- /dev/null
+++ b/srcpkgs/python3-libsass/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-libsass'
+pkgname=python3-libsass
+version=0.23.0
+revision=1
+build_style=python3-pep517
+#configure_args="SYSTEM_SASS="true""
+hostmakedepends="python3-wheel"
+makedepends="python3-devel libsass-devel"
+depends=""
+checkdepends="python3-pytest python3-Werkzeug"
+short_desc="Sass/SCSS for Python"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="MIT"
+homepage="https://sass.github.io/libsass-python"
+distfiles="https://github.com/sass/libsass-python/archive/${version}/py3-libsass-${version}.tar.gz"
+checksum=4bff7819756f52f6e4592f03f205104d1ca431088d9452aed5042f89a36f9873
+
+pre_build() {
+ export SYSTEM_SASS="true"
+}
From 6d2016878c3e0032e1b2e1aa392820cd3a37c9c8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:03:32 -0300
Subject: [PATCH 02/25] cinnamon: update to 6.4.2
---
srcpkgs/cinnamon/template | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..37dd0dd536b46e 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,31 +1,32 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.4.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
- gtk-doc"
+ gtk-doc python3-libsass"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel
+ gcr-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"
+ cinnamon-translations>=${version%.*} nemo>=${version%.*} 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=56e2c5f2449f3fc6b0f378f2da98efdfe7a721b84e3c001fb16a14d85b399a97
python_version=3
pycompile_dirs="
From ff6cdb36cf45f019f1300dc4b0ff9da014c82669 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:04:40 -0300
Subject: [PATCH 03/25] cinnamon-control-center: update to 6.4.1
---
.../cinnamon-control-center/patches/musl.diff | 19 -------------------
srcpkgs/cinnamon-control-center/template | 13 +++++++------
2 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/musl.diff
diff --git a/srcpkgs/cinnamon-control-center/patches/musl.diff b/srcpkgs/cinnamon-control-center/patches/musl.diff
deleted file mode 100644
index 860b0c4195e59a..00000000000000
--- a/srcpkgs/cinnamon-control-center/patches/musl.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Include networkmanager header after the musl ones, to avoid conflicts.
-
-diff --git a/panels/network/wireless-security/utils.c b/panels/network/wireless-security/utils.c
-index b74424d..2bb543f 100644
---- a/panels/network/wireless-security/utils.c
-+++ b/panels/network/wireless-security/utils.c
-@@ -20,11 +20,10 @@
- * Copyright 2007 - 2015 Red Hat, Inc.
- */
-
--#include "nm-default.h"
--
- #include <string.h>
- #include <netinet/ether.h>
-
-+#include "nm-default.h"
- #include "utils.h"
-
- /**
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..1faeb49aef0711 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.4.1
+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>=${version}_${revision}
+ 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=a68886524ce3f18952bc79d28061b71fc48a24e5dac5175874e3d390425bad92
# requires X and wacom devices?
make_check=no
From 2d9b45386b5612faa758315571ddd915d8cc322f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:05:09 -0300
Subject: [PATCH 04/25] cinnamon-desktop: update to 6.4.1
---
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..2088bc644e8c35 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.4.1
+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=0e9af48b97910302a1130424a05c63b2e7aacb4ce6ae7a1d53c71bcd157a3a8f
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From a865392be6d3fad8e6d4042d183922278e576a44 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:05:31 -0300
Subject: [PATCH 05/25] cinnamon-menus: update to 6.4.0
---
srcpkgs/cinnamon-menus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index e923c3cc863240..d3588e51ec02d5 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.4.0
revision=1
build_style=meson
build_helper=gir
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-menus"
distfiles="https://github.com/linuxmint/cinnamon-menus/archive/${version}.tar.gz"
-checksum=99c4336ea5d87f01cbf19b40c8200dde933aebd73fe87b83cc11361bea5b6626
+checksum=9cad5ac61900492f66c91810fd13bed9dc37b49ec0b9bbc0bbe9ebf48ee45452
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From abb1d3660ff332bafc64c2128fac8337b133913b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:06:06 -0300
Subject: [PATCH 06/25] cinnamon-screensaver: update to 6.4.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..d8572427e9aeaa 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.4.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=e985b68981482b7ead6aef55988937958539221d752f9a4feb7ced9ac32fe422
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From fe884ee3d636a8798e1b9c8b3a477bad0d7cf042 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:06:26 -0300
Subject: [PATCH 07/25] cinnamon-session: update to 6.4.0
---
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..c1e6f8ee252d19 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.4.0
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=464075d920df360b5ad94f72395a09b5fbf8b14f0190406ec76055a17659e243
From 5ffe63bb98badfa87aa77f080e890dd7037dd539 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:06:51 -0300
Subject: [PATCH 08/25] cinnamon-settings-daemon: update to 6.4.2
---
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..11e5941f762555 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.4.2
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=15e15d7e87d9c51271c0b042ed4177efa12622cf51bf1f2fa68e374757735512
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 3353df4d823d9f6c73df45e1603527ee6426d6be Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:07:46 -0300
Subject: [PATCH 09/25] cinnamon-translations: update to 6.4.1
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 794d42bb0dcd8f..9cc599923b1cb4 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.4.1
revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-translations/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}/cinnamon-translations-${version}.tar.gz"
-checksum=3c4454696bd5d57d96dbbde10232c72b575d6e6e5364c657836967aa783ab0c8
+checksum=ef2b9e78a4d9bdb0e4374e8d387405f2de16471526dc36aa9b32f9718fa586e3
do_install() {
vmkdir usr
From f536a090944a9bf7b3e4a2d5eef5c22c3e508c9e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:08:10 -0300
Subject: [PATCH 10/25] cjs: update to 6.4.0
---
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
srcpkgs/cjs/template | 6 +--
2 files changed, 3 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.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/template b/srcpkgs/cjs/template
index 319bae6b2b1302..eb6dc3f4223558 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.4.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=55d730fdb331a9778a0d569e45c968ac68c8f218876e5d2d475cb5af21b6935a
make_check_pre="xvfb-run"
pre_configure() {
From 29ab2c903dbbf468298c1d0a940892bbb66b5e90 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:08:28 -0300
Subject: [PATCH 11/25] muffin: update to 6.4.1
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..3977bf24273d31 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.4.1
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=3c4ef0139d9bbaf7ac17f39dd06b6397c175614a2eb6c55d463024a457293808
post_install() {
vmkdir usr/share/gir-1.0
From 589c5ac0b9fbf34c6383a7a2c753d38a1817e374 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:08:44 -0300
Subject: [PATCH 12/25] nemo: update to 6.4.3
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..c0f6bf1b699a50 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.4.3
+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=dc4b2ed52fd69551a53fd95a008a738fc9c904fc79d41c8e39ec49bfd739094e
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 79ee07bd77f881a1e0c305371d5221a0e7465cbd Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:17:51 -0300
Subject: [PATCH 13/25] nemo-audio-tab: update to 6.4.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..c6019b6377e2bc 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 047f9b1348a9695f76de719f1f7d9cad16de834a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:18:05 -0300
Subject: [PATCH 14/25] nemo-compare: update to 6.4.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..121e5c61412fad 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 1cf6096ad8f2b1564f78c6fbd36bb5e10d4c327e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:18:27 -0300
Subject: [PATCH 15/25] nemo-emblems: update to 6.4.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..af33aa52fb574c 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 9903e7b06fc081950268ebd36d5783ee1ea1c79a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:18:40 -0300
Subject: [PATCH 16/25] nemo-extensions: update to 6.4.0
---
srcpkgs/nemo-extensions/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index 401c7e515c5d32..317b25a95c6508 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.4.0
revision=1
build_style=meta
depends="
From 97f43dc13619bdcdd42eaab3af17bd82e1a88cc4 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:18:52 -0300
Subject: [PATCH 17/25] nemo-fileroller: update to 6.4.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..ce4acefb4b0acf 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From efe66bf2004336e5e29c35b30fa2528fa52d2151 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:19:07 -0300
Subject: [PATCH 18/25] nemo-image-converter: update to 6.4.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..9acebeaa5829b4 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From c8794b62b4fa8940305b4baad152120532a827b5 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:19:22 -0300
Subject: [PATCH 19/25] nemo-preview: update to 6.4.0
---
srcpkgs/nemo-preview/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..aa9873172db1fa 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,11 +1,11 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.4.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
build_helper=gir
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel cjs"
makedepends="nemo-devel libmusicbrainz5-devel cjs-devel clutter-devel
clutter-gtk-devel clutter-gst3-devel libxreader-devel
gtksourceview4-devel libwebkit2gtk41-devel"
@@ -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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 831e3b39b850692ced736c63758d80efe4992284 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:19:31 -0300
Subject: [PATCH 20/25] nemo-python: update to 6.4.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..937ffe08441ecd 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 411d303c785aa010d6e313ad4d77be40315df89a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:19:47 -0300
Subject: [PATCH 21/25] nemo-terminal: update to 6.4.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..b4fe5b01fd7fa6 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 74f3ab4ef6d55872a28c5df555814a8747ee296e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:25:14 -0300
Subject: [PATCH 22/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 2e0249ac5a222d9cd6d3f59f0a2e24ed98ef1d7e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:25:37 -0300
Subject: [PATCH 23/25] xapps: update to 2.8.7
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..3c741601603f25 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.7
+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=95ad692de2f53bd12b8fd5fb7786ba197f830f982a73903c342c3a64bc6fb604
xapps-devel_package() {
short_desc+=" - development files"
From 0346fbb121b87703bbbad1fcaf53cda01450bfa1 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:25:55 -0300
Subject: [PATCH 24/25] xreader: update to 4.2.3
---
...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..07e921c58b32be 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.3
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=57d8c20eddcb90ba768f386c444519b5f330c1aacfcaa3deb33db1ad1d7bbd6d
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From 8856f5a34e7a67c5d03b2b09e619427c8ca9c223 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Wed, 11 Dec 2024 21:26:28 -0300
Subject: [PATCH 25/25] New package: xdg-desktop-portal-xapp-1.1.0
---
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..7fd818534b8d76
--- /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.1.0
+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=2d0746ad1021d8848fb60f1444d09c81c5a4da90df334b44418d6533e6811c13
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (17 preceding siblings ...)
2024-12-12 0:29 ` [PR PATCH] [Updated] " toadwastoast
@ 2024-12-12 0:34 ` toadwastoast
2024-12-12 0:55 ` toadwastoast
` (14 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 0:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2537488498
Comment:
Should be good now.
Had to package `python3-libsass` since it's now necessary for cinnamon.
Also, is it an issue if the lint fails for `nemo-extensions`?
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (18 preceding siblings ...)
2024-12-12 0:34 ` cinnamon: update to 6.4 toadwastoast
@ 2024-12-12 0:55 ` toadwastoast
2024-12-12 1:00 ` toadwastoast
` (13 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2537488498
Comment:
Should be good now.
Had to package `python3-libsass` since it's now necessary for cinnamon.
Also, is it an issue if the lint fails for `nemo-extensions`?
Edit: seems like there's an issue with `python3-libsass` when running tests on the CI, though for me it builds just fine even when crossbuilding, what should I do in this case?
And yeah I noticed my typo on `cinnamon` I'll fix it later.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (19 preceding siblings ...)
2024-12-12 0:55 ` toadwastoast
@ 2024-12-12 1:00 ` toadwastoast
2024-12-12 1:27 ` leeminusminus
` (12 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 1:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2537488498
Comment:
Should be good now.
Had to package `python3-libsass` since it's now necessary for cinnamon.
Also, is it an issue if the lint fails for `nemo-extensions`?
Edit: seems like there's an issue with `python3-libsass` when running tests on the CI, though for me it builds just fine even when crossbuilding, what should I do in this case? I'll fix the lint issues too.
And yeah I noticed my typo on `cinnamon` I'll fix it later.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (20 preceding siblings ...)
2024-12-12 1:00 ` toadwastoast
@ 2024-12-12 1:27 ` leeminusminus
2024-12-12 13:10 ` [PR PATCH] [Updated] " toadwastoast
` (11 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: leeminusminus @ 2024-12-12 1:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by leeminusminus on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2537544764
Comment:
I'm glad this is finally getting fixed.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (21 preceding siblings ...)
2024-12-12 1:27 ` leeminusminus
@ 2024-12-12 13:10 ` toadwastoast
2024-12-12 13:44 ` toadwastoast
` (10 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 13:10 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.4
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: 43534 bytes --]
From a16f0719ef2f893a5ed5c206de11466d209bd71f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:42:20 -0300
Subject: [PATCH 01/25] New package: python3-libsass-0.23.0
---
srcpkgs/python3-libsass/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-libsass/template
diff --git a/srcpkgs/python3-libsass/template b/srcpkgs/python3-libsass/template
new file mode 100644
index 00000000000000..ece99ed7223ace
--- /dev/null
+++ b/srcpkgs/python3-libsass/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-libsass'
+pkgname=python3-libsass
+version=0.23.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+makedepends="python3-devel libsass-devel"
+short_desc="Sass/SCSS for Python"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="MIT"
+homepage="https://sass.github.io/libsass-python"
+distfiles="https://github.com/sass/libsass-python/archive/${version}/py3-libsass-${version}.tar.gz"
+checksum=4bff7819756f52f6e4592f03f205104d1ca431088d9452aed5042f89a36f9873
+
+pre_build() {
+ export SYSTEM_SASS="true"
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 7eda79c1f5449d697891407e9de5462731357be7 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:43:49 -0300
Subject: [PATCH 02/25] cinnamon: update to 6.4.2
---
srcpkgs/cinnamon/template | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..b85de3e097f40d 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,31 +1,32 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.4.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
- gtk-doc"
+ gtk-doc python3-libsass"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel
+ gcr-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"
+ 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=56e2c5f2449f3fc6b0f378f2da98efdfe7a721b84e3c001fb16a14d85b399a97
python_version=3
pycompile_dirs="
From 0a0fbe1d87e3b3bbaec2d30176500191b328b6af Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:44:45 -0300
Subject: [PATCH 03/25] cinnamon-control-center: update to 6.4.1
---
.../cinnamon-control-center/patches/musl.diff | 19 -------------------
srcpkgs/cinnamon-control-center/template | 13 +++++++------
2 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/musl.diff
diff --git a/srcpkgs/cinnamon-control-center/patches/musl.diff b/srcpkgs/cinnamon-control-center/patches/musl.diff
deleted file mode 100644
index 860b0c4195e59a..00000000000000
--- a/srcpkgs/cinnamon-control-center/patches/musl.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Include networkmanager header after the musl ones, to avoid conflicts.
-
-diff --git a/panels/network/wireless-security/utils.c b/panels/network/wireless-security/utils.c
-index b74424d..2bb543f 100644
---- a/panels/network/wireless-security/utils.c
-+++ b/panels/network/wireless-security/utils.c
-@@ -20,11 +20,10 @@
- * Copyright 2007 - 2015 Red Hat, Inc.
- */
-
--#include "nm-default.h"
--
- #include <string.h>
- #include <netinet/ether.h>
-
-+#include "nm-default.h"
- #include "utils.h"
-
- /**
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..1faeb49aef0711 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.4.1
+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>=${version}_${revision}
+ 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=a68886524ce3f18952bc79d28061b71fc48a24e5dac5175874e3d390425bad92
# requires X and wacom devices?
make_check=no
From 2d9a76d8a9e39247eedfbfe58adb8850d930c35d Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:45:36 -0300
Subject: [PATCH 04/25] cinnamon-desktop: update to 6.4.1
---
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..2088bc644e8c35 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.4.1
+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=0e9af48b97910302a1130424a05c63b2e7aacb4ce6ae7a1d53c71bcd157a3a8f
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From bafa59a11dd6be072e9c148413b3f86424119e0a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:56:13 -0300
Subject: [PATCH 05/25] cinnamon-menus: update to 6.4.0
---
srcpkgs/cinnamon-menus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index e923c3cc863240..d3588e51ec02d5 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.4.0
revision=1
build_style=meson
build_helper=gir
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-menus"
distfiles="https://github.com/linuxmint/cinnamon-menus/archive/${version}.tar.gz"
-checksum=99c4336ea5d87f01cbf19b40c8200dde933aebd73fe87b83cc11361bea5b6626
+checksum=9cad5ac61900492f66c91810fd13bed9dc37b49ec0b9bbc0bbe9ebf48ee45452
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 8149bffed5606bd8f6d4eea2ddfd399b74ce95fe Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:59:13 -0300
Subject: [PATCH 06/25] cinnamon-screensaver: update to 6.4.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..d8572427e9aeaa 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.4.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=e985b68981482b7ead6aef55988937958539221d752f9a4feb7ced9ac32fe422
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 584211b35ebc128f7ec68f4868d6646c39e28e91 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:59:43 -0300
Subject: [PATCH 07/25] cinnamon-session: update to 6.4.0
---
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..c1e6f8ee252d19 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.4.0
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=464075d920df360b5ad94f72395a09b5fbf8b14f0190406ec76055a17659e243
From 67ada69008c3214f1358e03d5d0f85b6848799e4 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:00:34 -0300
Subject: [PATCH 08/25] cinnamon-settings-daemon: update to 6.4.2
---
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..11e5941f762555 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.4.2
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=15e15d7e87d9c51271c0b042ed4177efa12622cf51bf1f2fa68e374757735512
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 74ac44ec1784be644752a3825f03e37299f023eb Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:00:48 -0300
Subject: [PATCH 09/25] cinnamon-translations: update to 6.4.1
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 794d42bb0dcd8f..9cc599923b1cb4 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.4.1
revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-translations/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}/cinnamon-translations-${version}.tar.gz"
-checksum=3c4454696bd5d57d96dbbde10232c72b575d6e6e5364c657836967aa783ab0c8
+checksum=ef2b9e78a4d9bdb0e4374e8d387405f2de16471526dc36aa9b32f9718fa586e3
do_install() {
vmkdir usr
From c45c99ec4bfe0d977554f5c45b20aa400447a8f4 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:01:38 -0300
Subject: [PATCH 10/25] cjs: update to 6.4.0
---
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
srcpkgs/cjs/template | 6 +--
2 files changed, 3 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.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/template b/srcpkgs/cjs/template
index 319bae6b2b1302..eb6dc3f4223558 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.4.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=55d730fdb331a9778a0d569e45c968ac68c8f218876e5d2d475cb5af21b6935a
make_check_pre="xvfb-run"
pre_configure() {
From 8d7dc1d8684f9e037e5bc01567a09fd13d919f48 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:01:55 -0300
Subject: [PATCH 11/25] muffin: update to 6.4.1
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..3977bf24273d31 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.4.1
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=3c4ef0139d9bbaf7ac17f39dd06b6397c175614a2eb6c55d463024a457293808
post_install() {
vmkdir usr/share/gir-1.0
From bff4cc0b685e3375244e8d00f494dbd9f51c2d7a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:02:25 -0300
Subject: [PATCH 12/25] nemo: update to 6.4.3
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..c0f6bf1b699a50 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.4.3
+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=dc4b2ed52fd69551a53fd95a008a738fc9c904fc79d41c8e39ec49bfd739094e
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From 87e04632c223edb8e63ae0723a9ca7bc90e6816e Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:02:43 -0300
Subject: [PATCH 13/25] nemo-audio-tab: update to 6.4.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..c6019b6377e2bc 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 13dafacb5a6f06e98bbf8eeecd68284fb802c508 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:03:00 -0300
Subject: [PATCH 14/25] nemo-compare: update to 6.4.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..121e5c61412fad 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 5a592ebdbafd1e547015344eb9701cea06af1c62 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:03:12 -0300
Subject: [PATCH 15/25] nemo-emblems: update to 6.4.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..af33aa52fb574c 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 40b401794d3d1f0d152b1f75c5361dffc73ecd1a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:03:23 -0300
Subject: [PATCH 16/25] nemo-extensions: update to 6.4.0
---
srcpkgs/nemo-extensions/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index 401c7e515c5d32..317b25a95c6508 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.4.0
revision=1
build_style=meta
depends="
From 61b5dfa26a5a6304ed329c6b51bd25c994c6fd87 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:03:38 -0300
Subject: [PATCH 17/25] nemo-fileroller: update to 6.4.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..ce4acefb4b0acf 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 407bb527e5229f0977f60ab2998100379cd2ee1a Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:04:07 -0300
Subject: [PATCH 18/25] nemo-image-converter: update to 6.4.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..9acebeaa5829b4 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 5b1d11107fbebffe4cf63f58d33b35cabbd36bb4 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:04:17 -0300
Subject: [PATCH 19/25] nemo-preview: update to 6.4.0
---
srcpkgs/nemo-preview/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..aa9873172db1fa 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,11 +1,11 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.4.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
build_helper=gir
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel cjs"
makedepends="nemo-devel libmusicbrainz5-devel cjs-devel clutter-devel
clutter-gtk-devel clutter-gst3-devel libxreader-devel
gtksourceview4-devel libwebkit2gtk41-devel"
@@ -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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 73667047d3aaa0930419f80486cf46c8cfe430a4 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:04:27 -0300
Subject: [PATCH 20/25] nemo-python: update to 6.4.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..937ffe08441ecd 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 53b0959992a0dfd5b36817f2cffbfef5b664dbca Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:04:37 -0300
Subject: [PATCH 21/25] nemo-terminal: update to 6.4.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..b4fe5b01fd7fa6 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 0283a097b252e616e14a201b67e0a372bfd8b171 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:05:14 -0300
Subject: [PATCH 22/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 3fb46d1768e6ab8c8140af7a43c28e15f4e9e0ef Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:05:26 -0300
Subject: [PATCH 23/25] xapps: update to 2.8.7
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..3c741601603f25 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.7
+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=95ad692de2f53bd12b8fd5fb7786ba197f830f982a73903c342c3a64bc6fb604
xapps-devel_package() {
short_desc+=" - development files"
From 76883282427e509de1429b2fdaad25563907347b Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:05:45 -0300
Subject: [PATCH 24/25] xreader: update to 4.2.3
---
...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..07e921c58b32be 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.3
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=57d8c20eddcb90ba768f386c444519b5f330c1aacfcaa3deb33db1ad1d7bbd6d
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From 78d3facf00138f61e3fc8309d7a32d8b58421297 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:06:39 -0300
Subject: [PATCH 25/25] New package: xdg-desktop-portal-xapp-1.1.0
---
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..7fd818534b8d76
--- /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.1.0
+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=2d0746ad1021d8848fb60f1444d09c81c5a4da90df334b44418d6533e6811c13
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Updated] cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (22 preceding siblings ...)
2024-12-12 13:10 ` [PR PATCH] [Updated] " toadwastoast
@ 2024-12-12 13:44 ` toadwastoast
2024-12-12 13:48 ` toadwastoast
` (9 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 13:44 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.4
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: 43614 bytes --]
From a16f0719ef2f893a5ed5c206de11466d209bd71f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 09:42:20 -0300
Subject: [PATCH 01/25] New package: python3-libsass-0.23.0
---
srcpkgs/python3-libsass/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-libsass/template
diff --git a/srcpkgs/python3-libsass/template b/srcpkgs/python3-libsass/template
new file mode 100644
index 00000000000000..ece99ed7223ace
--- /dev/null
+++ b/srcpkgs/python3-libsass/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-libsass'
+pkgname=python3-libsass
+version=0.23.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+makedepends="python3-devel libsass-devel"
+short_desc="Sass/SCSS for Python"
+maintainer="toadwastoast <toadwastoast@proton.me>"
+license="MIT"
+homepage="https://sass.github.io/libsass-python"
+distfiles="https://github.com/sass/libsass-python/archive/${version}/py3-libsass-${version}.tar.gz"
+checksum=4bff7819756f52f6e4592f03f205104d1ca431088d9452aed5042f89a36f9873
+
+pre_build() {
+ export SYSTEM_SASS="true"
+}
+
+post_install() {
+ vlicense LICENSE
+}
From d5b9d400b1bc53755a9507c5e7bfc2aa2cdd7786 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:25:03 -0300
Subject: [PATCH 02/25] cinnamon: update to 6.4.2
---
srcpkgs/cinnamon/template | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index d4184be444372c..e9c571d33363bf 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,31 +1,32 @@
# Template file for 'cinnamon'
pkgname=cinnamon
-version=5.8.4
-revision=2
+version=6.4.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto
- gtk-doc"
+ gtk-doc python3-libsass"
makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
- NetworkManager-devel libcroco-devel cinnamon-desktop-devel"
+ NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel
+ gcr-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"
+ cinnamon-translations>=${version%.*} nemo>=${version%.*} gnome-themes-extra
+ 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=56e2c5f2449f3fc6b0f378f2da98efdfe7a721b84e3c001fb16a14d85b399a97
python_version=3
pycompile_dirs="
From be851ccb86e74ec3afa605a323c6b79e4a18a675 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:25:19 -0300
Subject: [PATCH 03/25] cinnamon-control-center: update to 6.4.1
---
.../cinnamon-control-center/patches/musl.diff | 19 -------------------
srcpkgs/cinnamon-control-center/template | 13 +++++++------
2 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/cinnamon-control-center/patches/musl.diff
diff --git a/srcpkgs/cinnamon-control-center/patches/musl.diff b/srcpkgs/cinnamon-control-center/patches/musl.diff
deleted file mode 100644
index 860b0c4195e59a..00000000000000
--- a/srcpkgs/cinnamon-control-center/patches/musl.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Include networkmanager header after the musl ones, to avoid conflicts.
-
-diff --git a/panels/network/wireless-security/utils.c b/panels/network/wireless-security/utils.c
-index b74424d..2bb543f 100644
---- a/panels/network/wireless-security/utils.c
-+++ b/panels/network/wireless-security/utils.c
-@@ -20,11 +20,10 @@
- * Copyright 2007 - 2015 Red Hat, Inc.
- */
-
--#include "nm-default.h"
--
- #include <string.h>
- #include <netinet/ether.h>
-
-+#include "nm-default.h"
- #include "utils.h"
-
- /**
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index ead98639c4accc..1faeb49aef0711 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.4.1
+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>=${version}_${revision}
+ 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=a68886524ce3f18952bc79d28061b71fc48a24e5dac5175874e3d390425bad92
# requires X and wacom devices?
make_check=no
From 017b75e41e11b85990e62b2ec16b258e4b9aac54 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:25:32 -0300
Subject: [PATCH 04/25] cinnamon-desktop: update to 6.4.1
---
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..2088bc644e8c35 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.4.1
+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=0e9af48b97910302a1130424a05c63b2e7aacb4ce6ae7a1d53c71bcd157a3a8f
cinnamon-desktop-devel_package() {
depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"
From ac2678901cf3f04724c1131798745b396ff4c6a8 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:25:43 -0300
Subject: [PATCH 05/25] cinnamon-menus: update to 6.4.0
---
srcpkgs/cinnamon-menus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index e923c3cc863240..d3588e51ec02d5 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.4.0
revision=1
build_style=meson
build_helper=gir
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-menus"
distfiles="https://github.com/linuxmint/cinnamon-menus/archive/${version}.tar.gz"
-checksum=99c4336ea5d87f01cbf19b40c8200dde933aebd73fe87b83cc11361bea5b6626
+checksum=9cad5ac61900492f66c91810fd13bed9dc37b49ec0b9bbc0bbe9ebf48ee45452
cinnamon-menus-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 0442fffe330078e76f298d8f7d8ee6a7766c3314 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:25:56 -0300
Subject: [PATCH 06/25] cinnamon-screensaver: update to 6.4.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..d8572427e9aeaa 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.4.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=e985b68981482b7ead6aef55988937958539221d752f9a4feb7ced9ac32fe422
python_version=3
pycompile_dirs="/usr/share/cinnamon-screensaver"
From 642d84d0070ae86ff674eec83223aeb459b444fe Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:26:09 -0300
Subject: [PATCH 07/25] cinnamon-session: update to 6.4.0
---
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..c1e6f8ee252d19 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.4.0
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=464075d920df360b5ad94f72395a09b5fbf8b14f0190406ec76055a17659e243
From e61f246ac7e0fb4dfc3c44b9c0f1a7a93cb80ca3 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:26:37 -0300
Subject: [PATCH 08/25] cinnamon-settings-daemon: update to 6.4.2
---
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..11e5941f762555 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.4.2
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=15e15d7e87d9c51271c0b042ed4177efa12622cf51bf1f2fa68e374757735512
cinnamon-settings-daemon-devel_package() {
short_desc+=" - development files"
From 44ebb65452b201d1fe7485c793b998fab47cd7c1 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:26:51 -0300
Subject: [PATCH 09/25] cinnamon-translations: update to 6.4.1
---
srcpkgs/cinnamon-translations/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 794d42bb0dcd8f..9cc599923b1cb4 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.4.1
revision=1
build_style=gnu-makefile
hostmakedepends="gettext"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/linuxmint/cinnamon-translations/"
distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}/cinnamon-translations-${version}.tar.gz"
-checksum=3c4454696bd5d57d96dbbde10232c72b575d6e6e5364c657836967aa783ab0c8
+checksum=ef2b9e78a4d9bdb0e4374e8d387405f2de16471526dc36aa9b32f9718fa586e3
do_install() {
vmkdir usr
From e7644c3506cde727c1dc3db1c457887b36afee7f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:27:22 -0300
Subject: [PATCH 10/25] cjs: update to 6.4.0
---
...0aae4eff422c3acd275c0108e970eafcdcb9.patch | 46 -------------------
srcpkgs/cjs/template | 6 +--
2 files changed, 3 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/cjs/patches/fb480aae4eff422c3acd275c0108e970eafcdcb9.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/template b/srcpkgs/cjs/template
index 319bae6b2b1302..eb6dc3f4223558 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.4.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=55d730fdb331a9778a0d569e45c968ac68c8f218876e5d2d475cb5af21b6935a
make_check_pre="xvfb-run"
pre_configure() {
From f7d7bd4ef7c8ef4b6211aecc938a9d64277c781c Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:27:34 -0300
Subject: [PATCH 11/25] muffin: update to 6.4.1
---
srcpkgs/muffin/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index eb9f61b98bdd54..3977bf24273d31 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.4.1
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=3c4ef0139d9bbaf7ac17f39dd06b6397c175614a2eb6c55d463024a457293808
post_install() {
vmkdir usr/share/gir-1.0
From abea0061d6b114699575dcba1d46175f06327cb0 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:27:43 -0300
Subject: [PATCH 12/25] nemo: update to 6.4.3
---
srcpkgs/nemo/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index af04526a6ac826..c0f6bf1b699a50 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.4.3
+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=dc4b2ed52fd69551a53fd95a008a738fc9c904fc79d41c8e39ec49bfd739094e
python_version=3
# Requires xvfb-run and dbus-run-session
make_check=no # can't be run inside chroot due to fusermount3
From ec0dd070404001e224f202ebf328498fa3d164b7 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:27:57 -0300
Subject: [PATCH 13/25] nemo-audio-tab: update to 6.4.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..c6019b6377e2bc 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 095ab905ef63110c0a4a62fdf385f536edcceffa Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:28:07 -0300
Subject: [PATCH 14/25] nemo-compare: update to 6.4.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..121e5c61412fad 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From c7f6a2aca42782b01e6cb4f2117654a6f7eb9a35 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:29:01 -0300
Subject: [PATCH 15/25] nemo-emblems: update to 6.4.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..af33aa52fb574c 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From bc0d4c0fba7bb795c7b06c70cad527457a791698 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:29:16 -0300
Subject: [PATCH 16/25] nemo-extensions: update to 6.4.0
---
srcpkgs/nemo-extensions/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nemo-extensions/template b/srcpkgs/nemo-extensions/template
index 401c7e515c5d32..317b25a95c6508 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.4.0
revision=1
build_style=meta
depends="
From 1f7588d81ed6ace5a4160ba58398c7f5cfcfd490 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:29:28 -0300
Subject: [PATCH 17/25] nemo-fileroller: update to 6.4.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..ce4acefb4b0acf 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 3cbeedb69db9d30bda5a062aba91151004221d35 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:29:41 -0300
Subject: [PATCH 18/25] nemo-image-converter: update to 6.4.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..9acebeaa5829b4 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From a8cad39b912c4b3fe2f6b78223ed971b3a3a3457 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:29:58 -0300
Subject: [PATCH 19/25] nemo-preview: update to 6.4.0
---
srcpkgs/nemo-preview/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index c5591bbca361ee..aa9873172db1fa 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,11 +1,11 @@
# Template file for 'nemo-preview'
pkgname=nemo-preview
-version=5.8.0
+version=6.4.0
revision=1
build_wrksrc=nemo-preview
build_style=meson
build_helper=gir
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel cjs"
makedepends="nemo-devel libmusicbrainz5-devel cjs-devel clutter-devel
clutter-gtk-devel clutter-gst3-devel libxreader-devel
gtksourceview4-devel libwebkit2gtk41-devel"
@@ -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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 64e2587d8a7548f7ce846806c71d2faed0934e84 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:30:08 -0300
Subject: [PATCH 20/25] nemo-python: update to 6.4.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..937ffe08441ecd 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 24e2127d05c79511ba255d66ec2605a11d9d100c Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:30:20 -0300
Subject: [PATCH 21/25] nemo-terminal: update to 6.4.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..b4fe5b01fd7fa6 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.4.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=55e8fb43edde09c3ceba197a4359c1e79b1f0ea7007543d26f32532957aabd49
From 56c184429c3b7dfdd21bb3f0cb82231724895897 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:30:44 -0300
Subject: [PATCH 22/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 2882a963c5099716ed35e3f5811309978b0a3287 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:30:55 -0300
Subject: [PATCH 23/25] xapps: update to 2.8.7
---
srcpkgs/xapps/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index 8c75d7f6eb2aa5..3c741601603f25 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.7
+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=95ad692de2f53bd12b8fd5fb7786ba197f830f982a73903c342c3a64bc6fb604
xapps-devel_package() {
short_desc+=" - development files"
From e5c3347007c830c0e338df91d97f9d85171e6dc3 Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:31:07 -0300
Subject: [PATCH 24/25] xreader: update to 4.2.3
---
...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..07e921c58b32be 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.3
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=57d8c20eddcb90ba768f386c444519b5f330c1aacfcaa3deb33db1ad1d7bbd6d
# XX dogtail is needed for testing (not in repo)
# XX tests need xorg running
make_check=no
From 0f7b4e5cb09aecd4172464bb3b974c1d21d1132f Mon Sep 17 00:00:00 2001
From: toadwastoast <toadwastoast@proton.me>
Date: Thu, 12 Dec 2024 10:31:24 -0300
Subject: [PATCH 25/25] New package: xdg-desktop-portal-xapp-1.1.0
---
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..7fd818534b8d76
--- /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.1.0
+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=2d0746ad1021d8848fb60f1444d09c81c5a4da90df334b44418d6533e6811c13
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (23 preceding siblings ...)
2024-12-12 13:44 ` toadwastoast
@ 2024-12-12 13:48 ` toadwastoast
2024-12-12 13:50 ` toadwastoast
` (8 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 660 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2537488498
Comment:
Should be good now.
Had to package `python3-libsass` since it's now necessary for cinnamon.
Also, is it an issue if the lint fails for `nemo-extensions`?
Edit: ~~seems like there's an issue with `python3-libsass` when running tests on the CI, though for me it builds just fine even when crossbuilding, what should I do in this case? I'll fix the lint issues too.~~
~~And yeah I noticed my typo on `cinnamon` I'll fix it later.~~
Edit: The glaring issues should be gone now, can ignore the edit now.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (24 preceding siblings ...)
2024-12-12 13:48 ` toadwastoast
@ 2024-12-12 13:50 ` toadwastoast
2024-12-12 23:12 ` [PR PATCH] [Merged]: " classabbyamp
` (7 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: toadwastoast @ 2024-12-12 13:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
New comment by toadwastoast on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2537488498
Comment:
Should be good now.
Had to package `python3-libsass` since it's now necessary for cinnamon.
Also, is it an issue if the lint fails for `nemo-extensions`?
Edit: seems like there's an issue with `python3-libsass` when running tests on the CI, though for me it builds just fine even when crossbuilding, what should I do in this case? I'll fix the lint issues too.
And yeah I noticed my typo on `cinnamon` I'll fix it later.
Edit 2: The glaring issues should be gone now, can ignore most of the comment now.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PR PATCH] [Merged]: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (25 preceding siblings ...)
2024-12-12 13:50 ` toadwastoast
@ 2024-12-12 23:12 ` classabbyamp
2024-12-12 23:12 ` leeminusminus
` (6 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2024-12-12 23:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]
There's a merged pull request on the void-packages repository
cinnamon: update to 6.4
https://github.com/void-linux/void-packages/pull/52221
Description:
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)
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (26 preceding siblings ...)
2024-12-12 23:12 ` [PR PATCH] [Merged]: " classabbyamp
@ 2024-12-12 23:12 ` leeminusminus
2024-12-13 20:46 ` tre-flip
` (5 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: leeminusminus @ 2024-12-12 23:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by leeminusminus on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2540193270
Comment:
LETS GOOOOOO
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (27 preceding siblings ...)
2024-12-12 23:12 ` leeminusminus
@ 2024-12-13 20:46 ` tre-flip
2024-12-13 20:46 ` tre-flip
` (4 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: tre-flip @ 2024-12-13 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New comment by tre-flip on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2542316445
Comment:
After an update, OSD and some dialogs display poorly. OSDs miss backgrounds and indicator bars, "logout", "shutdown" and other Cinnamon dialogs also miss backgrounds, and the buttons are much smaller.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (28 preceding siblings ...)
2024-12-13 20:46 ` tre-flip
@ 2024-12-13 20:46 ` tre-flip
2024-12-13 20:46 ` tre-flip
` (3 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: tre-flip @ 2024-12-13 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New comment by tre-flip on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2542316445
Comment:
After an update to 6.4.2 OSD and some dialogs display poorly. OSDs miss backgrounds and indicator bars, "logout", "shutdown" and other Cinnamon dialogs also miss backgrounds, and the buttons are much smaller.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (29 preceding siblings ...)
2024-12-13 20:46 ` tre-flip
@ 2024-12-13 20:46 ` tre-flip
2024-12-13 20:50 ` tre-flip
` (2 subsequent siblings)
33 siblings, 0 replies; 35+ messages in thread
From: tre-flip @ 2024-12-13 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by tre-flip on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2542316445
Comment:
After an update to 6.4.2 OSD and some dialogs display poorly. OSDs have no backgrounds and indicator bars, "logout", "shutdown" and other Cinnamon dialogs also have no backgrounds, and the buttons are much smaller.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (30 preceding siblings ...)
2024-12-13 20:46 ` tre-flip
@ 2024-12-13 20:50 ` tre-flip
2024-12-13 20:54 ` tre-flip
2024-12-13 20:59 ` classabbyamp
33 siblings, 0 replies; 35+ messages in thread
From: tre-flip @ 2024-12-13 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
New comment by tre-flip on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2542316445
Comment:
After an update to 6.4.2 OSD and some dialogs display poorly. OSDs have no backgrounds and indicator bars, "logout", "shutdown" and other Cinnamon dialogs also have no backgrounds, and the buttons are much smaller.
An example of an OSD without background and indicators is at the very bottom of the screen in the attached screenshot.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (31 preceding siblings ...)
2024-12-13 20:50 ` tre-flip
@ 2024-12-13 20:54 ` tre-flip
2024-12-13 20:59 ` classabbyamp
33 siblings, 0 replies; 35+ messages in thread
From: tre-flip @ 2024-12-13 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
New comment by tre-flip on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2542316445
Comment:
After an update to 6.4.2 OSD and some dialogs display poorly. OSDs have no backgrounds and indicator bars, "logout", "shutdown" and other Cinnamon dialogs also have no backgrounds, and the buttons are much smaller.
An example of an OSD without background and indicators is at the very bottom of the screen in the attached screenshot.
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: cinnamon: update to 6.4
2024-09-14 19:41 [PR PATCH] cinnamon: update to 6.2 toadwastoast
` (32 preceding siblings ...)
2024-12-13 20:54 ` tre-flip
@ 2024-12-13 20:59 ` classabbyamp
33 siblings, 0 replies; 35+ messages in thread
From: classabbyamp @ 2024-12-13 20:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52221#issuecomment-2542361818
Comment:
please make an issue instead of commenting on the closed PR
^ permalink raw reply [flat|nested] 35+ messages in thread
end of thread, other threads:[~2024-12-13 20:59 UTC | newest]
Thread overview: 35+ 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
2024-11-26 16:46 ` SpaceCheeseWizard
2024-12-11 19:46 ` [PR REVIEW] " classabbyamp
2024-12-11 19:46 ` classabbyamp
2024-12-11 19:46 ` classabbyamp
2024-12-12 0:29 ` [PR PATCH] [Updated] " toadwastoast
2024-12-12 0:34 ` cinnamon: update to 6.4 toadwastoast
2024-12-12 0:55 ` toadwastoast
2024-12-12 1:00 ` toadwastoast
2024-12-12 1:27 ` leeminusminus
2024-12-12 13:10 ` [PR PATCH] [Updated] " toadwastoast
2024-12-12 13:44 ` toadwastoast
2024-12-12 13:48 ` toadwastoast
2024-12-12 13:50 ` toadwastoast
2024-12-12 23:12 ` [PR PATCH] [Merged]: " classabbyamp
2024-12-12 23:12 ` leeminusminus
2024-12-13 20:46 ` tre-flip
2024-12-13 20:46 ` tre-flip
2024-12-13 20:46 ` tre-flip
2024-12-13 20:50 ` tre-flip
2024-12-13 20:54 ` tre-flip
2024-12-13 20:59 ` classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).