git: 337e0e15a886 - main - x11-wm/xfce4-panel: Update to 4.20.5

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=337e0e15a8869ea78b8002830d6adad9439f9d5c

commit 337e0e15a8869ea78b8002830d6adad9439f9d5c
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-08-18 14:41:05 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-08-18 14:48:12 +0000

    x11-wm/xfce4-panel: Update to 4.20.5
    
    - Convert to use meson
---
 x11-wm/xfce4-panel/Makefile  | 36 +++++++++++++++++-------------------
 x11-wm/xfce4-panel/distinfo  |  6 +++---
 x11-wm/xfce4-panel/pkg-plist |  1 -
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index f8a71e13b9d7..146ba9361607 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.20.4
+PORTVERSION=	4.20.5
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -13,13 +13,12 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu \
-		libharfbuzz.so:print/harfbuzz
+LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu
 
-USES=		compiler:c11 desktop-file-utils gettext-tools gmake gnome \
-		libtool pathfix perl5 pkgconfig python:build shebangfix \
-		tar:bzip2 xfce xorg
-USE_GNOME=	cairo gdkpixbuf glib20 gtk30 libwnck3
+USES=		compiler:c11 desktop-file-utils gettext-tools gnome meson \
+		pathfix perl5 pkgconfig python:build shebangfix tar:bzip2 xfce \
+		xorg
+USE_GNOME=	glib20 gtk30 libwnck3
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_XFCE=	garcon libexo windowing xdt xfconf
@@ -27,10 +26,8 @@ USE_XORG=	ice sm x11 xext
 
 SHEBANG_FILES=	xdt-gen-visibility
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-x11 \
-		--without-html-dir
-INSTALL_TARGET=	install-strip
+MESON_ARGS=	-Ddbusmenu=enabled \
+		-Dx11=enabled
 
 PORTSCOUT=	limitw:1,even
 
@@ -38,21 +35,22 @@ OPTIONS_DEFINE=		GIR NLS VAPI WAYLAND
 OPTIONS_DEFAULT=	GIR VAPI WAYLAND
 OPTIONS_SUB=		yes
 
-GIR_DESC=	Use Gobject Introspection
+GIR_DESC=		Use Gobject Introspection
 
 GIR_USE=		GNOME=introspection:build
-GIR_CONFIGURE_ON=	--enable-introspection=yes
-GIR_CONFIGURE_OFF=	--enable-introspection=no
+GIR_MESON_TRUE=		introspection
 
 NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
 
 VAPI_IMPLIES=		GIR
 VAPI_USES=		vala:build
-VAPI_CONFIGURE_ENABLE=	vala
+VAPI_MESON_ENABLED=	vala
 
-WAYLAND_LIB_DEPENDS=		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
-				libwayland-client.so:graphics/wayland
-WAYLAND_CONFIGURE_ENABLE=	gtk-layer-shell wayland
+WAYLAND_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
+			libwayland-client.so:graphics/wayland
+WAYLAND_MESON_ENABLED=	gtk-layer-shell wayland
+
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 734057a88509..eeec7d457f42 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742802732
-SHA256 (xfce4/xfce4-panel-4.20.4.tar.bz2) = 695b23af490719e734c8659394821b43cc94d3bee69994bafdc42ef40daa0d2c
-SIZE (xfce4/xfce4-panel-4.20.4.tar.bz2) = 2287183
+TIMESTAMP = 1755162792
+SHA256 (xfce4/xfce4-panel-4.20.5.tar.bz2) = 3f91850c9c467680c8081d561f1a3fd83355c07db07be9a96da1764f8c842b2b
+SIZE (xfce4/xfce4-panel-4.20.5.tar.bz2) = 2293754
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 4b6437fe0953..5f3e42c3d3a0 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -11,7 +11,6 @@ include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h
 include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h
 include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h
 include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h
-include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h
 include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h
 %%GIR%%lib/girepository-1.0/Libxfce4panel-2.0.typelib
 lib/libxfce4panel-2.0.so