summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/cinnamon-desktop/Makefile16
-rw-r--r--x11/cinnamon-desktop/distinfo6
-rw-r--r--x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c31
-rw-r--r--x11/cinnamon-desktop/pkg-plist3
-rw-r--r--x11/cinnamon-menus/Makefile8
-rw-r--r--x11/cinnamon-menus/distinfo6
-rw-r--r--x11/cinnamon-menus/pkg-plist16
-rw-r--r--x11/cinnamon-screensaver/Makefile23
-rw-r--r--x11/cinnamon-screensaver/distinfo6
-rw-r--r--x11/cinnamon-screensaver/pkg-plist14
-rw-r--r--x11/cinnamon-session/Makefile21
-rw-r--r--x11/cinnamon-session/distinfo6
-rw-r--r--x11/cinnamon-session/pkg-plist5
-rw-r--r--x11/cinnamon/Makefile71
-rw-r--r--x11/cinnamon/distinfo6
-rw-r--r--x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build13
-rw-r--r--x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py59
-rw-r--r--x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py48
-rw-r--r--x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py41
-rw-r--r--x11/cinnamon/pkg-plist130
-rw-r--r--x11/kf6-frameworkintegration/distinfo6
-rw-r--r--x11/kf6-kded/distinfo6
-rw-r--r--x11/kf6-kglobalaccel/distinfo6
-rw-r--r--x11/kf6-krunner/distinfo6
-rw-r--r--x11/kf6-kwindowsystem/distinfo6
-rw-r--r--x11/plasma6-kactivitymanagerd/distinfo6
-rw-r--r--x11/plasma6-kgamma/distinfo6
-rw-r--r--x11/plasma6-kglobalacceld/distinfo6
-rw-r--r--x11/plasma6-kscreen/distinfo6
-rw-r--r--x11/plasma6-kwayland/distinfo6
-rw-r--r--x11/plasma6-layer-shell-qt/distinfo6
-rw-r--r--x11/plasma6-libkscreen/distinfo6
-rw-r--r--x11/plasma6-libplasma/distinfo6
-rw-r--r--x11/plasma6-plasma-activities-stats/distinfo6
-rw-r--r--x11/plasma6-plasma-activities/distinfo6
-rw-r--r--x11/plasma6-plasma-desktop/distinfo6
-rw-r--r--x11/plasma6-plasma-integration/distinfo6
-rw-r--r--x11/plasma6-plasma-workspace/Makefile3
-rw-r--r--x11/plasma6-plasma-workspace/distinfo6
-rw-r--r--x11/py-python-xapp/Makefile3
-rw-r--r--x11/py-python-xapp/distinfo6
-rw-r--r--x11/py-pyvirtualdisplay/Makefile4
-rw-r--r--x11/remontoire/Makefile16
-rw-r--r--x11/remontoire/distinfo6
-rw-r--r--x11/rio/Makefile1
-rw-r--r--x11/swaync/Makefile2
-rw-r--r--x11/swaync/distinfo6
-rw-r--r--x11/xapp/Makefile41
-rw-r--r--x11/xapp/distinfo6
-rw-r--r--x11/xapp/pkg-plist97
-rw-r--r--x11/xfce4-screensaver/Makefile47
-rw-r--r--x11/xfce4-screensaver/distinfo6
-rw-r--r--x11/xfce4-screensaver/pkg-plist2
53 files changed, 563 insertions, 320 deletions
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 839a763292a0..7b45a0f70a5d 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -1,6 +1,5 @@
PORTNAME= cinnamon-desktop
-PORTVERSION= 5.4.2
-PORTREVISION= 5
+DISTVERSION= 6.4.1
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome
@@ -14,13 +13,16 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
BUILD_DEPENDS= xkeyboard-config>=0:x11/xkeyboard-config \
- libxkbfile>=0:x11/libxkbfile
-LIB_DEPENDS= libpulse.so:audio/pulseaudio
+ libxkbfile>=0:x11/libxkbfile \
+ iso-codes>=0:misc/iso-codes
+LIB_DEPENDS= libpulse.so:audio/pulseaudio \
+ libudev.so:devel/libudev-devd
RUN_DEPENDS= xkeyboard-config>=0:x11/xkeyboard-config \
- libxkbfile>=0:x11/libxkbfile
+ libxkbfile>=0:x11/libxkbfile \
+ iso-codes>=0:misc/iso-codes
USES= gettext gnome localbase meson pkgconfig python:build shebangfix xorg
-USE_GNOME= cairo gdkpixbuf gtk30 intltool introspection
+USE_GNOME= cairo gdkpixbuf glib20 gtk30 introspection
USE_XORG= x11 xext xrandr
USE_LDCONFIG= yes
@@ -53,6 +55,8 @@ GLIB_SCHEMAS= org.cinnamon.desktop.a11y.applications.gschema.xml \
org.cinnamon.desktop.thumbnailers.gschema.xml \
org.cinnamon.desktop.wm.preferences.gschema.xml
+MESON_ARGS= -Dsystemd=disabled
+
OPTIONS_DEFINE= ALSA
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo
index 607d949b3e3b..e83fe84552c6 100644
--- a/x11/cinnamon-desktop/distinfo
+++ b/x11/cinnamon-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660019817
-SHA256 (gnome/linuxmint-cinnamon-desktop-5.4.2_GH0.tar.gz) = 862828d97518becf9dd085d76cae9d65090811c82f1dab41392fe89a6b927371
-SIZE (gnome/linuxmint-cinnamon-desktop-5.4.2_GH0.tar.gz) = 502072
+TIMESTAMP = 1735677829
+SHA256 (gnome/linuxmint-cinnamon-desktop-6.4.1_GH0.tar.gz) = 0e9af48b97910302a1130424a05c63b2e7aacb4ce6ae7a1d53c71bcd157a3a8f
+SIZE (gnome/linuxmint-cinnamon-desktop-6.4.1_GH0.tar.gz) = 509746
diff --git a/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c b/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c
deleted file mode 100644
index 4bdf7e1ea04f..000000000000
--- a/x11/cinnamon-desktop/files/patch-libcvc_gvc-channel-map.c
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git libcvc/gvc-channel-map.c libcvc/gvc-channel-map.c
-index 7f14c8b..69682ac 100644
---- libcvc/gvc-channel-map.c
-+++ libcvc/gvc-channel-map.c
-@@ -109,7 +109,7 @@ gvc_channel_map_set_balance (GvcChannelMap *map,
- {
- pa_cvolume cv;
-
-- g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-+ g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
-
- if (!gvc_channel_map_can_balance (map))
- return;
-@@ -149,7 +149,7 @@ gvc_channel_map_set_fade (GvcChannelMap *map,
- {
- pa_cvolume cv;
-
-- g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-+ g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
-
- if (!gvc_channel_map_can_fade (map))
- return;
-@@ -191,7 +191,7 @@ gvc_channel_map_set_lfe (GvcChannelMap *map,
- {
- pa_cvolume cv;
-
-- g_return_val_if_fail (GVC_IS_CHANNEL_MAP (map), NULL);
-+ g_return_if_fail (GVC_IS_CHANNEL_MAP (map));
-
- if (!gvc_channel_map_has_lfe (map))
- return;
diff --git a/x11/cinnamon-desktop/pkg-plist b/x11/cinnamon-desktop/pkg-plist
index 0dee9904a389..90b7bfcd1604 100644
--- a/x11/cinnamon-desktop/pkg-plist
+++ b/x11/cinnamon-desktop/pkg-plist
@@ -3,11 +3,12 @@ include/cinnamon-desktop/libcinnamon-desktop/gnome-bg-crossfade.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-bg.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-thumbnail.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-desktop-utils.h
-include/cinnamon-desktop/libcinnamon-desktop/gnome-installer.h
+include/cinnamon-desktop/libcinnamon-desktop/gnome-idle-monitor.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-pnp-ids.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-config.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-labeler.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-rr.h
+include/cinnamon-desktop/libcinnamon-desktop/gnome-systemd.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-wall-clock.h
include/cinnamon-desktop/libcinnamon-desktop/gnome-xkb-info.h
include/cinnamon-desktop/libcvc/gvc-channel-map.h
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index a492ef449fdd..73b521ba2479 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -1,5 +1,5 @@
PORTNAME= cinnamon-menus
-PORTVERSION= 5.4.0
+DISTVERSION= 6.4.0
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome
@@ -18,7 +18,11 @@ USE_GNOME= glib20 introspection:build
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
-
USE_LDCONFIG= yes
+OPTIONS_DEFINE= DOCS
+
+DOCS_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc
+DOCS_MESON_TRUE= enable_docs
+
.include <bsd.port.mk>
diff --git a/x11/cinnamon-menus/distinfo b/x11/cinnamon-menus/distinfo
index 542c41805ba7..b203e2b6e9a3 100644
--- a/x11/cinnamon-menus/distinfo
+++ b/x11/cinnamon-menus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656716842
-SHA256 (gnome/linuxmint-cinnamon-menus-5.4.0_GH0.tar.gz) = 47eb864105711c28c4851b64bcc82aa5701095996698db170b86be9ebd914e07
-SIZE (gnome/linuxmint-cinnamon-menus-5.4.0_GH0.tar.gz) = 96312
+TIMESTAMP = 1735837360
+SHA256 (gnome/linuxmint-cinnamon-menus-6.4.0_GH0.tar.gz) = 9cad5ac61900492f66c91810fd13bed9dc37b49ec0b9bbc0bbe9ebf48ee45452
+SIZE (gnome/linuxmint-cinnamon-menus-6.4.0_GH0.tar.gz) = 96524
diff --git a/x11/cinnamon-menus/pkg-plist b/x11/cinnamon-menus/pkg-plist
index 40191c9931a3..64f102fd6a87 100644
--- a/x11/cinnamon-menus/pkg-plist
+++ b/x11/cinnamon-menus/pkg-plist
@@ -6,3 +6,19 @@ lib/libcinnamon-menu-3.so.0.0.1
lib/girepository-1.0/CMenu-3.0.typelib
libdata/pkgconfig/libcinnamon-menu-3.0.pc
share/gir-1.0/CMenu-3.0.gir
+%%PORTDOCS%%share/gtk-doc/html/cmenu/GMenuTree.html
+%%PORTDOCS%%share/gtk-doc/html/cmenu/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/cmenu/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/cmenu/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/cmenu/cmenu.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/cmenu/home.png
+%%PORTDOCS%%share/gtk-doc/html/cmenu/index.html
+%%PORTDOCS%%share/gtk-doc/html/cmenu/ix02.html
+%%PORTDOCS%%share/gtk-doc/html/cmenu/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cmenu/left.png
+%%PORTDOCS%%share/gtk-doc/html/cmenu/pt01.html
+%%PORTDOCS%%share/gtk-doc/html/cmenu/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cmenu/right.png
+%%PORTDOCS%%share/gtk-doc/html/cmenu/style.css
+%%PORTDOCS%%share/gtk-doc/html/cmenu/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/cmenu/up.png
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 6b4de701e272..906339abc9d2 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -1,6 +1,5 @@
PORTNAME= cinnamon-screensaver
-PORTVERSION= 5.4.2
-PORTREVISION= 3
+DISTVERSION= 6.4.0
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome
@@ -13,7 +12,6 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB
-BUILD_DEPENDS= gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas
LIB_DEPENDS= libaccountsservice.so:sysutils/accountsservice \
libcinnamon-desktop.so:x11/cinnamon-desktop \
libdbus-glib-1.so:devel/dbus-glib \
@@ -24,14 +22,14 @@ RUN_DEPENDS= ${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring \
${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR} \
${LOCALBASE}/libexec/unix-selfauth-helper:security/unix-selfauth-helper
-USES= gettext-tools gnome meson pkgconfig python shebangfix xorg
+USES= gnome meson pkgconfig python shebangfix xorg localbase:ldflags
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
-USE_XORG= x11 xext xinerama xrandr xscrnsaver
+USE_XORG= x11 xext xrandr
-USE_GNOME= cairo gdkpixbuf glib20 intltool introspection:build libgnomekbd pygobject3
+USE_GNOME= cairo gdkpixbuf glib20 gtk30 introspection:build pygobject3
SHEBANG_GLOB= *.py
BINARY_ALIAS= python3=${PYTHON_CMD}
@@ -40,9 +38,18 @@ USE_LDCONFIG= yes
SUB_FILES+= cinnamon-screensaver.pam
+OPTIONS_DEFINE= LOCKING SETRES XINERAMA
+OPTIONS_DEFAULT= LOCKING XINERAMA
+
+LOCKING_DESC= Compile in support for locking the display
+SETRES_DESC= Use setresuid/setresgid in the setuid.c helper
+
+LOCKING_MESON_TRUE= locking
+SETRES_MESON_TRUE= setres
+XINERAMA_USE= XORG=xinerama
+XINERAMA_MESON_TRUE= xinerama
+
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|g' \
- ${WRKSRC}/src/pamhelper/authClient.py
@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
${WRKSRC}/src/pamhelper/cinnamon-screensaver-pam-helper.c \
${WRKSRC}/libcscreensaver/test-passwd.c \
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index fa7052a69e99..3cc55efde9a6 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660022189
-SHA256 (gnome/linuxmint-cinnamon-screensaver-5.4.2_GH0.tar.gz) = 7ae54b1fc83fff3082b3b43bf5bf01f7cf49eb35cd6b5b42c0e454e2fd619748
-SIZE (gnome/linuxmint-cinnamon-screensaver-5.4.2_GH0.tar.gz) = 154799
+TIMESTAMP = 1735838597
+SHA256 (gnome/linuxmint-cinnamon-screensaver-6.4.0_GH0.tar.gz) = e985b68981482b7ead6aef55988937958539221d752f9a4feb7ced9ac32fe422
+SIZE (gnome/linuxmint-cinnamon-screensaver-6.4.0_GH0.tar.gz) = 160693
diff --git a/x11/cinnamon-screensaver/pkg-plist b/x11/cinnamon-screensaver/pkg-plist
index 7b8e7c7faa89..1afd45d1deac 100644
--- a/x11/cinnamon-screensaver/pkg-plist
+++ b/x11/cinnamon-screensaver/pkg-plist
@@ -2,13 +2,10 @@ bin/cinnamon-screensaver
bin/cinnamon-screensaver-command
bin/cinnamon-unlock-desktop
etc/pam.d/cinnamon-screensaver
-lib/girepository-1.0/CScreensaver-1.0.typelib
-lib/libcscreensaver.so
-lib/libcscreensaver.so.0
-lib/libcscreensaver.so.0.0.0
-libdata/pkgconfig/cscreensaver.pc
-@(,,4555) libexec/cinnamon-screensaver-pam-helper
-libexec/cs-backup-locker
+libexec/cinnamon-screensaver/girepository-1.0/CScreensaver-1.0.typelib
+libexec/cinnamon-screensaver/libcscreensaver.so
+@(,,4555) libexec/cinnamon-screensaver/cinnamon-screensaver-pam-helper
+libexec/cinnamon-screensaver/cs-backup-locker
%%DATADIR%%/__init__.py
%%DATADIR%%/albumArt.py
%%DATADIR%%/audioPanel.py
@@ -28,6 +25,7 @@ libexec/cs-backup-locker
%%DATADIR%%/dbusdepot/loginInterface.py
%%DATADIR%%/dbusdepot/logindClient.py
%%DATADIR%%/dbusdepot/mediaPlayerWatcher.py
+%%DATADIR%%/dbusdepot/muffinClient.py
%%DATADIR%%/dbusdepot/nameBlocker.py
%%DATADIR%%/dbusdepot/sessionClient.py
%%DATADIR%%/dbusdepot/uPowerClient.py
@@ -66,5 +64,7 @@ share/gir-1.0/CScreensaver-1.0.gir
share/icons/hicolor/scalable/actions/screensaver-switch-users-symbolic.svg
share/icons/hicolor/scalable/actions/screensaver-unlock-symbolic.svg
share/icons/hicolor/scalable/apps/csr-backup-locker-icon.svg
+share/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
+share/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
share/icons/hicolor/scalable/status/screensaver-blank.svg
share/icons/hicolor/scalable/status/screensaver-notification-symbolic.svg
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index b7883cac3edf..126615f142b8 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -1,6 +1,5 @@
PORTNAME= cinnamon-session
-PORTVERSION= 5.4.0
-PORTREVISION= 5
+DISTVERSION= 6.4.0
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome
@@ -10,26 +9,28 @@ WWW= https://github.com/linuxmint/cinnamon-session
LICENSE= GPLv2
-LIB_DEPENDS= libdbus-1.so:devel/dbus \
- libdbus-glib-1.so:devel/dbus-glib \
+LIB_DEPENDS= libcinnamon-desktop.so:x11/cinnamon-desktop \
libxapp.so:x11/xapp \
libcanberra.so:audio/libcanberra
-RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2
+RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2 \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR}
-USES= gl gnome meson pkgconfig python:build shebangfix xorg
+USES= gl gnome meson pkgconfig shebangfix xorg python:build
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
-SHEBANG_FILES= data/meson_install_schemas.py
+SHEBANG_FILES= data/meson_install_schemas.py \
+ cinnamon-session-quit/cinnamon-session-quit.py
-USE_GNOME= cairo gdkpixbuf gtk30
+USE_GNOME= cairo gdkpixbuf glib20 gtk30 pango
USE_XORG= ice sm x11 xau xcomposite xext xrender xtrans xtst
USE_GL= gl
-
GLIB_SCHEMAS= org.cinnamon.SessionManager.gschema.xml
-OPTIONS_DEFINE= IPV6
+MESON_ARGS= -Dxtrans=true
+
+OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT= IPV6
IPV6_MESON_TRUE= ipv6
diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo
index 61afde6aceaf..b48aea7b28e7 100644
--- a/x11/cinnamon-session/distinfo
+++ b/x11/cinnamon-session/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656715196
-SHA256 (gnome/linuxmint-cinnamon-session-5.4.0_GH0.tar.gz) = c3c9351aecebe2abbb5d61663ad19af56fc6413ad6cddb5d753a614b23ec547d
-SIZE (gnome/linuxmint-cinnamon-session-5.4.0_GH0.tar.gz) = 199698
+TIMESTAMP = 1736186381
+SHA256 (gnome/linuxmint-cinnamon-session-6.4.0_GH0.tar.gz) = 464075d920df360b5ad94f72395a09b5fbf8b14f0190406ec76055a17659e243
+SIZE (gnome/linuxmint-cinnamon-session-6.4.0_GH0.tar.gz) = 165993
diff --git a/x11/cinnamon-session/pkg-plist b/x11/cinnamon-session/pkg-plist
index 3911dab65623..3c0eef38d496 100644
--- a/x11/cinnamon-session/pkg-plist
+++ b/x11/cinnamon-session/pkg-plist
@@ -1,10 +1,13 @@
bin/cinnamon-session
bin/cinnamon-session-quit
+libexec/cinnamon-session-binary
libexec/cinnamon-session-check-accelerated
libexec/cinnamon-session-check-accelerated-helper
share/man/man1/cinnamon-session-quit.1.gz
share/man/man1/cinnamon-session.1.gz
-%%DATADIR%%/csm-inhibit-dialog.glade
+%%DATADIR%%/cinnamon-session-quit.glade
+%%DATADIR%%/cinnamon-session-quit.py
+%%DATADIR%%/config.py
%%DATADIR%%/hardware-compatibility
share/icons/hicolor/16x16/apps/cinnamon-session-properties.png
share/icons/hicolor/22x22/apps/cinnamon-session-properties.png
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 6261c84f1904..b2be860803c9 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cinnamon
-PORTVERSION= 5.4.9
-PORTREVISION= 8
+DISTVERSION= 6.4.10
+PORTREVISION= 1
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome
@@ -13,20 +13,23 @@ WWW= https://github.com/linuxmint/cinnamon
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri
+BUILD_DEPENDS= ${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri \
+ ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR}
LIB_DEPENDS= libcjs.so:lang/cjs \
libmuffin.so:x11-wm/muffin \
libcinnamon-menu-3.so:x11/cinnamon-menus \
libdbus-1.so:devel/dbus \
libpolkit-agent-1.so:sysutils/polkit \
libatk-bridge-2.0.so:accessibility/at-spi2-core \
- libsoup-2.4.so:devel/libsoup \
- libxapp.so:x11/xapp
+ libxapp.so:x11/xapp \
+ libgcr-base-3.so:security/gcr3 \
+ libcinnamon-desktop.so:x11/cinnamon-desktop
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \
caribou>0:accessibility/caribou \
cinnamon-control-center:sysutils/cinnamon-control-center \
cinnamon-screensaver:x11/cinnamon-screensaver \
+ cinnamon-settings-daemon>0:sysutils/cinnamon-settings-daemon \
nemo:x11-fm/nemo \
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
@@ -45,9 +48,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
${LOCALBASE}/lib/girepository-1.0/GSound-1.0.typelib:audio/gsound \
gnome-backgrounds>0:x11-themes/gnome-backgrounds \
metacity:x11-wm/metacity \
- tint2:x11/tint
-
-USES= compiler:c11 cpe gettext-runtime gettext-tools:run gl gnome gstreamer \
+ tint2:x11/tint \
+ lspci:sysutils/pciutils \
+ ${LOCALBASE}/libexec/polkit-gnome-authentication-agent-1:sysutils/polkit-gnome \
+ ${LOCALBASE}/libexec/cups-pk-helper-mechanism:print/cups-pk-helper \
+ ${PYTHON_PKGNAMEPREFIX}tinycss2>0:textproc/py-tinycss2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} \
+ xdg-open:devel/xdg-utils \
+ xdg-user-dirs-gtk>0:x11/xdg-user-dirs-gtk \
+ inxi:sysutils/inxi \
+ wget:ftp/wget
+
+USES= compiler:c11 cpe gettext-runtime gettext-tools:run gl gnome \
meson perl5 pkgconfig python shebangfix xorg
CPE_VENDOR= linuxmint
USE_GNOME= cairo gdkpixbuf glib20 gtk30 intltool introspection libxml2 pygobject3
@@ -59,21 +71,28 @@ USE_GITHUB= yes
GH_ACCOUNT= linuxmint
SHEBANG_GLOB= *.py
-SHEBANG_FILES= files/* src/data-to-c.pl
+SHEBANG_FILES= files/* src/data-to-c.pl data/theme/parse-sass.sh
USE_LDCONFIG= yes
+# These libs are found via rpath mechanism
+NO_SHLIB_REQUIRES_GLOB= libmuffin-clutter-* libmuffin-cogl-*
BINARY_ALIAS= python3=${PYTHON_CMD}
MESON_ARGS= -Ddisable_networkmanager=true
GLIB_SCHEMAS= org.cinnamon.gschema.xml
-OPTIONS_DEFINE= DOCS NLS
-OPTIONS_EXCLUDE= DOCS
+OPTIONS_DEFINE= DOCS NLS WAYLAND RECORDER
+OPTIONS_DEFAULT= RECORDER
OPTIONS_SUB= yes
+RECORDER_DESC= Build the cinnamon recorder into source
+
DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc
DOCS_MESON_TRUE= docs
+WAYLAND_MESON_TRUE= wayland
+RECORDER_MESON_TRUE= build_recorder
+RECORDER_USES= gstreamer
NLS_RUN_DEPENDS= cinnamon-translations>0:misc/cinnamon-translations
@@ -94,15 +113,43 @@ post-patch:
${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g"
@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/bin" | \
- ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin|${PREFIX}/bin|g"
+ ${XARGS} ${REINPLACE_CMD} -e '\x/usr/bin/passwdx!s|/usr/bin|${PREFIX}/bin|g'
+
+ @${REINPLACE_CMD} -e "/prefixes = /s|'/usr'|'${PREFIX}'|" \
+ ${WRKSRC}/files/usr/bin/xlet-about-dialog
+ # Stop loading network-manager applet by default
+ @${REINPLACE_CMD} -e "s|, 'panel1:right:7:network@cinnamon.org'||" \
+ ${WRKSRC}/data/org.cinnamon.gschema.xml
+
+ # Fix build with no network-manager
@${REINPLACE_CMD} -e '/cs-bluetooth/d; /cs-network/d' \
${WRKSRC}/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+ @${REINPLACE_CMD} -e 's/nm-applet;//' \
+ ${WRKSRC}/meson.build
+
+ @${REINPLACE_CMD} -e '/imports.ui.networkAgent/d' \
+ ${WRKSRC}/js/ui/main.js
+ # End of Fix build with no network-manager
+
+ # Fix symlink installation
+ @${REINPLACE_CMD} -e "s|DESTDIR|MESON_INSTALL_DESTDIR_PREFIX|" \
+ ${WRKSRC}/install-scripts/add_symlink.py
+
# Some python files use #! /usr/bin/python (note the space between the bang and the python interpreter
@${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \
${XARGS} ${REINPLACE_CMD} -e "s|#!.*python.*|#!/usr/bin/env python|g"
+ # Fix applets that try to exec just python3
+ @${REINPLACE_CMD} -e "/'python3[' ]/s|python3|${PYTHON_CMD}|" \
+ ${WRKSRC}/files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js \
+ ${WRKSRC}/files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/menus.js
+
+ # Fix system lp(1) overlapping with cups' lp(1)
+ @${REINPLACE_CMD} -e "/'lp'/s|lp|${PREFIX}/bin/lp|" \
+ ${WRKSRC}/files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js
+
# gtk-doc builds erroneous documentation files otherwise
@${FIND} ${WRKSRC} -name '*.orig' -type f -delete
@${FIND} ${WRKSRC} -name '*.bak' -type f -delete
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index 88eb442ad3e0..267ad77e131a 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660060329
-SHA256 (gnome/linuxmint-cinnamon-5.4.9_GH0.tar.gz) = 19c5e85f65baacc79f961cbcebb20fb0050ad6f21678638a9dd1868d197b4727
-SIZE (gnome/linuxmint-cinnamon-5.4.9_GH0.tar.gz) = 2468335
+TIMESTAMP = 1752081962
+SHA256 (gnome/linuxmint-cinnamon-6.4.10_GH0.tar.gz) = eff6d55ec2b6443cec5b829df6240b329fbfa77aafd2064a60fdde2fc5b59f34
+SIZE (gnome/linuxmint-cinnamon-6.4.10_GH0.tar.gz) = 2592994
diff --git a/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build b/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build
new file mode 100644
index 000000000000..10cdab7f29d7
--- /dev/null
+++ b/x11/cinnamon/files/patch-docs_reference_cinnamon_meson.build
@@ -0,0 +1,13 @@
+--- docs/reference/cinnamon/meson.build.orig 2025-02-09 15:54:24 UTC
++++ docs/reference/cinnamon/meson.build
+@@ -11,6 +11,10 @@ endif
+ ignore += 'cinnamon-recorder.h'
+ endif
+
++if not have_networkmanager
++ ignore += 'cinnamon-network-agent.h'
++endif
++
+ gnome.gtkdoc(
+ 'cinnamon',
+ mode: 'xml',
diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py
new file mode 100644
index 000000000000..0ee26614724f
--- /dev/null
+++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings-users_cinnamon-settings-users.py
@@ -0,0 +1,59 @@
+--- files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2025-07-10 21:12:25 UTC
++++ files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -255,7 +255,7 @@ class PasswordDialog(Gtk.Dialog):
+ self.user.set_password(newpass, "")
+ mask = self.group_mask.get_text()
+ if "nopasswdlogin" in mask:
+- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
++ subprocess.call(["pw", "groupmod", "nopasswdlogin", "-d", self.user.get_user_name()])
+ mask = mask.split(", ")
+ mask.remove("nopasswdlogin")
+ mask = ", ".join(mask)
+@@ -620,7 +620,7 @@ class Module:
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+ groups = dialog.get_selected_groups()
+- subprocess.call(["usermod", user.get_user_name(), "-G", ",".join(groups)])
++ subprocess.call(["pw", "usermod", user.get_user_name(), "-G", ",".join(groups)])
+ groups.sort()
+ self.groups_label.set_text(", ".join(groups))
+ dialog.destroy()
+@@ -900,9 +900,9 @@ class Module:
+ piter = self.users.append(None, [new_user, pixbuf, description])
+ # Add the user to his/her own group and sudo if Administrator was selected
+ if dialog.account_type_combo.get_active() == 1:
+- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++ subprocess.call(["pw", "usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
+ else:
+- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++ subprocess.call(["pw", "usermod", username, "-G", "%s,nopasswdlogin" % username])
+ self.load_groups()
+ dialog.destroy()
+
+@@ -947,7 +947,7 @@ class Module:
+ d.set_default_response(Gtk.ResponseType.NO)
+ r = d.run()
+ if r == Gtk.ResponseType.YES:
+- subprocess.call(["groupdel", group])
++ subprocess.call(["pw", "groupdel", group])
+ self.load_groups()
+ d.destroy()
+
+@@ -955,7 +955,7 @@ class Module:
+ dialog = GroupDialog(_("Group Name"), "", self.window)
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+- subprocess.call(["groupadd", dialog.entry.get_text().lower()])
++ subprocess.call(["pw", "groupadd", dialog.entry.get_text().lower()])
+ self.load_groups()
+ dialog.destroy()
+
+@@ -966,7 +966,7 @@ class Module:
+ dialog = GroupDialog(_("Group Name"), group, self.window)
+ response = dialog.run()
+ if response == Gtk.ResponseType.OK:
+- subprocess.call(["groupmod", group, "-n", dialog.entry.get_text().lower()])
++ subprocess.call(["pw", "groupmod", group, "-l", dialog.entry.get_text().lower()])
+ self.load_groups()
+ dialog.destroy()
+
diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py
index 8ea487050de1..92fb927f975a 100644
--- a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py
+++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_capi.py
@@ -1,39 +1,13 @@
---- files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig 2022-06-21 15:01:39 UTC
+--- files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig 2025-07-10 16:06:25 UTC
+++ files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
-@@ -27,31 +27,11 @@ class CManager():
- self.extension_point = Gio.io_extension_point_register ("cinnamon-control-center-1")
- self.modules = []
+@@ -30,7 +30,9 @@ class CManager:
+ # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf'
+ # see also: https://wiki.debian.org/Python/MultiArch
+ triplet = sysconfig.get_config_var('MULTIARCH')
+- paths = ["/usr/lib", "/usr/lib64", f"/usr/lib/{triplet}"]
++ paths = ["/usr/lib", "/usr/lib64"]
++ if triplet:
++ paths.append(f"/usr/lib/{triplet}")
-- architecture = platform.machine()
-- # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf'
-- # see also: https://wiki.debian.org/Python/MultiArch
-- triplet = sysconfig.get_config_var('MULTIARCH')
-- paths = ["/usr/lib", f"/usr/lib/{triplet}"]
--
-- # On x86 archs, iterate through multiple paths
-- # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
-- x86archs = ["i386", "i486", "i586", "i686"]
-- if architecture in x86archs:
-- for arch in x86archs:
-- paths += ["/usr/lib/%s" % arch]
-- elif architecture == "x86_64":
-- paths += ["/usr/lib/x86_64", "/usr/lib64"]
-- else:
-- paths += ["/usr/lib/%s" % architecture]
--
-- for path in paths:
-- if not os.path.islink(path):
-- path = os.path.join(path, "cinnamon-control-center-1/panels")
-- if os.path.exists(path):
-- try:
-- self.modules = self.modules + Gio.io_modules_load_all_in_directory(path)
-- except Exception as e:
-- print("capi failed to load multiarch modules from %s: " % path, e)
-+ path = os.path.join("/usr/lib", "cinnamon-control-center-1/panels")
-+ try:
-+ self.modules = self.modules + Gio.io_modules_load_all_in_directory(path)
-+ except Exception as e:
-+ print("capi failed to load multiarch modules from %s: " % path, e)
-
- def get_c_widget(self, mod_id):
- extension = self.extension_point.get_extension_by_name(mod_id)
+ # On x86 archs, iterate through multiple paths
+ # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
diff --git a/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py
new file mode 100644
index 000000000000..3cc8afe08f48
--- /dev/null
+++ b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_modules_cs__info.py
@@ -0,0 +1,41 @@
+--- files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py.orig 2025-07-10 21:17:21 UTC
++++ files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+@@ -54,8 +54,11 @@ def getDiskSize():
+ def getDiskSize():
+ disksize = 0
+ try:
+- out = getProcessOut(("lsblk", "--json", "--output", "size", "--bytes", "--nodeps"))
+- jsonobj = loads(''.join(out))
++ out = getProcessOut(("geom", "disk", "list"))
++ jsonobj = {'blockdevices': []}
++ for disk in out:
++ if "Mediasize:" in disk:
++ jsonobj['blockdevices'].append({'size': disk.split()[1]})
+ except Exception:
+ return _("Unknown size"), False
+
+@@ -71,13 +74,12 @@ def getProcInfos():
+ # Source: https://github.com/dylanaraps/neofetch/blob/6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f/neofetch#L2163
+ cpudetect = ("model name", "Hardware", "Processor", "cpu model", "chip type", "cpu type")
+ infos = [
+- ("/proc/cpuinfo", [("cpu_name", cpudetect), ("cpu_siblings", ("siblings",)), ("cpu_cores", ("cpu cores",))]),
+- ("/proc/meminfo", [("mem_total", ("MemTotal",))])
++ ("hw", [("cpu_name", ("hw.model",)), ("cpu_cores", ("hw.ncpu",)), ("mem_total", ("hw.physmem",))]),
+ ]
+
+ result = {}
+ for (proc, pairs) in infos:
+- for line in getProcessOut(("cat", proc)):
++ for line in getProcessOut(("sysctl", proc)):
+ for (key, start) in pairs:
+ for item in start:
+ if line.startswith(item):
+@@ -122,7 +124,7 @@ def createSystemInfos():
+ if memunit == "kB":
+ infos.append((_("Memory"), '%.1f %s' % ((float(memsize)/(1024*1024)), _("GiB"))))
+ else:
+- infos.append((_("Memory"), procInfos['mem_total']))
++ infos.append((_("Memory"), '%.1f %s' % ((float(memsize)/(1024*1024*1024)), _("GiB"))))
+
+ diskSize, multipleDisks = getDiskSize()
+ if multipleDisks:
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index 877786656bc5..f27549e838d2 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -1,9 +1,7 @@
bin/cinnamon
bin/cinnamon-calendar-server
-bin/cinnamon-close-dialog
bin/cinnamon-dbus-command
bin/cinnamon-desktop-editor
-bin/cinnamon-display-changes-dialog
bin/cinnamon-file-dialog
bin/cinnamon-hover-click
bin/cinnamon-install-spice
@@ -26,6 +24,7 @@ bin/cinnamon2d
bin/xlet-about-dialog
bin/xlet-settings
etc/xdg/menus/cinnamon-applications.menu
+etc/xdg/menus/cinnamon-applications-merged
lib/cinnamon/Cinnamon-0.1.typelib
lib/cinnamon/St-1.0.typelib
lib/cinnamon/libcinnamon.so
@@ -45,8 +44,6 @@ share/man/man1/cinnamon-screensaver-lock-dialog.1.gz
share/man/man1/cinnamon-settings.1.gz
share/man/man1/cinnamon.1.gz
share/man/man1/cinnamon2d.1.gz
-share/man/man1/gnome-session-cinnamon.1.gz
-share/man/man1/gnome-session-cinnamon2d.1.gz
share/applications/cinnamon-killer-daemon.desktop
share/applications/cinnamon-menu-editor.desktop
share/applications/cinnamon-onscreen-keyboard.desktop
@@ -65,7 +62,6 @@ share/applications/cinnamon-settings-info.desktop
share/applications/cinnamon-settings-keyboard.desktop
share/applications/cinnamon-settings-mouse.desktop
share/applications/cinnamon-settings-notifications.desktop
-share/applications/cinnamon-settings-online-accounts.desktop
share/applications/cinnamon-settings-panel.desktop
share/applications/cinnamon-settings-power.desktop
share/applications/cinnamon-settings-privacy.desktop
@@ -82,6 +78,87 @@ share/applications/cinnamon-settings-workspaces.desktop
share/applications/cinnamon-settings.desktop
share/applications/cinnamon.desktop
share/applications/cinnamon2d.desktop
+share/applications/cinnamon-settings-actions.desktop
+share/applications/cinnamon-settings-gestures.desktop
+share/applications/cinnamon-settings-nightlight.desktop
+%%WAYLAND%%share/applications/cinnamon-wayland.desktop
+%%WAYLAND%%%%DATADIR%%-session/sessions/cinnamon-wayland.session
+%%DATADIR%%/Cinnamon-0.1.gir
+%%DATADIR%%/St-1.0.gir
+%%DATADIR%%/applets/cornerbar@cinnamon.org/applet.js
+%%DATADIR%%/applets/cornerbar@cinnamon.org/metadata.json
+%%DATADIR%%/applets/cornerbar@cinnamon.org/settings-schema.json
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/state.js
+%%DATADIR%%/applets/grouped-window-list@cinnamon.org/workspace.js
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-active-notifications-disabled-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notification-active-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notification-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/icons/inhibit-notifications-disabled-symbolic.svg
+%%DATADIR%%/applets/inhibit@cinnamon.org/settings-schema.json
+%%DATADIR%%/cinnamon-settings/appearance-dark.svg
+%%DATADIR%%/cinnamon-settings/appearance-light.svg
+%%DATADIR%%/cinnamon-settings/appearance-mixed.svg
+%%DATADIR%%/cinnamon-settings/color_dot.svg
+%%DATADIR%%/cinnamon-settings/modules/cs_actions.py
+%%DATADIR%%/cinnamon-settings/modules/cs_gestures.py
+%%DATADIR%%/cinnamon-settings/modules/cs_nightlight.py
+%%DATADIR%%/cinnamon-settings/themes.ui
+%%DATADIR%%/js/misc/portalHandlers.js
+%%DATADIR%%/js/ui/audioDeviceSelection.js
+%%DATADIR%%/js/ui/barLevel.js
+%%DATADIR%%/js/ui/closeDialog.js
+%%DATADIR%%/js/ui/dialog.js
+%%DATADIR%%/js/ui/endSessionDialog.js
+%%DATADIR%%/js/ui/gestures/ToucheggTypes.js
+%%DATADIR%%/js/ui/gestures/actions.js
+%%DATADIR%%/js/ui/gestures/gesturesManager.js
+%%DATADIR%%/js/ui/gestures/mprisController.js
+%%DATADIR%%/js/ui/keyringPrompt.js
+%%DATADIR%%/js/ui/locatePointer.js
+%%DATADIR%%/js/ui/monitorLabeler.js
+%%DATADIR%%/js/ui/networkAgent.js
+%%DATADIR%%/js/ui/polkitAuthenticationAgent.js
+%%DATADIR%%/js/ui/ripples.js
+%%DATADIR%%/js/ui/userWidget.js
+%%DATADIR%%/js/ui/workspaceOsd.js
+%%DATADIR%%/theme/add-workspace-hover.svg
+%%DATADIR%%/theme/add-workspace.svg
+%%DATADIR%%/theme/calendar-arrow-left-hover.svg
+%%DATADIR%%/theme/calendar-arrow-right-hover.svg
+%%DATADIR%%/theme/radio-off.svg
+%%DATADIR%%/theme/radio.svg
+%%DATADIR%%/theme/toggle-off.svg
+%%DATADIR%%/theme/toggle-on.svg
+%%DATADIR%%/theme/trash-icon.svg
+%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Amber.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Classic.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Modern-Ice.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Original-Classic.png
+%%DATADIR%%/thumbnails/cursors/Bibata-Original-Ice.png
+%%DATADIR%%/thumbnails/cursors/Breeze_Snow.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Black.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Blue.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Green.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Orange.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Red.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Black.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Blue.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Green.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Orange.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-Red.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-Slim-White.png
+%%DATADIR%%/thumbnails/cursors/ComixCursors-White.png
+%%DATADIR%%/thumbnails/cursors/Paper.png
+%%DATADIR%%/thumbnails/cursors/Yaru.png
+%%DATADIR%%/thumbnails/cursors/breeze_cursors.png
+%%DATADIR%%/thumbnails/cursors/handhelds.png
+%%DATADIR%%/thumbnails/cursors/oxy-black.png
+%%DATADIR%%/thumbnails/cursors/oxy-blue.png
+%%DATADIR%%/thumbnails/cursors/oxy-white.png
+%%DATADIR%%/thumbnails/cursors/oxy-yellow.png
+%%DATADIR%%/thumbnails/cursors/oxy-zion.png
+%%DATADIR%%/thumbnails/cursors/redglass.png
+%%DATADIR%%/thumbnails/cursors/whiteglass.png
%%DATADIR%%-session/sessions/cinnamon.session
%%DATADIR%%-session/sessions/cinnamon2d.session
%%DATADIR%%/applets/a11y@cinnamon.org/applet.js
@@ -99,7 +176,6 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/applets/favorites@cinnamon.org/metadata.json
%%DATADIR%%/applets/favorites@cinnamon.org/settings-schema.json
%%DATADIR%%/applets/grouped-window-list@cinnamon.org/appGroup.js
-%%DATADIR%%/applets/grouped-window-list@cinnamon.org/appList.js
%%DATADIR%%/applets/grouped-window-list@cinnamon.org/applet.js
%%DATADIR%%/applets/grouped-window-list@cinnamon.org/constants.js
%%DATADIR%%/applets/grouped-window-list@cinnamon.org/icons/news-symbolic.svg
@@ -254,10 +330,8 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/cinnamon-settings/bin/imtools.py
%%DATADIR%%/cinnamon-settings/bin/proxygsettings.py
%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.glade
-%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.py
%%DATADIR%%/cinnamon-settings/bin/tweenEquations.py
%%DATADIR%%/cinnamon-settings/bin/util.py
-%%DATADIR%%/cinnamon-settings/cinnamon-online-accounts-info.ui
%%DATADIR%%/cinnamon-settings/cinnamon-settings.py
%%DATADIR%%/cinnamon-settings/cinnamon-settings.ui
%%DATADIR%%/cinnamon-settings/config.py
@@ -279,7 +353,6 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/cinnamon-settings/modules/cs_keyboard.py
%%DATADIR%%/cinnamon-settings/modules/cs_mouse.py
%%DATADIR%%/cinnamon-settings/modules/cs_notifications.py
-%%DATADIR%%/cinnamon-settings/modules/cs_online_accounts.py
%%DATADIR%%/cinnamon-settings/modules/cs_panel.py
%%DATADIR%%/cinnamon-settings/modules/cs_power.py
%%DATADIR%%/cinnamon-settings/modules/cs_privacy.py
@@ -352,7 +425,6 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/js/misc/pointerTracker.js
%%DATADIR%%/js/misc/screenSaver.js
%%DATADIR%%/js/misc/signalManager.js
-%%DATADIR%%/js/misc/state.js
%%DATADIR%%/js/misc/timers.js
%%DATADIR%%/js/misc/util.js
%%DATADIR%%/js/misc/windowUtils.js
@@ -429,35 +501,16 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/sounds/bell.ogg
%%DATADIR%%/sounds/togglekeys-sound-off.ogg
%%DATADIR%%/sounds/togglekeys-sound-on.ogg
-%%DATADIR%%/theme/add-workspace-hover.png
-%%DATADIR%%/theme/add-workspace.png
%%DATADIR%%/theme/calendar-arrow-left.svg
%%DATADIR%%/theme/calendar-arrow-right.svg
-%%DATADIR%%/theme/calendar-selected.svg
-%%DATADIR%%/theme/calendar-today-selected.svg
-%%DATADIR%%/theme/calendar-today.svg
%%DATADIR%%/theme/checkbox-off.svg
%%DATADIR%%/theme/checkbox.svg
%%DATADIR%%/theme/cinnamon.css
-%%DATADIR%%/theme/close-window-hover.svg
-%%DATADIR%%/theme/close-window.svg
%%DATADIR%%/theme/close.svg
%%DATADIR%%/theme/corner-ripple.png
%%DATADIR%%/theme/menu-symbolic.svg
-%%DATADIR%%/theme/overview-hover.png
-%%DATADIR%%/theme/overview.png
-%%DATADIR%%/theme/process-working.svg
-%%DATADIR%%/theme/radiobutton-off.svg
-%%DATADIR%%/theme/radiobutton.svg
-%%DATADIR%%/theme/scroll-hhandle.svg
-%%DATADIR%%/theme/scroll-vhandle.svg
%%DATADIR%%/theme/thumbnail-generic.png
%%DATADIR%%/theme/thumbnail.png
-%%DATADIR%%/theme/toggle-off-intl.svg
-%%DATADIR%%/theme/toggle-off-us.svg
-%%DATADIR%%/theme/toggle-on-intl.svg
-%%DATADIR%%/theme/toggle-on-us.svg
-%%DATADIR%%/theme/trash-icon.png
%%DATADIR%%/thumbnails/cinnamon/unknown.png
%%DATADIR%%/thumbnails/cursors/Adwaita.png
%%DATADIR%%/thumbnails/cursors/DMZ-Black.png
@@ -512,8 +565,6 @@ share/desktop-directories/cinnamon-utility.directory
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-SignalManager.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-section.html
-%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state-section.html
-%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util-section.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-Applet.html
@@ -523,6 +574,7 @@ share/desktop-directories/cinnamon-utility.directory
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-MenuItem.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextApplet.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextIconApplet.html
+%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-PopupResizeHandler.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-section.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager-section.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager.html
@@ -677,7 +729,6 @@ share/desktop-directories/cinnamon-utility.directory
%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch03.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch04.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch05.html
-%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch06.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-tray-manager.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-util.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-wm.html
@@ -779,6 +830,21 @@ share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg
share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
+share/desktop-directories/cinnamon-science.directory
+share/glib-2.0/schemas/org.cinnamon.gestures.gschema.xml
+share/icons/hicolor/scalable/actions/view-conceal-symbolic.svg
+share/icons/hicolor/scalable/actions/view-reveal-symbolic.svg
+%%WAYLAND%%share/icons/hicolor/scalable/apps/cinnamon-wayland_badge-symbolic.svg
+share/icons/hicolor/scalable/apps/cinnamon2d_badge-symbolic.svg
+share/icons/hicolor/scalable/apps/cinnamon_badge-symbolic.svg
+share/icons/hicolor/scalable/categories/cinnamon-all-applications-symbolic.svg
+share/icons/hicolor/scalable/categories/cs-actions.svg
+share/icons/hicolor/scalable/categories/cs-gestures.svg
+share/icons/hicolor/scalable/categories/cs-nightlight.svg
+share/man/man1/cinnamon-session-cinnamon.1.gz
+share/man/man1/cinnamon-session-cinnamon2d.1.gz
+%%WAYLAND%%share/wayland-sessions/cinnamon-wayland.desktop
+share/xdg-desktop-portal/x-cinnamon-portals.conf
share/polkit-1/actions/org.cinnamon.settings-users.policy
share/xsessions/cinnamon.desktop
share/xsessions/cinnamon2d.desktop
diff --git a/x11/kf6-frameworkintegration/distinfo b/x11/kf6-frameworkintegration/distinfo
index ca4da99910dc..f29149454e66 100644
--- a/x11/kf6-frameworkintegration/distinfo
+++ b/x11/kf6-frameworkintegration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749476635
-SHA256 (KDE/frameworks/6.15/frameworkintegration-6.15.0.tar.xz) = 6e64870e5d3dcee2a7f7d0a509b5236667fa11f78dd38cd8923911f1ca7ba786
-SIZE (KDE/frameworks/6.15/frameworkintegration-6.15.0.tar.xz) = 56824
+TIMESTAMP = 1752529534
+SHA256 (KDE/frameworks/6.16/frameworkintegration-6.16.0.tar.xz) = a0e3e2c5776b19e2de6273893f0c927ef7eadea86a6301f21e18377cb75907fc
+SIZE (KDE/frameworks/6.16/frameworkintegration-6.16.0.tar.xz) = 56840
diff --git a/x11/kf6-kded/distinfo b/x11/kf6-kded/distinfo
index 030c27980e9c..4ad8d428f20e 100644
--- a/x11/kf6-kded/distinfo
+++ b/x11/kf6-kded/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749476635
-SHA256 (KDE/frameworks/6.15/kded-6.15.0.tar.xz) = 0b4c0f1940fe1f18d4dacc67f663f6d38221de677f94d9fb39886a2b0616d434
-SIZE (KDE/frameworks/6.15/kded-6.15.0.tar.xz) = 35236
+TIMESTAMP = 1752529534
+SHA256 (KDE/frameworks/6.16/kded-6.16.0.tar.xz) = 49372fb01dd53c25b2789603ed6ae85fe54a712ed7f7426c884d075d31381b2a
+SIZE (KDE/frameworks/6.16/kded-6.16.0.tar.xz) = 35228
diff --git a/x11/kf6-kglobalaccel/distinfo b/x11/kf6-kglobalaccel/distinfo
index b31cc20736d3..2b66f0d22d3d 100644
--- a/x11/kf6-kglobalaccel/distinfo
+++ b/x11/kf6-kglobalaccel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749476636
-SHA256 (KDE/frameworks/6.15/kglobalaccel-6.15.0.tar.xz) = 84ea777a53939483cd97d1ddc069333af1e81419bfee0f6dc5db4d3d360ab554
-SIZE (KDE/frameworks/6.15/kglobalaccel-6.15.0.tar.xz) = 2271800
+TIMESTAMP = 1752529535
+SHA256 (KDE/frameworks/6.16/kglobalaccel-6.16.0.tar.xz) = 6663461a82798b5dccb9f44e91c0c37e12c951f87e295c3ba7f465dac7bd4aa1
+SIZE (KDE/frameworks/6.16/kglobalaccel-6.16.0.tar.xz) = 2271584
diff --git a/x11/kf6-krunner/distinfo b/x11/kf6-krunner/distinfo
index 6f5a86e429d8..4b3e2416b904 100644
--- a/x11/kf6-krunner/distinfo
+++ b/x11/kf6-krunner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749476636
-SHA256 (KDE/frameworks/6.15/krunner-6.15.0.tar.xz) = 8cae27106d33542279a5cec62bcc0ecafec8b540f538338f74a27fa0d092f9f3
-SIZE (KDE/frameworks/6.15/krunner-6.15.0.tar.xz) = 135220
+TIMESTAMP = 1752529536
+SHA256 (KDE/frameworks/6.16/krunner-6.16.0.tar.xz) = f311741131552d14875880707d70402028bfb000d0d96f8073464311fcab5dbc
+SIZE (KDE/frameworks/6.16/krunner-6.16.0.tar.xz) = 135240
diff --git a/x11/kf6-kwindowsystem/distinfo b/x11/kf6-kwindowsystem/distinfo
index de3fec3b6b23..9d01db92f846 100644
--- a/x11/kf6-kwindowsystem/distinfo
+++ b/x11/kf6-kwindowsystem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749476636
-SHA256 (KDE/frameworks/6.15/kwindowsystem-6.15.0.tar.xz) = 39d6ab63be57ed44c3cfc6131ba8e5073a9f92a5f27bc58f638b079dd063e4c0
-SIZE (KDE/frameworks/6.15/kwindowsystem-6.15.0.tar.xz) = 2362788
+TIMESTAMP = 1752529536
+SHA256 (KDE/frameworks/6.16/kwindowsystem-6.16.0.tar.xz) = dc3b5ac5e5eaea5b76af8e85f065ddbce91ff7e3fcc13c6d600ad53bb53b1b31
+SIZE (KDE/frameworks/6.16/kwindowsystem-6.16.0.tar.xz) = 2362540
diff --git a/x11/plasma6-kactivitymanagerd/distinfo b/x11/plasma6-kactivitymanagerd/distinfo
index 253bf85eac70..70f0a26e9e88 100644
--- a/x11/plasma6-kactivitymanagerd/distinfo
+++ b/x11/plasma6-kactivitymanagerd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380631
-SHA256 (KDE/plasma/6.4.2/kactivitymanagerd-6.4.2.tar.xz) = 1ab68540247b207ae14be46477b604a8e8ff03dab007e9fce160d230fe83b6c3
-SIZE (KDE/plasma/6.4.2/kactivitymanagerd-6.4.2.tar.xz) = 101588
+TIMESTAMP = 1752584482
+SHA256 (KDE/plasma/6.4.3/kactivitymanagerd-6.4.3.tar.xz) = e9eb2b063bfc469d465a8afbdf0ec76a0410ca3f68f7666c50b5012315b6a68b
+SIZE (KDE/plasma/6.4.3/kactivitymanagerd-6.4.3.tar.xz) = 101548
diff --git a/x11/plasma6-kgamma/distinfo b/x11/plasma6-kgamma/distinfo
index 0c6ba91f1835..ff45986a8f7d 100644
--- a/x11/plasma6-kgamma/distinfo
+++ b/x11/plasma6-kgamma/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380632
-SHA256 (KDE/plasma/6.4.2/kgamma-6.4.2.tar.xz) = ff825988ba5444d0fee6e338c643d7d31db7d1f35be2dc62ce67f6ee801c8f1b
-SIZE (KDE/plasma/6.4.2/kgamma-6.4.2.tar.xz) = 87704
+TIMESTAMP = 1752584483
+SHA256 (KDE/plasma/6.4.3/kgamma-6.4.3.tar.xz) = d85f86f6fd9b0173395623b518a4060951c10f7506c561b999818e819b13ec0e
+SIZE (KDE/plasma/6.4.3/kgamma-6.4.3.tar.xz) = 87664
diff --git a/x11/plasma6-kglobalacceld/distinfo b/x11/plasma6-kglobalacceld/distinfo
index c40d70715220..5c6eab76c962 100644
--- a/x11/plasma6-kglobalacceld/distinfo
+++ b/x11/plasma6-kglobalacceld/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380633
-SHA256 (KDE/plasma/6.4.2/kglobalacceld-6.4.2.tar.xz) = 9f7ca2533aae3d5cd13895f47ae07bfdba4165af01ccaa460d645b3c4d2a51e4
-SIZE (KDE/plasma/6.4.2/kglobalacceld-6.4.2.tar.xz) = 56488
+TIMESTAMP = 1752584483
+SHA256 (KDE/plasma/6.4.3/kglobalacceld-6.4.3.tar.xz) = a69c787e1b133ad5e99f3f83d1a195721f27e5200cc60cdba70d8dc03acc4378
+SIZE (KDE/plasma/6.4.3/kglobalacceld-6.4.3.tar.xz) = 56480
diff --git a/x11/plasma6-kscreen/distinfo b/x11/plasma6-kscreen/distinfo
index 5e54938c7641..02340adaea4c 100644
--- a/x11/plasma6-kscreen/distinfo
+++ b/x11/plasma6-kscreen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380635
-SHA256 (KDE/plasma/6.4.2/kscreen-6.4.2.tar.xz) = 771a6c4a17c34db7628bab58ee6d1977d58eee28a4d394fb9ec208cf79e76819
-SIZE (KDE/plasma/6.4.2/kscreen-6.4.2.tar.xz) = 31776068
+TIMESTAMP = 1752584483
+SHA256 (KDE/plasma/6.4.3/kscreen-6.4.3.tar.xz) = 37ef7032a2136293cfeceb41faeff525de80c7119cd8c854116b8b300efa60a9
+SIZE (KDE/plasma/6.4.3/kscreen-6.4.3.tar.xz) = 31776464
diff --git a/x11/plasma6-kwayland/distinfo b/x11/plasma6-kwayland/distinfo
index a71d76584417..76ac47b91564 100644
--- a/x11/plasma6-kwayland/distinfo
+++ b/x11/plasma6-kwayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380636
-SHA256 (KDE/plasma/6.4.2/kwayland-6.4.2.tar.xz) = 828dd9c1ec327721583d6f04a4413f08f6ffd9350c51de16986359aa70c808d7
-SIZE (KDE/plasma/6.4.2/kwayland-6.4.2.tar.xz) = 132836
+TIMESTAMP = 1752584483
+SHA256 (KDE/plasma/6.4.3/kwayland-6.4.3.tar.xz) = ff507d3c435407b3831ead1ea63f6dea6c778ba6a1f5b45895d5fec6f5c1f982
+SIZE (KDE/plasma/6.4.3/kwayland-6.4.3.tar.xz) = 132836
diff --git a/x11/plasma6-layer-shell-qt/distinfo b/x11/plasma6-layer-shell-qt/distinfo
index c1b521679475..f48028aacecd 100644
--- a/x11/plasma6-layer-shell-qt/distinfo
+++ b/x11/plasma6-layer-shell-qt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380636
-SHA256 (KDE/plasma/6.4.2/layer-shell-qt-6.4.2.tar.xz) = 7bead02f506e7c1efadc61588cc52e8ed2fa467ca183485c3b7280c08a5a6312
-SIZE (KDE/plasma/6.4.2/layer-shell-qt-6.4.2.tar.xz) = 35748
+TIMESTAMP = 1752584484
+SHA256 (KDE/plasma/6.4.3/layer-shell-qt-6.4.3.tar.xz) = 33e64ec0cd2d9e9547c3c3faa9c4d6a2006bf681fac361511f441b51f9dddb7c
+SIZE (KDE/plasma/6.4.3/layer-shell-qt-6.4.3.tar.xz) = 35744
diff --git a/x11/plasma6-libkscreen/distinfo b/x11/plasma6-libkscreen/distinfo
index a6c825db2305..0dec2a7d8c7c 100644
--- a/x11/plasma6-libkscreen/distinfo
+++ b/x11/plasma6-libkscreen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380639
-SHA256 (KDE/plasma/6.4.2/libkscreen-6.4.2.tar.xz) = 73dfbaf6c437a5c1d01f768b4f140070d047f8fec306442acd93ab54837ec1aa
-SIZE (KDE/plasma/6.4.2/libkscreen-6.4.2.tar.xz) = 122336
+TIMESTAMP = 1752584486
+SHA256 (KDE/plasma/6.4.3/libkscreen-6.4.3.tar.xz) = a25f0604110652c847e000ede6fde9f277eb38850edeabde3e3a41d2eb81b06b
+SIZE (KDE/plasma/6.4.3/libkscreen-6.4.3.tar.xz) = 122376
diff --git a/x11/plasma6-libplasma/distinfo b/x11/plasma6-libplasma/distinfo
index edc45b1b83e0..513c1cf12caa 100644
--- a/x11/plasma6-libplasma/distinfo
+++ b/x11/plasma6-libplasma/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380641
-SHA256 (KDE/plasma/6.4.2/libplasma-6.4.2.tar.xz) = a9bb5532e6efb30833c76b5e2e0fb1ce1aae540beb6813b69163d20b96d560ac
-SIZE (KDE/plasma/6.4.2/libplasma-6.4.2.tar.xz) = 1970176
+TIMESTAMP = 1752584486
+SHA256 (KDE/plasma/6.4.3/libplasma-6.4.3.tar.xz) = f508ceced32a114462e5e31195600ee440a1a21b8eb77ba20033cfb892bb0cc8
+SIZE (KDE/plasma/6.4.3/libplasma-6.4.3.tar.xz) = 1970352
diff --git a/x11/plasma6-plasma-activities-stats/distinfo b/x11/plasma6-plasma-activities-stats/distinfo
index d1e448186289..61d40b43376d 100644
--- a/x11/plasma6-plasma-activities-stats/distinfo
+++ b/x11/plasma6-plasma-activities-stats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380647
-SHA256 (KDE/plasma/6.4.2/plasma-activities-stats-6.4.2.tar.xz) = c689f51d29f0b65a913e6d746484347d516df9a172f2c51e7bc85cade72a8e7a
-SIZE (KDE/plasma/6.4.2/plasma-activities-stats-6.4.2.tar.xz) = 83020
+TIMESTAMP = 1752584491
+SHA256 (KDE/plasma/6.4.3/plasma-activities-stats-6.4.3.tar.xz) = 991002e3da9b5969b9583cd169050a23aacbe02f2d7d4ab1a19f5bd7c72b3b6b
+SIZE (KDE/plasma/6.4.3/plasma-activities-stats-6.4.3.tar.xz) = 83032
diff --git a/x11/plasma6-plasma-activities/distinfo b/x11/plasma6-plasma-activities/distinfo
index 84b01c01ef13..f5d8f270023f 100644
--- a/x11/plasma6-plasma-activities/distinfo
+++ b/x11/plasma6-plasma-activities/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380644
-SHA256 (KDE/plasma/6.4.2/plasma-activities-6.4.2.tar.xz) = bbca03ac6a6a71958b4426d575ec68239925cd3ed1cba5bd171b7e7b8605a8db
-SIZE (KDE/plasma/6.4.2/plasma-activities-6.4.2.tar.xz) = 66388
+TIMESTAMP = 1752584489
+SHA256 (KDE/plasma/6.4.3/plasma-activities-6.4.3.tar.xz) = 1c8dca746602defacd495b9ae637c1700d3be7e7e3cc5d499a5fd669a0b98ef0
+SIZE (KDE/plasma/6.4.3/plasma-activities-6.4.3.tar.xz) = 66368
diff --git a/x11/plasma6-plasma-desktop/distinfo b/x11/plasma6-plasma-desktop/distinfo
index 2c1a4a73304d..de2a2b26c17b 100644
--- a/x11/plasma6-plasma-desktop/distinfo
+++ b/x11/plasma6-plasma-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380648
-SHA256 (KDE/plasma/6.4.2/plasma-desktop-6.4.2.tar.xz) = 329691b92f368c22114604650e39db91c63870c80c0c08e853c6a040dbd30a84
-SIZE (KDE/plasma/6.4.2/plasma-desktop-6.4.2.tar.xz) = 16748724
+TIMESTAMP = 1752584492
+SHA256 (KDE/plasma/6.4.3/plasma-desktop-6.4.3.tar.xz) = 190a3f558f6b3fa92164c3f269e70ffd1e981e352dd718a43a4cb007245aa525
+SIZE (KDE/plasma/6.4.3/plasma-desktop-6.4.3.tar.xz) = 16748780
diff --git a/x11/plasma6-plasma-integration/distinfo b/x11/plasma6-plasma-integration/distinfo
index f3f12d1f801e..10bb36c0fa2f 100644
--- a/x11/plasma6-plasma-integration/distinfo
+++ b/x11/plasma6-plasma-integration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380649
-SHA256 (KDE/plasma/6.4.2/plasma-integration-6.4.2.tar.xz) = f0b56ce04ae1117cc0f22a72a600164fd2148a25b7e79dc0c4c507f88990a5cc
-SIZE (KDE/plasma/6.4.2/plasma-integration-6.4.2.tar.xz) = 97828
+TIMESTAMP = 1752584492
+SHA256 (KDE/plasma/6.4.3/plasma-integration-6.4.3.tar.xz) = 71f3e643d7b7f33fc2e473850424dcfb00c3258d7fe2e271a032621333288bd7
+SIZE (KDE/plasma/6.4.3/plasma-integration-6.4.3.tar.xz) = 97824
diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile
index c083fcb7630d..5affef0be1cf 100644
--- a/x11/plasma6-plasma-workspace/Makefile
+++ b/x11/plasma6-plasma-workspace/Makefile
@@ -47,7 +47,8 @@ USE_QT= 5compat base declarative location svg wayland
USE_XORG= ice sm x11 xau xcb xcursor xext xfixes xft xi xrender xtst
SHEBANG_FILES= components/calendar/kconf_update/migrate-calendar-to-plugin-id.py.in
-CMAKE_ON= PLASMA_X11_DEFAULT_SESSION
+CMAKE_ON= PLASMA_X11_DEFAULT_SESSION \
+ CMAKE_DISABLE_FIND_PACKAGE_KF6NetworkManagerQt
OPTIONS_DEFINE= GTK
diff --git a/x11/plasma6-plasma-workspace/distinfo b/x11/plasma6-plasma-workspace/distinfo
index 4b5111a2f91a..311b61db7e15 100644
--- a/x11/plasma6-plasma-workspace/distinfo
+++ b/x11/plasma6-plasma-workspace/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751380651
-SHA256 (KDE/plasma/6.4.2/plasma-workspace-6.4.2.tar.xz) = ed657be39ec9bc1d4e5ba4c5e717b4ab683dd27bececfaef6e7e209f771b4850
-SIZE (KDE/plasma/6.4.2/plasma-workspace-6.4.2.tar.xz) = 20819960
+TIMESTAMP = 1752584492
+SHA256 (KDE/plasma/6.4.3/plasma-workspace-6.4.3.tar.xz) = 7254f285a91ec802b0612a7adb242d98362accdff866fc1285bb65b8048dedb8
+SIZE (KDE/plasma/6.4.3/plasma-workspace-6.4.3.tar.xz) = 20821552
diff --git a/x11/py-python-xapp/Makefile b/x11/py-python-xapp/Makefile
index 4cedbf58113e..8e16f3093490 100644
--- a/x11/py-python-xapp/Makefile
+++ b/x11/py-python-xapp/Makefile
@@ -1,6 +1,5 @@
PORTNAME= python-xapp
-DISTVERSION= 2.4.1
-PORTREVISION= 1
+DISTVERSION= 2.4.2
CATEGORIES= x11 gnome
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= gnome
diff --git a/x11/py-python-xapp/distinfo b/x11/py-python-xapp/distinfo
index d78cd164de61..18854ef67c69 100644
--- a/x11/py-python-xapp/distinfo
+++ b/x11/py-python-xapp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716277794
-SHA256 (gnome/linuxmint-python3-xapp-2.4.1_GH0.tar.gz) = d994f922a9816c71d9b565f4b2552cba4ca33011efb1203fb8199d9b2d0d7f3d
-SIZE (gnome/linuxmint-python3-xapp-2.4.1_GH0.tar.gz) = 21181
+TIMESTAMP = 1735622936
+SHA256 (gnome/linuxmint-python3-xapp-2.4.2_GH0.tar.gz) = 39e4c3f06732e9d197b9aed31444653da2976c1d66dded870b52cc9782f2237d
+SIZE (gnome/linuxmint-python3-xapp-2.4.2_GH0.tar.gz) = 21482
diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile
index b85a083cd1d0..1ce95e8c1d70 100644
--- a/x11/py-pyvirtualdisplay/Makefile
+++ b/x11/py-pyvirtualdisplay/Makefile
@@ -1,6 +1,6 @@
PORTNAME= pyvirtualdisplay
PORTVERSION= 0.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ WWW= https://github.com/ponty/pyvirtualdisplay
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cogapp>=2.3:devel/py-cogapp@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \
diff --git a/x11/remontoire/Makefile b/x11/remontoire/Makefile
index e47082e7e866..09c18e22b287 100644
--- a/x11/remontoire/Makefile
+++ b/x11/remontoire/Makefile
@@ -1,25 +1,29 @@
PORTNAME= remontoire
-DISTVERSION= 1.4.0
-PORTREVISION= 2
+DISTVERSIONPREFIX= v
+DISTVERSION= 1.4.4
CATEGORIES= x11
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= atanubiswas484@gmail.com
COMMENT= Keybinding viewer for i3 and other programs
WWW= https://github.com/regolith-linux/remontoire
LICENSE= GPLv3
+BUILD_DEPENDS= appstream-util:devel/appstream-glib
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libjson-glib-1.0.so:devel/json-glib
-USES= gettext-tools gnome meson pkgconfig python:build shebangfix vala:build
+USES= desktop-file-utils gettext-tools gnome meson pkgconfig \
+ python:build shebangfix vala:build
USE_GITHUB= yes
-USE_GNOME= gtk30
GH_ACCOUNT= regolith-linux
+USE_GNOME= gtk30
+GLIB_SCHEMAS= org.regolith-linux.remontoire.gschema.xml
+
SHEBANG_FILES= build-aux/meson/postinstall.py
+
PLIST_FILES= bin/${PORTNAME} \
share/appdata/org.regolith-linux.remontoire.appdata.xml \
share/applications/org.regolith-linux.remontoire.desktop
-GLIB_SCHEMAS= org.regolith-linux.remontoire.gschema.xml
.include <bsd.port.mk>
diff --git a/x11/remontoire/distinfo b/x11/remontoire/distinfo
index 0d2db9199787..92690cc1ebea 100644
--- a/x11/remontoire/distinfo
+++ b/x11/remontoire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602948600
-SHA256 (regolith-linux-remontoire-1.4.0_GH0.tar.gz) = 35777a10a753b15debe64867deca2332733f6bee6b85936e75e0e0514aa900da
-SIZE (regolith-linux-remontoire-1.4.0_GH0.tar.gz) = 25130
+TIMESTAMP = 1752440082
+SHA256 (regolith-linux-remontoire-v1.4.4_GH0.tar.gz) = a54ebc08e6d4f63806df2dc0f88e4ef57433aa2d7712b36ddb788cc81c943016
+SIZE (regolith-linux-remontoire-v1.4.4_GH0.tar.gz) = 41267
diff --git a/x11/rio/Makefile b/x11/rio/Makefile
index 62245e643ba5..edd357a5c749 100644
--- a/x11/rio/Makefile
+++ b/x11/rio/Makefile
@@ -14,6 +14,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_armv7= rustc-LLVM ERROR: out of memory
+BROKEN_i386= rustc-LLVM ERROR: out of memory
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
diff --git a/x11/swaync/Makefile b/x11/swaync/Makefile
index 8925b0b4fc0b..28ba8978fdf4 100644
--- a/x11/swaync/Makefile
+++ b/x11/swaync/Makefile
@@ -1,6 +1,6 @@
PORTNAME= swaync
DISTVERSIONPREFIX= v
-PORTVERSION= 0.12.0
+PORTVERSION= 0.12.1
CATEGORIES= x11 wayland
MAINTAINER= jbeich@FreeBSD.org
diff --git a/x11/swaync/distinfo b/x11/swaync/distinfo
index eb175a7065c8..26d159374762 100644
--- a/x11/swaync/distinfo
+++ b/x11/swaync/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752236102
-SHA256 (ErikReider-SwayNotificationCenter-v0.12.0_GH0.tar.gz) = 9dcc103fddad0cff872755c09c937642989e6bc0af73040e2af7982667bfdec7
-SIZE (ErikReider-SwayNotificationCenter-v0.12.0_GH0.tar.gz) = 1726976
+TIMESTAMP = 1752571530
+SHA256 (ErikReider-SwayNotificationCenter-v0.12.1_GH0.tar.gz) = 8a6475bfdd8abf5be1267ede0a233266b3f14311b169047bde599752a3ac981c
+SIZE (ErikReider-SwayNotificationCenter-v0.12.1_GH0.tar.gz) = 1727353
diff --git a/x11/xapp/Makefile b/x11/xapp/Makefile
index cea1e537bb49..b0a81033e525 100644
--- a/x11/xapp/Makefile
+++ b/x11/xapp/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xapp
-PORTVERSION= 2.8.2
+DISTVERSION= 2.8.9
PORTREVISION= 1
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome
@@ -14,25 +14,48 @@ LICENSE_FILE?= ${WRKSRC}/COPYING.LESSER
LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu
RUN_DEPENDS= bash:shells/bash
-USES= gettext-tools gnome meson pkgconfig python shebangfix vala:build xorg
+USES= gettext-tools gnome meson pkgconfig python shebangfix xorg
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
-USE_GNOME= cairo gdkpixbuf glib20 gtk-update-icon-cache gtk30 \
- intltool introspection:build libgnomekbd pygobject3
+USE_GNOME= cairo gdkpixbuf glib20 gtk30 libgnomekbd
USE_LDCONFIG= yes
USE_XORG= x11
GLIB_SCHEMAS= org.x.apps.gschema.xml
-SHEBANG_FILES= data libxapp meson-scripts schemas scripts status-applets \
- test-scripts
+SHEBANG_FILES= data schemas scripts status-applets test-scripts
PLIST_SUB+= LIBVERSION=${PORTVERSION}
PORTSCOUT= limit:^[0-9.]+$$ # ignore master.mint* tags
-OPTIONS_DEFINE= DOCS
-OPTIONS_SUB= yes
+BINARY_ALIAS= python3=${PYTHON_CMD}
+
+OPTIONS_DEFINE= DOCS INTROSPECTION MATE STATUS VAPI XFCE
+OPTIONS_DEFAULT= INTROSPECTION MATE STATUS VAPI XFCE
+OPTIONS_SUB= yes
DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
-DOCS_MESON_ON= -Ddocs=true
+DOCS_MESON_TRUE= docs
+
+INTROSPECTION_DESC= Enable GObject introspection
+INTROSPECTION_MESON_TRUE= introspection
+INTROSPECTION_USE= GNOME=pygobject3,introspection:build
+
+MATE_DESC= Install mate specific items
+MATE_MESON_TRUE= mate
+
+STATUS_DESC= Build the XApp StatusNotifier service
+STATUS_MESON_TRUE= status-notifier
+
+VAPI_DESC= Enable Vala bindings
+VAPI_MESON_TRUE= vapi
+VAPI_USES= vala:build
+VAPI_IMPLIES= INTROSPECTION
+
+XFCE_DESC= Install xfce specific items
+XFCE_MESON_TRUE= xfce
+
+post-patch:
+ ${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' \
+ ${WRKSRC}/scripts/upload-system-info
.include <bsd.port.mk>
diff --git a/x11/xapp/distinfo b/x11/xapp/distinfo
index 6dbec6861fcc..00419dd36ad1 100644
--- a/x11/xapp/distinfo
+++ b/x11/xapp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716275951
-SHA256 (gnome/linuxmint-xapp-2.8.2_GH0.tar.gz) = 07b00d02d2bdd93c043e370305071df80f21ded6404f7309b590a8f896e635b2
-SIZE (gnome/linuxmint-xapp-2.8.2_GH0.tar.gz) = 272539
+TIMESTAMP = 1752081537
+SHA256 (gnome/linuxmint-xapp-2.8.9_GH0.tar.gz) = cc2de98f8b2c73f7611af770d398a05560c4419b9390000464b8bcd517c70375
+SIZE (gnome/linuxmint-xapp-2.8.9_GH0.tar.gz) = 276821
diff --git a/x11/xapp/pkg-plist b/x11/xapp/pkg-plist
index 9e039328b5f6..1795c71e19e2 100644
--- a/x11/xapp/pkg-plist
+++ b/x11/xapp/pkg-plist
@@ -1,9 +1,9 @@
bin/pastebin
bin/upload-system-info
bin/xapp-gpu-offload
-bin/xfce4-set-wallpaper
+%%XFCE%%bin/xfce4-set-wallpaper
etc/X11/xinit/xinitrc.d/80xapp-gtk3-module.sh
-etc/xdg/autostart/xapp-sn-watcher.desktop
+%%STATUS%%etc/xdg/autostart/xapp-sn-watcher.desktop
include/xapp/libxapp/xapp-dark-mode-manager.h
include/xapp/libxapp/xapp-favorites.h
include/xapp/libxapp/xapp-gpu-offload-helper.h
@@ -20,50 +20,50 @@ include/xapp/libxapp/xapp-statusicon-interface.h
include/xapp/libxapp/xapp-style-manager.h
include/xapp/libxapp/xapp-util.h
include/xapp/libxapp/xapp-visibility-group.h
-lib/girepository-1.0/XApp-1.0.typelib
+%%INTROSPECTION%%lib/girepository-1.0/XApp-1.0.typelib
lib/gtk-3.0/modules/libxapp-gtk3-module.so
lib/libxapp.so
lib/libxapp.so.1
lib/libxapp.so.%%LIBVERSION%%
-%%PYTHON_SITELIBDIR%%/gi/overrides/XApp.py
-lib/xapps/xapp-sn-watcher
+%%INTROSPECTION%%%%PYTHON_SITELIBDIR%%/gi/overrides/XApp.py
+%%STATUS%%lib/xapps/xapp-sn-watcher
libdata/pkgconfig/xapp.pc
-libexec/xapps/applet_constants.py
-libexec/xapps/mate-xapp-status-applet.py
-share/dbus-1/services/org.mate.panel.applet.MateXAppStatusAppletFactory.service
-share/dbus-1/services/org.x.StatusNotifierWatcher.service
-share/gir-1.0/XApp-1.0.gir
+%%MATE%%libexec/xapps/applet_constants.py
+%%MATE%%libexec/xapps/mate-xapp-status-applet.py
+%%MATE%%share/dbus-1/services/org.mate.panel.applet.MateXAppStatusAppletFactory.service
+%%STATUS%%share/dbus-1/services/org.x.StatusNotifierWatcher.service
+%%INTROSPECTION%%share/gir-1.0/XApp-1.0.gir
share/glade/catalogs/xapp-glade-catalog.xml
-%%DOCS%%share/gtk-doc/html/libxapp/XAppDarkModeManager.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppFavorites.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppGpuOffloadHelper.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppGtkWindow.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppIconChooserButton.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppIconChooserDialog.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppKbdLayoutController.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppMonitorBlanker.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppObjectManagerClient.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppPreferencesWindow.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppStackSidebar.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppStatusIcon.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppStatusIconMonitor.html
-%%DOCS%%share/gtk-doc/html/libxapp/XAppVisibilityGroup.html
-%%DOCS%%share/gtk-doc/html/libxapp/annotation-glossary.html
-%%DOCS%%share/gtk-doc/html/libxapp/api-index-full.html
-%%DOCS%%share/gtk-doc/html/libxapp/ch01.html
-%%DOCS%%share/gtk-doc/html/libxapp/deprecated-api-index.html
-%%DOCS%%share/gtk-doc/html/libxapp/home.png
-%%DOCS%%share/gtk-doc/html/libxapp/index.html
-%%DOCS%%share/gtk-doc/html/libxapp/left-insensitive.png
-%%DOCS%%share/gtk-doc/html/libxapp/left.png
-%%DOCS%%share/gtk-doc/html/libxapp/libxapp-xapp-util.html
-%%DOCS%%share/gtk-doc/html/libxapp/libxapp.devhelp2
-%%DOCS%%share/gtk-doc/html/libxapp/object-tree.html
-%%DOCS%%share/gtk-doc/html/libxapp/right-insensitive.png
-%%DOCS%%share/gtk-doc/html/libxapp/right.png
-%%DOCS%%share/gtk-doc/html/libxapp/style.css
-%%DOCS%%share/gtk-doc/html/libxapp/up-insensitive.png
-%%DOCS%%share/gtk-doc/html/libxapp/up.png
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppDarkModeManager.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppFavorites.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppGpuOffloadHelper.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppGtkWindow.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppIconChooserButton.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppIconChooserDialog.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppKbdLayoutController.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppMonitorBlanker.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppObjectManagerClient.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppPreferencesWindow.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppStackSidebar.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppStatusIcon.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppStatusIconMonitor.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/XAppVisibilityGroup.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/home.png
+%%PORTDOCS%%share/gtk-doc/html/libxapp/index.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxapp/left.png
+%%PORTDOCS%%share/gtk-doc/html/libxapp/libxapp-xapp-util.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/libxapp.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libxapp/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/libxapp/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxapp/right.png
+%%PORTDOCS%%share/gtk-doc/html/libxapp/style.css
+%%PORTDOCS%%share/gtk-doc/html/libxapp/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxapp/up.png
share/icons/hicolor/scalable/actions/add-files-to-archive-symbolic.svg
share/icons/hicolor/scalable/actions/category-search-symbolic.svg
share/icons/hicolor/scalable/actions/extract-archive-symbolic.svg
@@ -107,24 +107,30 @@ share/icons/hicolor/scalable/places/xapp-user-favorites.svg
share/locale/af/LC_MESSAGES/xapp.mo
share/locale/am/LC_MESSAGES/xapp.mo
share/locale/ar/LC_MESSAGES/xapp.mo
+share/locale/ast/LC_MESSAGES/xapp.mo
share/locale/az/LC_MESSAGES/xapp.mo
share/locale/be/LC_MESSAGES/xapp.mo
share/locale/ber/LC_MESSAGES/xapp.mo
share/locale/bg/LC_MESSAGES/xapp.mo
share/locale/bn/LC_MESSAGES/xapp.mo
+share/locale/br/LC_MESSAGES/xapp.mo
share/locale/ca/LC_MESSAGES/xapp.mo
share/locale/ca@valencia/LC_MESSAGES/xapp.mo
+share/locale/ckb/LC_MESSAGES/xapp.mo
share/locale/cs/LC_MESSAGES/xapp.mo
share/locale/cy/LC_MESSAGES/xapp.mo
share/locale/da/LC_MESSAGES/xapp.mo
share/locale/de/LC_MESSAGES/xapp.mo
share/locale/el/LC_MESSAGES/xapp.mo
+share/locale/en_CA/LC_MESSAGES/xapp.mo
share/locale/en_GB/LC_MESSAGES/xapp.mo
share/locale/eo/LC_MESSAGES/xapp.mo
share/locale/es/LC_MESSAGES/xapp.mo
share/locale/et/LC_MESSAGES/xapp.mo
share/locale/eu/LC_MESSAGES/xapp.mo
+share/locale/fa/LC_MESSAGES/xapp.mo
share/locale/fi/LC_MESSAGES/xapp.mo
+share/locale/fil/LC_MESSAGES/xapp.mo
share/locale/fr/LC_MESSAGES/xapp.mo
share/locale/fr_CA/LC_MESSAGES/xapp.mo
share/locale/he/LC_MESSAGES/xapp.mo
@@ -146,6 +152,7 @@ share/locale/la/LC_MESSAGES/xapp.mo
share/locale/lt/LC_MESSAGES/xapp.mo
share/locale/mai/LC_MESSAGES/xapp.mo
share/locale/ms/LC_MESSAGES/xapp.mo
+share/locale/nb/LC_MESSAGES/xapp.mo
share/locale/nl/LC_MESSAGES/xapp.mo
share/locale/oc/LC_MESSAGES/xapp.mo
share/locale/pl/LC_MESSAGES/xapp.mo
@@ -155,16 +162,20 @@ share/locale/ro/LC_MESSAGES/xapp.mo
share/locale/ru/LC_MESSAGES/xapp.mo
share/locale/sk/LC_MESSAGES/xapp.mo
share/locale/sl/LC_MESSAGES/xapp.mo
+share/locale/sn/LC_MESSAGES/xapp.mo
share/locale/sr/LC_MESSAGES/xapp.mo
share/locale/sr@latin/LC_MESSAGES/xapp.mo
share/locale/sv/LC_MESSAGES/xapp.mo
+share/locale/te/LC_MESSAGES/xapp.mo
+share/locale/th/LC_MESSAGES/xapp.mo
share/locale/tr/LC_MESSAGES/xapp.mo
share/locale/uk/LC_MESSAGES/xapp.mo
share/locale/uz/LC_MESSAGES/xapp.mo
+share/locale/vi/LC_MESSAGES/xapp.mo
share/locale/zgh/LC_MESSAGES/xapp.mo
share/locale/zh_CN/LC_MESSAGES/xapp.mo
share/locale/zh_HK/LC_MESSAGES/xapp.mo
share/locale/zh_TW/LC_MESSAGES/xapp.mo
-share/mate-panel/applets/org.x.MateXAppStatusApplet.mate-panel-applet
-share/vala/vapi/xapp.deps
-share/vala/vapi/xapp.vapi
+%%MATE%%share/mate-panel/applets/org.x.MateXAppStatusApplet.mate-panel-applet
+%%VAPI%%share/vala/vapi/xapp.deps
+%%VAPI%%share/vala/vapi/xapp.vapi
diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile
index 571a5a031ffd..9b27c596b396 100644
--- a/x11/xfce4-screensaver/Makefile
+++ b/x11/xfce4-screensaver/Makefile
@@ -1,57 +1,56 @@
PORTNAME= xfce4-screensaver
-PORTVERSION= 4.18.4
-PORTREVISION= 1
+PORTVERSION= 4.20.0
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= Xfce 4 screen saver and locker
-WWW= https://git.xfce.org/apps/xfce4-screensaver/about/
+WWW= https://docs.xfce.org/apps/xfce4-screensaver/start
LICENSE= GPLv2 LGPL20
LICENSE_COMB= dual
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB
-BUILD_DEPENDS= xdt-csource:devel/xfce4-dev-tools
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libharfbuzz.so:print/harfbuzz \
libxklavier.so:x11/libxklavier
-USES= compiler:c11 gettext-tools gl gmake gnome pkgconfig python \
- shebangfix tar:bzip2 xfce xorg
+USES= compiler:c11 gettext-tools gl gnome meson pkgconfig python \
+ shebangfix tar:xz xfce xorg
USE_GL= gl
-USE_GNOME= cairo gdkpixbuf glib20 gtk30 intltool libwnck3
+USE_GNOME= glib20 gtk30 libwnck3
USE_XFCE= garcon xfconf
USE_XORG= ice sm x11 xext xrandr xscrnsaver xxf86vm
SHEBANG_FILES= src/xfce4-screensaver-configure.py
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-maintainer-mode \
- --with-console-kit=yes \
- --with-systemd=no
+MESON_ARGS= -Dsession-manager=consolekit \
+ -Dwayland=disabled \
+ -Dx11=enabled
SCREENSAVER_DIR= share/applications/screensavers
-OPTIONS_DEFINE= NLS PAM
+PORTDOCS= docbook.css xfce4-screensaver.html
+
+OPTIONS_DEFINE= DOCS NLS PAM
OPTIONS_DEFAULT= PAM
OPTIONS_SUB= yes
-NLS_USES= gettext-runtime
-NLS_CONFIGURE_ENABLE= nls
+DOCS_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \
+ xmlto:textproc/xmlto
+DOCS_MESON_ENABLED= docs
+DOCS_MESON_ON= -Ddocdir=${DOCSDIR}
-PAM_RUN_DEPENDS= pam_helper:security/pam_helper
-PAM_CONFIGURE_ON= --enable-authentication-scheme=helper \
- --with-passwd-helper=${LOCALBASE}/bin/pam_helper
-PAM_CONFIGURE_OFF= --disable-pam
+NLS_USES= gettext-runtime
-.include <bsd.port.pre.mk>
+PAM_RUN_DEPENDS= pam_helper:security/pam_helper
+PAM_MESON_ON= -Dauthentication-scheme=helper \
+ -Dpasswd-helper=${LOCALBASE}/bin/pam_helper
+PAM_MESON_OFF= -Dauthentication-scheme=pwent
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+= --enable-debug=yes
-.endif
+post-patch-NLS-off:
+ @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
post-patch-PAM-on:
@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
@@ -64,4 +63,4 @@ post-install:
post-install-PAM-on:
${INSTALL_DATA} ${FILESDIR}/xfce4-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xfce4-screensaver.sample
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xfce4-screensaver/distinfo b/x11/xfce4-screensaver/distinfo
index cdde698e4225..b4b9b5671324 100644
--- a/x11/xfce4-screensaver/distinfo
+++ b/x11/xfce4-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734778246
-SHA256 (xfce4/xfce4-screensaver-4.18.4.tar.bz2) = cf717d032d2d0555978c479299da992af6dc3363ae7e758af9515c7166eac170
-SIZE (xfce4/xfce4-screensaver-4.18.4.tar.bz2) = 896547
+TIMESTAMP = 1752487125
+SHA256 (xfce4/xfce4-screensaver-4.20.0.tar.xz) = e370298d002848fdb2065fee254cb5b0efa0f2699b74299c234019c8d79b852e
+SIZE (xfce4/xfce4-screensaver-4.20.0.tar.xz) = 273588
diff --git a/x11/xfce4-screensaver/pkg-plist b/x11/xfce4-screensaver/pkg-plist
index 2072f304f9fb..70be1bf11ea4 100644
--- a/x11/xfce4-screensaver/pkg-plist
+++ b/x11/xfce4-screensaver/pkg-plist
@@ -6,7 +6,6 @@ bin/xfce4-screensaver-preferences
etc/xdg/autostart/xfce4-screensaver.desktop
etc/xdg/menus/xfce4-screensavers.menu
libexec/xfce4-screensaver-dialog
-libexec/xfce4-screensaver-gl-helper
libexec/xfce4-screensaver/floaters
libexec/xfce4-screensaver/popsquares
libexec/xfce4-screensaver/slideshow
@@ -60,6 +59,7 @@ share/icons/hicolor/scalable/apps/org.xfce.ScreenSaver.svg
%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-screensaver.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-screensaver.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-screensaver.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-screensaver.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-screensaver.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-screensaver.mo
%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-screensaver.mo