git: e23ace75b7f3 - main - x11/xfce4-whiskermenu-plugin: Update to 2.9.0

From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Sat, 01 Feb 2025 15:11:00 UTC
The branch main has been updated by madpilot:

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

commit e23ace75b7f31d79f33c4037ac477bc8f00e3485
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-02-01 15:10:16 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-02-01 15:10:16 +0000

    x11/xfce4-whiskermenu-plugin: Update to 2.9.0
    
    - Enable menu option to launch menulibre to configure the menu
    - Add MENULIBRE option (on by defualt) to add a runtime dependency
      on menulibre
---
 x11/xfce4-whiskermenu-plugin/Makefile                            | 9 ++++++---
 x11/xfce4-whiskermenu-plugin/distinfo                            | 6 +++---
 .../files/patch-panel-plugin_settings.cpp                        | 5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 6d7cd481937c..9d93291b1cae 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xfce4-whiskermenu-plugin
-PORTVERSION=	2.8.4
+PORTVERSION=	2.9.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
@@ -16,17 +16,20 @@ USES=		cmake compiler:c++14-lang gettext-tools gnome localbase \
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XFCE=	garcon libexo panel xfconf
 
-OPTIONS_DEFINE=		ACCOUNTS_SERVICE LTO NLS WAYLAND
-OPTIONS_DEFAULT=	ACCOUNTS_SERVICE LTO WAYLAND
+OPTIONS_DEFINE=		ACCOUNTS_SERVICE LTO MENULIBRE NLS WAYLAND
+OPTIONS_DEFAULT=	ACCOUNTS_SERVICE LTO MENULIBRE WAYLAND
 OPTIONS_SUB=		yes
 
 ACCOUNTS_SERVICE_DESC=	Enable AccountsService support
+MENULIBRE_DESC=		Depend at runtime on x11/menulibre
 
 ACCOUNTS_SERVICE_LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice
 ACCOUNTS_SERVICE_CMAKE_BOOL=	ENABLE_ACCOUNTS_SERVICE
 
 LTO_CMAKE_BOOL=	ENABLE_LINK_TIME_OPTIMIZATION
 
+MENULIBRE_RUN_DEPENDS=	menulibre:x11/menulibre
+
 NLS_USES=	gettext-runtime
 
 WAYLAND_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
diff --git a/x11/xfce4-whiskermenu-plugin/distinfo b/x11/xfce4-whiskermenu-plugin/distinfo
index 1433ffa8e87a..75b0751effed 100644
--- a/x11/xfce4-whiskermenu-plugin/distinfo
+++ b/x11/xfce4-whiskermenu-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736186403
-SHA256 (xfce4/xfce4-whiskermenu-plugin-2.8.4.tar.bz2) = ed918950e01dc97fe831e01c698b44247f1537992999b1262ab61c799272b3b7
-SIZE (xfce4/xfce4-whiskermenu-plugin-2.8.4.tar.bz2) = 189895
+TIMESTAMP = 1738261172
+SHA256 (xfce4/xfce4-whiskermenu-plugin-2.9.0.tar.bz2) = 8892bb9cc6bbaa402288ad7e5ee76a1990cb8476fe35964a41ec8a9794f6f322
+SIZE (xfce4/xfce4-whiskermenu-plugin-2.9.0.tar.bz2) = 192835
diff --git a/x11/xfce4-whiskermenu-plugin/files/patch-panel-plugin_settings.cpp b/x11/xfce4-whiskermenu-plugin/files/patch-panel-plugin_settings.cpp
index b1809266ce1b..cf10ec90d6da 100644
--- a/x11/xfce4-whiskermenu-plugin/files/patch-panel-plugin_settings.cpp
+++ b/x11/xfce4-whiskermenu-plugin/files/patch-panel-plugin_settings.cpp
@@ -1,11 +1,10 @@
---- panel-plugin/settings.cpp.orig	2015-03-08 09:15:22 UTC
+--- panel-plugin/settings.cpp.orig	2025-01-30 14:00:16 UTC
 +++ panel-plugin/settings.cpp
-@@ -148,6 +148,8 @@ void Settings::load(char* file)
+@@ -188,6 +188,7 @@ void Settings::load(const gchar* file, bool is_default
  {
  	if (!file)
  	{
 +		command[CommandProfile]->set_shown(false);
-+		command[CommandMenuEditor]->set_shown(false);
  		return;
  	}