git: 7f7bb0f4c6ea - main - x11-wm/xfce4-session: Update to 4.20.3

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7f7bb0f4c6ea3efe482c93bf53e54ec6a19cb485

commit 7f7bb0f4c6ea3efe482c93bf53e54ec6a19cb485
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-08-18 14:43:09 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-08-18 14:48:12 +0000

    x11-wm/xfce4-session: Update to 4.20.3
    
    - Pet portclippy
    - Remove unneeded dependency on graphics/wayland
    - Remove upstreamed patch
---
 x11-wm/xfce4-session/Makefile                    | 29 ++++++++++++------------
 x11-wm/xfce4-session/distinfo                    |  6 ++---
 x11-wm/xfce4-session/files/patch-scripts_xflock4 | 17 --------------
 3 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index fc0a959e7ac3..7d1e998705f1 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xfce4-session
-PORTVERSION=	4.20.2
-PORTREVISION=	1
+PORTVERSION=	4.20.3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -12,38 +11,38 @@ WWW=		https://gitlab.xfce.org/xfce/xfce4-session
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	iceauth:x11/iceauth
-RUN_DEPENDS=	iceauth:x11/iceauth \
-		console-kit-daemon:sysutils/consolekit2 \
-		xrdb:x11/xrdb
 LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
+RUN_DEPENDS=	console-kit-daemon:sysutils/consolekit2 \
+		iceauth:x11/iceauth \
+		xrdb:x11/xrdb
 
 USES=		compiler:c11 gettext-tools gmake gnome libtool pathfix \
 		pkgconfig tar:bzip2 xfce xorg
-USE_GNOME=	cairo gdkpixbuf gtk30 glib20 libwnck3
-USE_XFCE=	libmenu xfconf windowing
+USE_GNOME=	cairo gdkpixbuf glib20 gtk30 libwnck3
+USE_XFCE=	libmenu windowing xfconf
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-legacy-sm \
-		--with-backend=freebsd \
-		--enable-x11 \
 		--enable-polkit \
-		--with-xsession-prefix=${PREFIX} \
-		--with-wayland-session-prefix=${PREFIX}
-SUB_FILES=	pkg-message
+		--enable-x11 \
+		--with-backend=freebsd \
+		--with-wayland-session-prefix=${PREFIX} \
+		--with-xsession-prefix=${PREFIX}
 INSTALL_TARGET=	install-strip
 
 PORTSCOUT=	limitw:1,even
 
+SUB_FILES=	pkg-message
+
 OPTIONS_DEFINE=		NLS WAYLAND
 OPTIONS_DEFAULT=	WAYLAND
 OPTIONS_SUB=		yes
 
-NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
 
-WAYLAND_LIB_DEPENDS=		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
-				libwayland-client.so:graphics/wayland
+WAYLAND_LIB_DEPENDS=		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 WAYLAND_CONFIGURE_ENABLE=	gtk-layer-shell wayland
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index 631be7d32b10..ce78444c9193 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742802295
-SHA256 (xfce4/xfce4-session-4.20.2.tar.bz2) = a0b80b7136515bc3c0c54fa859ad420365e29b715b6da0b58a2d2781bfbe73c3
-SIZE (xfce4/xfce4-session-4.20.2.tar.bz2) = 1226931
+TIMESTAMP = 1755163734
+SHA256 (xfce4/xfce4-session-4.20.3.tar.bz2) = dbf00672c5316a30b7001fe852e6a5ba9f889afeab8a247545a160d4302f1fa2
+SIZE (xfce4/xfce4-session-4.20.3.tar.bz2) = 1233244
diff --git a/x11-wm/xfce4-session/files/patch-scripts_xflock4 b/x11-wm/xfce4-session/files/patch-scripts_xflock4
deleted file mode 100644
index 44b8684a3d8a..000000000000
--- a/x11-wm/xfce4-session/files/patch-scripts_xflock4
+++ /dev/null
@@ -1,17 +0,0 @@
---- scripts/xflock4.orig	2025-03-21 09:25:42 UTC
-+++ scripts/xflock4
-@@ -47,12 +47,12 @@ esac
- [ -t 0 ] && sleep 1
- 
- # echo is used to strip blanks
--# $((2**31 - 1)) is MAXINT, which disables timeout: see
-+# $(((1<<31)-1)) is MAXINT, which disables timeout: see
- # https://dbus.freedesktop.org/doc/api/html/group__DBusPendingCall.html
- ret=$(echo $(dbus-send --session \
-                        --dest=org.xfce.SessionManager \
-                        --print-reply=literal \
--                       --reply-timeout=$((2**31 - 1)) \
-+                       --reply-timeout=$(((1<<31)-1)) \
-                        --type=method_call \
-                        /org/xfce/SessionManager \
-                        org.xfce.Session.Manager.Lock))