From d5c6e7cbf7ec10a24d80384cb5d9c883c016fb39 Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sat, 29 Mar 2025 09:44:41 +0100
Subject: [PATCH] x11/xfce4-terminal: Update to 1.1.5

- Convert build to using meson
- Add option to control WAYLAND support
---
 x11/xfce4-terminal/Makefile                   | 25 ++++++++++++-------
 x11/xfce4-terminal/distinfo                   |  6 ++---
 .../files/patch-terminal_terminal-util.c      | 18 +++++++++++++
 3 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 x11/xfce4-terminal/files/patch-terminal_terminal-util.c

diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 0a2b576cccc1..511225a99cda 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-terminal
-PORTVERSION=	1.1.4
+PORTVERSION=	1.1.5
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -11,22 +11,29 @@ WWW=		https://docs.xfce.org/apps/xfce4-terminal/start
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/html/refentry.xsl:textproc/docbook-xsl \
+		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
-USES=		compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 xfce \
+USES=		compiler:c11 gettext-tools gnome meson pkgconfig tar:xz xfce \
 		xorg
 USE_GNOME=	cairo gdkpixbuf glib20 gtk30 vte3
 USE_XFCE=	libmenu xfconf
 USE_XORG=	ice sm x11
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-utempter
-INSTALL_TARGET=	install-strip
+MESON_ARGS=	-Dlibutempter=enabled
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS WAYLAND
+OPTIONS_DEFAULT=	WAYLAND
+OPTIONS_SUB=		yes
 
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+
+WAYLAND_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
+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/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo
index bbaa14ec0923..de19f4de1122 100644
--- a/x11/xfce4-terminal/distinfo
+++ b/x11/xfce4-terminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735174820
-SHA256 (xfce4/xfce4-terminal-1.1.4.tar.bz2) = 873c921da1f4b986ffb459d4960789c9c063af98648c9f0ca146dc6f6f5b71b7
-SIZE (xfce4/xfce4-terminal-1.1.4.tar.bz2) = 1498643
+TIMESTAMP = 1743025057
+SHA256 (xfce4/xfce4-terminal-1.1.5.tar.xz) = 3c5b1d3a01a9a113852ac0f77d1c85bf3a356b43de33ec805b21ceca7d6f0a63
+SIZE (xfce4/xfce4-terminal-1.1.5.tar.xz) = 440192
diff --git a/x11/xfce4-terminal/files/patch-terminal_terminal-util.c b/x11/xfce4-terminal/files/patch-terminal_terminal-util.c
new file mode 100644
index 000000000000..e5abff472551
--- /dev/null
+++ b/x11/xfce4-terminal/files/patch-terminal_terminal-util.c
@@ -0,0 +1,18 @@
+--- terminal/terminal-util.c.orig	2025-03-26 18:40:26 UTC
++++ terminal/terminal-util.c
+@@ -30,13 +30,13 @@
+ #endif
+ 
+ #ifdef __FreeBSD__
+-#include <libprocstat.h>
+-#include <libutil.h>
+ #include <sys/param.h>
+ #include <sys/queue.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/user.h>
++#include <libprocstat.h>
++#include <libutil.h>
+ #endif
+ 
+ #ifdef ENABLE_X11