From b08df59fc61ebbcabf58ee706d74384cbb7dcb7e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:16 -0700 Subject: [PATCH] package/sway: enable swaybar support Add a config option to build sway with swaybar support. - The bar requires dejavu fonts. - If bash-completions is selected, JQ is required. - Select dmenu-wayland as a runtime dependency. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: jq is a runtime dependency too] Signed-off-by: Yann E. MORIN --- package/sway/Config.in | 12 ++++++++++++ package/sway/sway.mk | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index 08b6911069..6fd13636a3 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -24,6 +24,18 @@ config BR2_PACKAGE_SWAY https://github.com/swaywm/sway +if BR2_PACKAGE_SWAY + +config BR2_PACKAGE_SWAY_SWAYBAR + bool "swaybar" + select BR2_PACKAGE_DEJAVU + select BR2_PACKAGE_JQ if BR2_PACKAGE_BASH_COMPLETION # Runtime + select BR2_PACKAGE_DMENU_WAYLAND # Runtime + help + Enable support for swaybar + +endif # BR2_PACKAGE_SWAY + comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" depends on !BR2_PACKAGE_SYSTEMD || \ !BR2_PACKAGE_HAS_UDEV || \ diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 1e3dd279ef..6d924ca92e 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -13,7 +13,6 @@ SWAY_CONF_OPTS = \ -Dwerror=false \ -Dzsh-completions=false \ -Dfish-completions=false \ - -Dswaybar=false \ -Dswaynag=false \ -Dtray=disabled \ -Dman-pages=disabled \ @@ -44,4 +43,10 @@ else SWAY_CONF_OPTS += -Ddefault-wallpaper=false endif +ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR),y) +SWAY_CONF_OPTS += -Dswaybar=true +else +SWAY_CONF_OPTS += -Dswaybar=false +endif + $(eval $(meson-package))