From 73b79758764000115f2a6701219925db02284b27 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 17 Jan 2024 10:28:59 +0100
Subject: [PATCH 1/5] xfce4-whiskermenu-plugin: Build release with debug info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use Bee’s default, which is [`RelWithDebInfo`][1] since version 1.2.27.

[1]: https://github.molgen.mpg.de/mariux64/bee/commit/5cc3440037f57d0582440ee79d1a18c3ee48375f
---
 xfce4-whiskermenu-plugin.be0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xfce4-whiskermenu-plugin.be0 b/xfce4-whiskermenu-plugin.be0
index 0add0478c..3cf8ecc0f 100755
--- a/xfce4-whiskermenu-plugin.be0
+++ b/xfce4-whiskermenu-plugin.be0
@@ -21,9 +21,9 @@ SRCURL[0]="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/$
 #    bee_patch "${@}"
 #}
 
-mee_configure() {
-    bee_configure -DCMAKE_BUILD_TYPE=Release
-}
+#mee_configure() {
+#    bee_configure
+#}
 
 #mee_build() {
 #    bee_build

From 6e6f057a160cae1984eac4dd24f67de220374fe6 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 17 Jan 2024 10:32:14 +0100
Subject: [PATCH 2/5] xfce4-whiskermenu-plugin: Update version from 2.5.3 to
 2.8.3

> Release notes for 2.8.3
> =======================
> - Fix adding launchers to desktop. (Issue #122)
> - Fix segfault in profile destructor. (Issue #123)
---
 xfce4-whiskermenu-plugin.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xfce4-whiskermenu-plugin.be0 b/xfce4-whiskermenu-plugin.be0
index 3cf8ecc0f..aee449585 100755
--- a/xfce4-whiskermenu-plugin.be0
+++ b/xfce4-whiskermenu-plugin.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xfce4-whiskermenu-plugin-2.5.3-0
+# BEE_VERSION xfce4-whiskermenu-plugin-2.8.3-0
 
 SRCURL[0]="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/${PKGVERSION[2]}/xfce4-whiskermenu-plugin-${PKGVERSION}.tar.bz2"
 

From a10ad276cd148d5ec294c44ccb1136529cc9fd32 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 17 Jan 2024 10:35:11 +0100
Subject: [PATCH 3/5] xfce4-whiskermenu-plugin: Download source archive from
 beehive.molgen.mpg.de

---
 xfce4-whiskermenu-plugin.be0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xfce4-whiskermenu-plugin.be0 b/xfce4-whiskermenu-plugin.be0
index aee449585..ccd746aff 100755
--- a/xfce4-whiskermenu-plugin.be0
+++ b/xfce4-whiskermenu-plugin.be0
@@ -2,7 +2,8 @@
 
 # BEE_VERSION xfce4-whiskermenu-plugin-2.8.3-0
 
-SRCURL[0]="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/${PKGVERSION[2]}/xfce4-whiskermenu-plugin-${PKGVERSION}.tar.bz2"
+#SRCURL[0]="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/${PKGVERSION[2]}/xfce4-whiskermenu-plugin-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://beehive.molgen.mpg.de/fe60c0c93f72d1533f6fc972d3a80c99/xfce4-whiskermenu-plugin-2.8.3.tar.bz2"
 
 # PATCHURL+=()
 

From 6bea888436c0531394952efb40e0d78571a7ed66 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 17 Jan 2024 13:13:04 +0100
Subject: [PATCH 4/5] xfce4-whiskermenu-plugin: Explicitly disable building
 with AccountsService

AccountsService was removed from MarIuX, and since Whisker Menu 0.8.0
AccountsService is not autodetected anymore, and building with it is
enabled by default, causing the configuration to fail:

    -- Checking for module 'accountsservice>=0.6.45'
    --   No package 'accountsservice' found
    CMake Error at /usr/share/cmake-3.25/Modules/FindPkgConfig.cmake:607 (message):
      A required package was not found
    Call Stack (most recent call first):
      /usr/share/cmake-3.25/Modules/FindPkgConfig.cmake:829 (_pkg_check_modules_internal)
      panel-plugin/CMakeLists.txt:74 (pkg_check_modules)

So, explicitly disable building with AccountsService.
---
 xfce4-whiskermenu-plugin.be0 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/xfce4-whiskermenu-plugin.be0 b/xfce4-whiskermenu-plugin.be0
index ccd746aff..1ac24225e 100755
--- a/xfce4-whiskermenu-plugin.be0
+++ b/xfce4-whiskermenu-plugin.be0
@@ -22,9 +22,10 @@ SRCURL[0]="https://beehive.molgen.mpg.de/fe60c0c93f72d1533f6fc972d3a80c99/xfce4-
 #    bee_patch "${@}"
 #}
 
-#mee_configure() {
-#    bee_configure
-#}
+mee_configure() {
+    bee_configure \
+        -DENABLE_ACCOUNTS_SERVICE=OFF
+}
 
 #mee_build() {
 #    bee_build

From 6fac8866e550fd6d0af187dac994002e631dff1e Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 17 Jan 2024 13:18:28 +0100
Subject: [PATCH 5/5] xfce4-whiskermenu-plugin: Disable support for positioning
 in Wayland

MarIuX does not ship *gtk-layer-shell-0*, checked for by default:

    -- Checking for module 'gtk-layer-shell-0>=0.7'
    --   No package 'gtk-layer-shell-0' found
    CMake Error at /usr/share/cmake-3.25/Modules/FindPkgConfig.cmake:607 (message):
      A required package was not found
    Call Stack (most recent call first):
      /usr/share/cmake-3.25/Modules/FindPkgConfig.cmake:829 (_pkg_check_modules_internal)
      panel-plugin/CMakeLists.txt:80 (pkg_check_modules)

Description:

> -DENABLE_GTK_LAYER_SHELL=[ON]
>     Use GtkLayerShell to position menu in Wayland.
---
 xfce4-whiskermenu-plugin.be0 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xfce4-whiskermenu-plugin.be0 b/xfce4-whiskermenu-plugin.be0
index 1ac24225e..61f9ff94f 100755
--- a/xfce4-whiskermenu-plugin.be0
+++ b/xfce4-whiskermenu-plugin.be0
@@ -24,7 +24,8 @@ SRCURL[0]="https://beehive.molgen.mpg.de/fe60c0c93f72d1533f6fc972d3a80c99/xfce4-
 
 mee_configure() {
     bee_configure \
-        -DENABLE_ACCOUNTS_SERVICE=OFF
+        -DENABLE_ACCOUNTS_SERVICE=OFF \
+        -DENABLE_GTK_LAYER_SHELL=OFF
 }
 
 #mee_build() {