CVS commit: pkgsrc/x11/xfce4-session

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Jun 13 02:32:58 UTC 2025

Modified Files:
        pkgsrc/x11/xfce4-session: Makefile PLIST distinfo
        pkgsrc/x11/xfce4-session/patches: patch-ac patch-scripts_Makefile.in

Log Message:
xfce4-session: update to 4.20.2

4.20.2 (2025-03-24)
======
- build: Fix include order on *BSD
- autotools-build: Be sure gdbus-codegen files are regenerated

4.20.1 (2025-03-23)
======
- wayland: Use labwc's --session option if available
- wayland: Don't pass xfce4-session to the optional compositor cmdline
- build: Add missing dep flags
- build: Automate copyright year management
- build: Replace xdt-csource with glib-compile-resources
- build: Define xfce4 min version >= 4.18
- scripts: Make xflock4 blocking again
- startxfce4: Fix keyboard layout on wayland
- scripts: Remove unused .in level in xinitrc
- build: Add missing checks for headers
- build: Fix wrong include guard
- build: Add missing check for sigprocmask
- autotools-build: Check for xfce4-dev-tools in configure.ac
- build: Add missing dep flags
- build: Get rid of maintainer mode where gdbus-codegen is used
- Improve Wayland support
- Translation Updates:
  Basque, Catalan, Danish, Hungarian, Portuguese (Brazil), Russian,
  Slovak, Ukrainian, Vietnamese


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/x11/xfce4-session/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/xfce4-session/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/xfce4-session/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xfce4-session/patches/patch-ac
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-session/Makefile
diff -u pkgsrc/x11/xfce4-session/Makefile:1.123 pkgsrc/x11/xfce4-session/Makefile:1.124
--- pkgsrc/x11/xfce4-session/Makefile:1.123     Thu Apr 24 14:16:35 2025
+++ pkgsrc/x11/xfce4-session/Makefile   Fri Jun 13 02:32:58 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.123 2025/04/24 14:16:35 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2025/06/13 02:32:58 gutteridge Exp $
 
-PKGREVISION= 2
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=              xfce4-session-4.20.0
+DISTNAME=              xfce4-session-4.20.2
 CATEGORIES=            x11
 MASTER_SITES+=         https://archive.xfce.org/src/xfce/xfce4-session/${PKGVERSION_NOREV:R}/
 
@@ -17,7 +16,7 @@ BUILD_DEFS+=          PKG_SYSCONFBASE
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=       ICEAUTH=${TOOLS_PATH.iceauth}
 
-USE_TOOLS+=            iceauth:run
+USE_TOOLS+=            gdbus-codegen iceauth:run
 
 EGDIR=                 ${XFCE4_EGBASE}
 PKG_SYSCONFSUBDIR=     xdg

Index: pkgsrc/x11/xfce4-session/PLIST
diff -u pkgsrc/x11/xfce4-session/PLIST:1.30 pkgsrc/x11/xfce4-session/PLIST:1.31
--- pkgsrc/x11/xfce4-session/PLIST:1.30 Fri Jan 10 08:59:23 2025
+++ pkgsrc/x11/xfce4-session/PLIST      Fri Jun 13 02:32:58 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2025/01/10 08:59:23 andvar Exp $
+@comment $NetBSD: PLIST,v 1.31 2025/06/13 02:32:58 gutteridge Exp $
 bin/startxfce4
 bin/xfce4-session
 bin/xfce4-session-logout
@@ -112,3 +112,5 @@ share/locale/zh_HK/LC_MESSAGES/xfce4-ses
 share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
 ${PLIST.polkit}share/polkit-1/actions/org.xfce.session.policy
 share/xdg-desktop-portal/xfce-portals.conf
+share/xfce4/labwc/labwc-environment
+share/xfce4/labwc/labwc-rc.xml

Index: pkgsrc/x11/xfce4-session/distinfo
diff -u pkgsrc/x11/xfce4-session/distinfo:1.41 pkgsrc/x11/xfce4-session/distinfo:1.42
--- pkgsrc/x11/xfce4-session/distinfo:1.41      Mon Jan  6 19:27:40 2025
+++ pkgsrc/x11/xfce4-session/distinfo   Fri Jun 13 02:32:58 2025
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.41 2025/01/06 19:27:40 bsiegert Exp $
+$NetBSD: distinfo,v 1.42 2025/06/13 02:32:58 gutteridge Exp $
 
