git: 9c49c355b923 - main - x11/xfce4-whiskermenu-plugin: rename GTK_LAYER_SHELL to WAYLAND

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 07 Oct 2024 13:59:16 UTC
The branch main has been updated by jbeich:

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

commit 9c49c355b92317171a50ff9efb828c435b7cf166
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-10-07 13:45:44 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-10-07 13:58:59 +0000

    x11/xfce4-whiskermenu-plugin: rename GTK_LAYER_SHELL to WAYLAND
    
    Allow X11-only users to globally disable Wayland dependencies via
    OPTIONS_UNSET+=WAYLAND in make.conf(5). Besides, gtk-layer-shell will
    fail to build unless gtk3 is built with WAYLAND enabled.
    
    PR:             281846
    Approved by:    madpilot
---
 x11/xfce4-whiskermenu-plugin/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 4ee8c35a8ab6..755e228f0271 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -16,18 +16,17 @@ 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 GTK_LAYER_SHELL LTO NLS
-OPTIONS_DEFAULT=	ACCOUNTS_SERVICE GTK_LAYER_SHELL LTO
+OPTIONS_DEFINE=		ACCOUNTS_SERVICE WAYLAND LTO NLS
+OPTIONS_DEFAULT=	ACCOUNTS_SERVICE WAYLAND LTO
 OPTIONS_SUB=		yes
 
 ACCOUNTS_SERVICE_DESC=	Enable AccountsService support
-GTK_LAYER_SHELL_DESC=	Enable support for positioning in Wayland
 
 ACCOUNTS_SERVICE_LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice
 ACCOUNTS_SERVICE_CMAKE_BOOL=	ENABLE_ACCOUNTS_SERVICE
 
-GTK_LAYER_SHELL_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
-GTK_LAYER_SHELL_CMAKE_BOOL=	ENABLE_GTK_LAYER_SHELL
+WAYLAND_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
+WAYLAND_CMAKE_BOOL=	ENABLE_GTK_LAYER_SHELL
 
 LTO_CMAKE_BOOL=	ENABLE_LINK_TIME_OPTIMIZATION