git: 15466d8aca3c - main - x11/xfce4-screensaver: Update to 4.20

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Mon, 14 Jul 2025 18:03:40 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=15466d8aca3c8478f28b76f13c39b546ee9a204a

commit 15466d8aca3c8478f28b76f13c39b546ee9a204a
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-07-14 18:03:02 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-07-14 18:03:02 +0000

    x11/xfce4-screensaver: Update to 4.20
    
    - Update WWW
    - Convert to use meson
    - Add DOCS option
    - Wayland support is unconditionally disabled because it depends
      on an experimental unreleased library
---
 x11/xfce4-screensaver/Makefile  | 47 ++++++++++++++++++++---------------------
 x11/xfce4-screensaver/distinfo  |  6 +++---
 x11/xfce4-screensaver/pkg-plist |  2 +-
 3 files changed, 27 insertions(+), 28 deletions(-)

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