-BLAKE2s (xfce4-session-4.20.0.tar.bz2) = c65d407dd0ba272ebf46f30f6c0cb31644d317d92d68cc12ca3f5dff30b58d0f
-SHA512 (xfce4-session-4.20.0.tar.bz2) = 2e3b1280830fe3b26d39e87fcc26fd2be6df5f1328b64529c46cc51fe80abcc07b2996fd07af331ee2a502f025f40576cfb49a7ddaa9cc82b1f3cf17484f1dd6
-Size (xfce4-session-4.20.0.tar.bz2) = 1185603 bytes
-SHA1 (patch-ac) = acbb27c79b5b6f37ff106c6cbbc87d00ecfe19f5
+BLAKE2s (xfce4-session-4.20.2.tar.bz2) = 470eb3439c335f0d02a380e0bd1cceee656760e94df3650c3684bfb10623bdc5
+SHA512 (xfce4-session-4.20.2.tar.bz2) = 561b10b6efe011dfd2dd43d05fda4282f1950e30a0fdcd28c8a28f420990390e5dc94bf7b6ad344346eabc0c3752c393489d681edab61a6f58e9c81854a45201
+Size (xfce4-session-4.20.2.tar.bz2) = 1226931 bytes
+SHA1 (patch-ac) = a4f8365d0aa036054565f7ff39c025e1240a1583
 SHA1 (patch-config.h.in) = d88c22147d46387494d5be929dce810a6c6d8778
 SHA1 (patch-configure) = 94ec4aa0e528ec835929def8d9d401b123982efa
 SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = 965398a21b5b37a064fb00abf7c4dcb3a4208708
-SHA1 (patch-scripts_Makefile.in) = 3d52c2e302831101a48e3bf39c2cf49e88288529
+SHA1 (patch-scripts_Makefile.in) = 61f25da44554e085eddc15efee659045e47c3c54
 SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1
 SHA1 (patch-xfce4-session_xfsm-shutdown-fallback.c) = 69649cb99423961f2b02f608c8c7253c4caae226
 SHA1 (patch-xfsm-shutdown-helper_main.c) = b5b4bd71d6998a677031b43243005845e7b52f67

Index: pkgsrc/x11/xfce4-session/patches/patch-ac
diff -u pkgsrc/x11/xfce4-session/patches/patch-ac:1.5 pkgsrc/x11/xfce4-session/patches/patch-ac:1.6
--- pkgsrc/x11/xfce4-session/patches/patch-ac:1.5       Sat Aug 17 19:26:19 2019
+++ pkgsrc/x11/xfce4-session/patches/patch-ac   Fri Jun 13 02:32:58 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.5 2019/08/17 19:26:19 gutteridge Exp $
+$NetBSD: patch-ac,v 1.6 2025/06/13 02:32:58 gutteridge Exp $
 
 Adjust config path.
 
---- settings/Makefile.in.orig  2019-08-11 20:13:50.000000000 +0000
+--- settings/Makefile.in.orig  2025-03-24 03:24:44.000000000 +0000
 +++ settings/Makefile.in
-@@ -463,7 +463,7 @@ xfce4_session_settings_LDADD = \
-       $(GIO_LIBS) \
-       $(GMODULE_LIBS)
+@@ -494,7 +494,7 @@ xfce4_session_settings_LDADD = \
+       $(GTK_LIBS) \
+       $(NULL)
  
 -settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
 +settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml

Index: pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in
diff -u pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.4 pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.5
--- pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in:1.4      Mon Jan  6 19:27:40 2025
+++ pkgsrc/x11/xfce4-session/patches/patch-scripts_Makefile.in  Fri Jun 13 02:32:58 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-scripts_Makefile.in,v 1.4 2025/01/06 19:27:40 bsiegert Exp $
+$NetBSD: patch-scripts_Makefile.in,v 1.5 2025/06/13 02:32:58 gutteridge Exp $
 
 Adjust config path.
 
---- scripts/Makefile.in.orig   2024-12-15 09:26:08.000000000 +0000
+--- scripts/Makefile.in.orig   2025-03-24 03:24:43.000000000 +0000
 +++ scripts/Makefile.in
-@@ -387,7 +387,7 @@ edit = $(SED) \
-       -e "s,@_docdir_\@,$$(dirname $(docdir)),g" \
+@@ -389,7 +389,7 @@ edit = $(SED) \
+       -e "s,@_datadir_\@,$(datadir),g" \
        -e "s,@_sysconfdir_\@,$(sysconfdir),g"
  
 -conffilesdir = @sysconfdir@/xdg/xfce4