git: 04a9c0f02769 - main - x11/xfce4-taskmanager: Update to 1.6.0

From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Thu, 22 May 2025 21:44:10 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=04a9c0f02769ab86cee1ad01780d364c2b6fbf51

commit 04a9c0f02769ab86cee1ad01780d364c2b6fbf51
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-05-22 21:41:23 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-05-22 21:41:23 +0000

    x11/xfce4-taskmanager: Update to 1.6.0
    
    - Move build to meson
---
 x11/xfce4-taskmanager/Makefile                    | 22 +++++-------
 x11/xfce4-taskmanager/distinfo                    |  6 ++--
 x11/xfce4-taskmanager/files/patch-meson.build     | 20 +++++++++++
 x11/xfce4-taskmanager/files/patch-src_meson.build | 44 +++++++++++++++++++++++
 4 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 720cf0ae5f58..fd75fbb81420 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-taskmanager
-PORTVERSION=	1.5.8
+PORTVERSION=	1.6.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -11,24 +11,20 @@ WWW=		https://goodies.xfce.org/projects/applications/xfce4-taskmanager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
-
-USES=		gettext-tools gmake gnome localbase pkgconfig tar:bzip2 xfce \
-		xorg
-USE_GNOME=	cairo gdkpixbuf glib20 gtk30 libwnck3
+USES=		gettext-tools gnome localbase meson pkgconfig tar:xz xfce xorg
+USE_GNOME=	glib20 gtk30 libwnck3
 USE_XFCE=	libmenu xfconf
 USE_XORG=	ice sm x11 xmu xt
 
-GNU_CONFIGURE=	yes
-
-CONFIGURE_ARGS=	--disable-gksu \
-		--disable-silent-rules \
-		--enable-wnck3
+MESON_ARGS=	-Dwnck=enabled \
+		-Dx11=enabled
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
+
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4-taskmanager/distinfo b/x11/xfce4-taskmanager/distinfo
index ac28ca90214f..110b3568acb0 100644
--- a/x11/xfce4-taskmanager/distinfo
+++ b/x11/xfce4-taskmanager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735174403
-SHA256 (xfce4/xfce4-taskmanager-1.5.8.tar.bz2) = 14b9d68b8feb88a642a9885b8549efe7fc9e6c155f638003f2a4a58d9eb2baab
-SIZE (xfce4/xfce4-taskmanager-1.5.8.tar.bz2) = 548651
+TIMESTAMP = 1747848539
+SHA256 (xfce4/xfce4-taskmanager-1.6.0.tar.xz) = 29bdc7840ab8b9025f6c0e456a83a31090d1c9fd9e26b359baa4a4010cfb0b90
+SIZE (xfce4/xfce4-taskmanager-1.6.0.tar.xz) = 135088
diff --git a/x11/xfce4-taskmanager/files/patch-meson.build b/x11/xfce4-taskmanager/files/patch-meson.build
new file mode 100644
index 000000000000..00b5c05e84be
--- /dev/null
+++ b/x11/xfce4-taskmanager/files/patch-meson.build
@@ -0,0 +1,20 @@
+--- meson.build.orig	2025-05-21 07:00:22 UTC
++++ meson.build
+@@ -54,7 +54,7 @@ else
+ else
+   if target_os == 'freebsd'
+     os_implementation = 'freebsd'
+-    find_library('kvm')
++    kvm_lib = cc.find_library('kvm', required : true)
+     headers += [
+       'sys/param.h',
+       'sys/proc.h',
+@@ -83,7 +83,7 @@ else
+     ]
+   elif target_os == 'sunos'
+     os_implementation = 'solaris'
+-    find_library('kstat')
++    cc.find_library('kstat')
+     headers += [
+       'sys/procfs.h',
+       'sys/stat.h',
diff --git a/x11/xfce4-taskmanager/files/patch-src_meson.build b/x11/xfce4-taskmanager/files/patch-src_meson.build
new file mode 100644
index 000000000000..bc052f07a3b9
--- /dev/null
+++ b/x11/xfce4-taskmanager/files/patch-src_meson.build
@@ -0,0 +1,44 @@
+--- src/meson.build.orig	2025-05-21 07:00:22 UTC
++++ src/meson.build
+@@ -35,6 +35,22 @@ endif
+ ]
+ endif
+ 
++dependencies = [
++  glib,
++  gtk,
++  cairo,
++  libxmu,
++  libxfce4util,
++  libxfce4ui,
++  xfconf,
++  libx11,
++  libwnck,
++]
++
++if target_os == 'freebsd' and kvm_lib.found()
++dependencies += [ kvm_lib ]
++endif
++
+ taskmanager = executable(
+   'xfce4-taskmanager',
+   taskmanager_sources,
+@@ -42,17 +58,7 @@ taskmanager = executable(
+   include_directories: [
+     include_directories('..'),
+   ],
+-  dependencies: [
+-    glib,
+-    gtk,
+-    cairo,
+-    libxmu,
+-    libxfce4util,
+-    libxfce4ui,
+-    xfconf,
+-    libx11,
+-    libwnck,
+-  ],
++  dependencies: dependencies,
+   install: true,
+   install_dir: get_option('prefix') / get_option('bindir'),
+ )