git: 37a80e8429fb - main - sysutils/xfce4-systemload-plugin: Update to 1.4.0

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=37a80e8429fbe50058d2b6675fc6fc5af9f32f82

commit 37a80e8429fbe50058d2b6675fc6fc5af9f32f82
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-05-22 21:35:43 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-05-22 21:35:43 +0000

    sysutils/xfce4-systemload-plugin: Update to 1.4.0
    
    - Move build to meson
    - Remove old commented lines
---
 sysutils/xfce4-systemload-plugin/Makefile          | 33 +++++++--------
 sysutils/xfce4-systemload-plugin/distinfo          |  6 +--
 .../files/patch-panel-plugin_meson.build           | 47 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 98f99720f19d..aa5cf680823d 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-systemload-plugin
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4.0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
@@ -10,34 +10,29 @@ WWW=		https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
-		libpolkit-gobject-1.so:sysutils/polkit
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
 
-USES=		compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
-		tar:bzip2 xfce
-USE_GNOME=	cairo gdkpixbuf gtk30
+USES=		compiler:c11 gettext-tools gnome meson pkgconfig tar:xz xfce
+USE_GNOME=	gtk30
 USE_XFCE=	libmenu panel xfconf
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-libgtop
-INSTALL_TARGET=	install-strip
 SSP_UNSAFE=	yes
 
-OPTIONS_DEFINE=		NLS UPOWER # LIBGTOP
+OPTIONS_DEFINE=		LIBGTOP NLS UPOWER
 OPTIONS_DEFAULT=	UPOWER
 OPTIONS_SUB=		yes
 
-# Enabling libgtop causes crashes, needs investigation
-#LIBGTOP_DESC=	Use libgtop for network utilization monitoring
+LIBGTOP_DESC=	Use libgtop for network utilization monitoring
 UPOWER_DESC=	Use upower for adapting update interval to power state
 
-#LIBGTOP_LIB_DEPENDS=		libgtop-2.0.so:devel/libgtop
-#LIBGTOP_CONFIGURE_ENABLE=	libgtop
+LIBGTOP_LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
+LIBGTOP_MESON_ENABLED=	libgtop
+
+NLS_USES=	gettext-runtime
 
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
+UPOWER_MESON_ENABLED=	upower-glib
 
-UPOWER_LIB_DEPENDS=		libupower-glib.so:sysutils/upower
-UPOWER_CONFIGURE_ENABLE=	upower
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo
index f2b13b8b7f3f..110ca6730fac 100644
--- a/sysutils/xfce4-systemload-plugin/distinfo
+++ b/sysutils/xfce4-systemload-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735170206
-SHA256 (xfce4/xfce4-systemload-plugin-1.3.3.tar.bz2) = 6852d5d9c9a74d0e0db582c6f5fe7390ebe48a2eb5692177ae12e1c4ccc6efc9
-SIZE (xfce4/xfce4-systemload-plugin-1.3.3.tar.bz2) = 519937
+TIMESTAMP = 1747773334
+SHA256 (xfce4/xfce4-systemload-plugin-1.4.0.tar.xz) = 6e363bcf845bb88329b52858d65a1ec6e00db5121ae9246e46eb03135d9569c6
+SIZE (xfce4/xfce4-systemload-plugin-1.4.0.tar.xz) = 60984
diff --git a/sysutils/xfce4-systemload-plugin/files/patch-panel-plugin_meson.build b/sysutils/xfce4-systemload-plugin/files/patch-panel-plugin_meson.build
new file mode 100644
index 000000000000..71eedf89264e
--- /dev/null
+++ b/sysutils/xfce4-systemload-plugin/files/patch-panel-plugin_meson.build
@@ -0,0 +1,47 @@
+--- panel-plugin/meson.build.orig	2025-05-20 08:31:51 UTC
++++ panel-plugin/meson.build
+@@ -15,6 +15,25 @@ plugin_sources = [
+   xfce_revision_h,
+ ]
+ 
++dependencies = [
++  glib,
++  gtk,
++  libgtop,
++  libm,
++  libxfce4panel,
++  libxfce4ui,
++  libxfce4util,
++  upower_glib,
++  xfconf,
++]
++
++target_os = host_machine.system()
++if target_os == 'freebsd'
++  kvm_lib = cc.find_library('kvm', required : true)
++
++  dependencies += [ kvm_lib ]
++endif
++
+ plugin_install_subdir = 'xfce4' / 'panel' / 'plugins'
+ 
+ plugin_lib = shared_module(
+@@ -27,17 +46,7 @@ plugin_lib = shared_module(
+   include_directories: [
+     include_directories('..'),
+   ],
+-  dependencies: [
+-    glib,
+-    gtk,
+-    libgtop,
+-    libm,
+-    libxfce4panel,
+-    libxfce4ui,
+-    libxfce4util,
+-    upower_glib,
+-    xfconf,
+-  ],
++  dependencies: dependencies,
+   install: true,
+   install_dir: get_option('prefix') / get_option('libdir') / plugin_install_subdir,
+ )