[rpms/waybar] rawhide: systemd: declare known incompatible desktop environments

[rpms/waybar] rawhide: systemd: declare known incompatible desktop environments

[Aleksei Bavshin]

A new commit has been pushed.

Repo   : rpms/waybar
Branch : rawhide
Commit : ab5016c9bcef88948aa47e4134561e3032cb5e54
Author : Aleksei Bavshin <alebastr@fedoraproject.org>
Date   : 2026-08-02T13:43:59-07:00
Stats  : +46/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/waybar/c/ab5016c9bcef88948aa47e4134561e3032cb5e54?branch=rawhide

Log:
systemd: declare known incompatible desktop environments

---
diff --git a/waybar-fedora-systemd-target-conflicts.patch b/waybar-fedora-systemd-target-conflicts.patch
new file mode 100644
index 0000000..f277e2e
--- /dev/null
+++ b/waybar-fedora-systemd-target-conflicts.patch
@@ -0,0 +1,39 @@
+From f67dcce02d02ef1dc8e78efc565647b6fe8656d4 Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Sat, 4 Jul 2026 22:51:31 -0700
+Subject: [PATCH] systemd: declare known incompatible desktop environments
+
+Waybar can be used with many different Wayland compositors. Some of
+those provide distinct user session targets, some aren't. The usual
+recommendation for the latter ones is to allow manual startup of the
+graphical-session.target and run "systemd --user start ..." command on
+init.
+
+To ensure that all of the above is supported, we have to keep the
+service bound to the graphical-session.target. However, this may impact
+unrelated sessions on machines with multiple DEs installed.
+
+Instead of listing dozens of supported Wayland compositors and breaking
+any configs that explicitly use graphical-session.target, keep a list
+of known sessions where Waybar is not wanted.
+---
+ resources/waybar.service.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/resources/waybar.service.in b/resources/waybar.service.in
+index 18bac54c..9a54e5ba 100644
+--- a/resources/waybar.service.in
++++ b/resources/waybar.service.in
+@@ -6,6 +6,9 @@ After=graphical-session.target
+ Requisite=graphical-session.target
+ 
+ [Service]
++ExecCondition=sh -c '[ -n "$WAYLAND_DISPLAY" ]'
++# Known incompatible Wayland sessions
++ExecCondition=/usr/lib/systemd/systemd-xdg-autostart-condition "" "GNOME:KDE:COSMIC:X-Cinnamon"
+ ExecStart=@prefix@/bin/waybar
+ ExecReload=kill -SIGUSR2 $MAINPID
+ Restart=on-failure
+-- 
+2.55.0
+

diff --git a/waybar.spec b/waybar.spec
index 6c6d900..60ff304 100644
--- a/waybar.spec
+++ b/waybar.spec
@@ -1,6 +1,6 @@
 Name:           waybar
 Version:        0.15.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Highly customizable Wayland bar for Sway and Wlroots based compositors
 # Source files/overall project licensed as MIT, but
 # - BSL-1.0
@@ -21,6 +21,9 @@ Source:         %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 #  - Remove several modules from the config
 #  - Switch font to monospace
 Patch:          waybar-fedora-config-changes.patch
+# Downstream changes to the systemd service:
+#  - Check that the environment is Wayland and is not listed as unsupported
+Patch:          waybar-fedora-systemd-target-conflicts.patch
 
 # Fix for hot update loop that can spike CPU and
 # destabilize rendering in drawer/group setups
@@ -107,6 +110,9 @@ Recommends:     font(fontawesome7brands)
 %{_userunitdir}/%{name}.service
 
 %changelog
+* Sun Aug 02 2026 Aleksei Bavshin <alebastr@fedoraproject.org> - 0.15.0-6
+- systemd: declare known incompatible desktop environments
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild