From 3ce853610e5c6b8664af8f7b326e0bee046f634c Mon Sep 17 00:00:00 2001
From: gutteridge <gutteridge@pkgsrc.org>
Date: Thu, 31 Aug 2023 01:11:16 +0000
Subject: [PATCH] xfce4-whiskermenu-plugin: update to 2.8.0

AccountsService and some Wayland-specific functionality are not
enabled for pkgsrc at present. AccountsService is too out of date and
bringing it fully forward seems non-trivial (though we could more
easily roll it forward to the absolute minimum this package expects).

Change log:

2.8.0
=====
- Fix menu toggling in Wayland.
- Fix menu position in Wayland.
- Add support for popping up specific menu instances. (Issue #95)
- Add showing menu at center of screen. (Issue #109)
- Replace options for positioning menu layout.
- Replace resize widgets with options in settings dialog.
- Replace command for switching users.
- Replace popup script with executable.
- Require Xfce 4.14.
- Make linking against AccountsService explicit.
- Stop including favorites in recent by default.
- Store settings in Xfconf.
- Translation updates: Bulgarian, Chinese (Taiwan), Danish, Dutch, German,
  Greek, Spanish, Basque, Finnish, French, Italian, Lithuanian, Persian,
  Portuguese, Russian, Slovak, Swedish, Turkish, Ukrainian.
---
 x11/xfce4-whiskermenu-plugin/Makefile | 16 +++++++++++-----
 x11/xfce4-whiskermenu-plugin/distinfo |  8 ++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index a0108ad403ef..a9790f7c1b0a 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2023/05/03 23:32:14 gutteridge Exp $
+# $NetBSD: Makefile,v 1.51 2023/08/31 01:11:16 gutteridge Exp $
 
-VERSION=	2.7.3
+VERSION=	2.8.0
 DISTNAME=	xfce4-whiskermenu-plugin-${VERSION}
 CATEGORIES=	x11
 MASTER_SITES=	https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/${VERSION:R}/
@@ -15,12 +15,18 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config msgfmt perl intltool
 
-BUILDLINK_TRANSFORM.SunOS+=     rm:-Wl,--as-needed
-BUILDLINK_TRANSFORM.SunOS+=     rm:-Wl,-O1
+# AccountsService is an optional dependency; the version in pkgsrc is too old
+# at present.
+CMAKE_ARGS+=	-DENABLE_ACCOUNTS_SERVICE=No
+# Wayland support not relevant yet.
+CMAKE_ARGS+=	-DENABLE_GTK_LAYER_SHELL=No
+
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--as-needed
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-O1
 
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-garcon/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../x11/xfce4-exo/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-whiskermenu-plugin/distinfo b/x11/xfce4-whiskermenu-plugin/distinfo
index e1da60f7d9d9..9a3e6e318a41 100644
--- a/x11/xfce4-whiskermenu-plugin/distinfo
+++ b/x11/xfce4-whiskermenu-plugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.23 2023/05/03 23:32:14 gutteridge Exp $
+$NetBSD: distinfo,v 1.24 2023/08/31 01:11:16 gutteridge Exp $
 
-BLAKE2s (xfce4-whiskermenu-plugin-2.7.3.tar.bz2) = 50aebdc8b1e5ac166bdfe36ef724497c0db2db9c051ac227c6fe3c710dd8ae31
-SHA512 (xfce4-whiskermenu-plugin-2.7.3.tar.bz2) = a734e54e900d17fa82c53eeab2a2e706481951911640714928b53eb3a06a3b5b3e7292e6869e719345cb5c89d917146ae350db6827ac8fd3bcdb9b4dd2ddce4d
-Size (xfce4-whiskermenu-plugin-2.7.3.tar.bz2) = 180287 bytes
+BLAKE2s (xfce4-whiskermenu-plugin-2.8.0.tar.bz2) = 33823059c97d1db875687a42df5f49c4cc716d86a6442a2905c7f4b76627ff85
+SHA512 (xfce4-whiskermenu-plugin-2.8.0.tar.bz2) = 844c34ea85e2574dc39e90bb08774c3e7e9e3e13a0a35b1da916d3b3187f158d9f6e130312f2545e26cd214f98cc03461a857ad4c91893febe9942ad08c58a70
+Size (xfce4-whiskermenu-plugin-2.8.0.tar.bz2) = 187093 bytes