diff mbox series

[v3] package/sway: make systemd optional

Message ID 20240202020258.600562-1-stefan@ott.net
State Changes Requested
Headers show
Series [v3] package/sway: make systemd optional | expand

Commit Message

Stefan Ott Feb. 2, 2024, 2:02 a.m. UTC 
Sway works perfectly fine without it.

Signed-off-by: Stefan Ott <stefan@ott.net>

---
Changes v2 -> v3:
  - Make BR2_PACKAGE_SWAY_SWAYBAR_TRAY depend on systemd and set
    sd-bus-provider=libsystemd if SWAY_SWAYBAR_TRAY is enabled
Changes v1 -> v2:
  - Automatically enable systemd integration for builds with systemd
    support (suggested by Thomas Petazzoni)
---
 package/sway/Config.in | 10 ++++++----
 package/sway/sway.mk   |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

Comments

Raphael Pavlidis Feb. 2, 2024, 8:29 p.m. UTC | #1 
Hello Stefan,

Thanks for the new iteration!

On 2/2/24 03:02, Stefan Ott wrote:

[SNIP]

>   
> +comment "swaybar tray needs systemd"
> +	depends on !BR2_PACKAGE_SYSTEMD
> +
>   endif # BR2_PACKAGE_SWAY_SWAYBAR
>   
>   config BR2_PACKAGE_SWAY_SWAYNAG
> @@ -54,9 +57,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG
>   
>   endif # BR2_PACKAGE_SWAY
>   

I like it more if the tray feature is enabled automatically if systemd 
is present, without making it an option.

Thanks,
Raphael Pavlidis
diff mbox series

Patch

diff --git a/package/sway/Config.in b/package/sway/Config.in
index 4f6d9fb215..f11c473fa8 100644
--- a/package/sway/Config.in
+++ b/package/sway/Config.in
@@ -1,6 +1,5 @@ 
 config BR2_PACKAGE_SWAY
 	bool "sway"
-	depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider
 	depends on !BR2_STATIC_LIBS # wlroots
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots
 	depends on BR2_PACKAGE_HAS_LIBEGL # wlroots
@@ -42,9 +41,13 @@  if BR2_PACKAGE_SWAY_SWAYBAR
 
 config BR2_PACKAGE_SWAY_SWAYBAR_TRAY
 	bool "swaybar tray"
+	depends on BR2_PACKAGE_SYSTEMD
 	help
 	  Enable support for swaybar tray
 
+comment "swaybar tray needs systemd"
+	depends on !BR2_PACKAGE_SYSTEMD
+
 endif # BR2_PACKAGE_SWAY_SWAYBAR
 
 config BR2_PACKAGE_SWAY_SWAYNAG
@@ -54,9 +57,8 @@  config BR2_PACKAGE_SWAY_SWAYNAG
 
 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 || \
+comment "sway needs udev, EGL w/ Wayland backend and OpenGL ES support"
+	depends on !BR2_PACKAGE_HAS_UDEV || \
 		!BR2_PACKAGE_HAS_LIBEGL || \
 		!BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
 		!BR2_PACKAGE_HAS_LIBGLES
diff --git a/package/sway/sway.mk b/package/sway/sway.mk
index 0aad9de712..87a01002f0 100644
--- a/package/sway/sway.mk
+++ b/package/sway/sway.mk
@@ -8,13 +8,12 @@  SWAY_VERSION = 1.8.1
 SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION)
 SWAY_LICENSE = MIT
 SWAY_LICENSE_FILES = LICENSE
-SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango
+SWAY_DEPENDENCIES = host-pkgconf wlroots json-c pcre cairo pango
 SWAY_CONF_OPTS = \
 	-Dwerror=false \
 	-Dzsh-completions=false \
 	-Dfish-completions=false \
-	-Dman-pages=disabled \
-	-Dsd-bus-provider=libsystemd
+	-Dman-pages=disabled
 
 ifeq ($(BR2_PACKAGE_WLROOTS_X11),y)
 SWAY_CONF_OPTS += -Dxwayland=enabled
@@ -54,7 +53,8 @@  SWAY_CONF_OPTS += -Dswaynag=false
 endif
 
 ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y)
-SWAY_CONF_OPTS += -Dtray=enabled
+SWAY_DEPENDENCIES += systemd
+SWAY_CONF_OPTS += -Dtray=enabled -Dsd-bus-provider=libsystemd
 else
 SWAY_CONF_OPTS += -Dtray=disabled
 endif