Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
ab5016c9bc |
|||
|
|
9d96345347 | ||
|
|
0ddcc56e20 | ||
|
|
ed30418b47 | ||
|
|
028d43f0ba |
3 changed files with 64 additions and 2 deletions
|
|
@ -21,7 +21,7 @@ index 7e830285..e0310372 100644
|
|||
* {
|
||||
- /* `otf-font-awesome` is required to be installed for icons */
|
||||
- font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
|
||||
+ font-family: 'Noto Sans Mono', 'Font Awesome 6 Free', 'Font Awesome 6 Brands', monospace;
|
||||
+ font-family: 'Noto Sans Mono', 'Font Awesome 7 Free', 'Font Awesome 7 Brands', monospace;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
|
|
|
|||
39
waybar-fedora-systemd-target-conflicts.patch
Normal file
39
waybar-fedora-systemd-target-conflicts.patch
Normal file
|
|
@ -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
|
||||
|
||||
25
waybar.spec
25
waybar.spec
|
|
@ -1,6 +1,6 @@
|
|||
Name: waybar
|
||||
Version: 0.15.0
|
||||
Release: 1%{?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
|
||||
|
|
@ -63,8 +66,13 @@ BuildRequires: pkgconfig(wireplumber-0.5)
|
|||
BuildRequires: pkgconfig(xkbregistry)
|
||||
|
||||
Enhances: sway
|
||||
%if 0%{?fedora} < 45
|
||||
Recommends: font(fontawesome6free)
|
||||
Recommends: font(fontawesome6brands)
|
||||
%else
|
||||
Recommends: font(fontawesome7free)
|
||||
Recommends: font(fontawesome7brands)
|
||||
%endif
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
|
|
@ -102,6 +110,21 @@ Recommends: font(fontawesome6brands)
|
|||
%{_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
|
||||
|
||||
* Thu Jun 25 2026 František Zatloukal <fzatlouk@redhat.com> - 0.15.0-4
|
||||
- Rebuilt for fmt/spdlog
|
||||
|
||||
* Wed May 27 2026 Jerry James <loganjerry@gmail.com> - 0.15.0-3
|
||||
- Migrate from FontAwesome 6.x to 7.x
|
||||
|
||||
* Sun Mar 22 2026 Björn Esser <besser82@fedoraproject.org> - 0.15.0-2
|
||||
- Rebuild (jsoncpp)
|
||||
|
||||
* Sat Feb 07 2026 Tomasz Hołubowicz <mail@alternateved.com> - 0.15.0-1
|
||||
- Update to 0.15.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue