From 977da7608e79252312674f2ee9b3f2b74d95c7b91752f2745d7118ce9b173815 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 16 Aug 2021 14:26:34 +0000 Subject: [PATCH 1/4] - Update to 0.9.8: * https://github.com/Alexays/Waybar/compare/0.9.7...0.9.8 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=61 --- 0.9.7.tar.xz | 3 --- 0.9.8.tar.xz | 3 +++ waybar.changes | 6 ++++++ waybar.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 0.9.7.tar.xz create mode 100644 0.9.8.tar.xz diff --git a/0.9.7.tar.xz b/0.9.7.tar.xz deleted file mode 100644 index 161a257..0000000 --- a/0.9.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88a715f3dd1c61f9546e1c0fd922624fa625800481c3e4f7a3afe68f503dca5b -size 3561488 diff --git a/0.9.8.tar.xz b/0.9.8.tar.xz new file mode 100644 index 0000000..9955ee9 --- /dev/null +++ b/0.9.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79a4a9351e64b7825b45d426df6d2744958e3401c59cb4549a761329e4172932 +size 3592224 diff --git a/waybar.changes b/waybar.changes index dc716cb..0f617a0 100644 --- a/waybar.changes +++ b/waybar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 16 14:25:05 UTC 2021 - Michael Vetter + +- Update to 0.9.8: + * https://github.com/Alexays/Waybar/compare/0.9.7...0.9.8 + ------------------------------------------------------------------- Tue Jul 13 09:50:00 UTC 2021 - Michael Vetter diff --git a/waybar.spec b/waybar.spec index c005c74..8a2f575 100644 --- a/waybar.spec +++ b/waybar.spec @@ -17,7 +17,7 @@ Name: waybar -Version: 0.9.7 +Version: 0.9.8 Release: 0 Summary: Customizable Wayland bar for Sway and Wlroots based compositors License: MIT From f55e882f9d03940cff00724d347ae00c4b307ef4c88bd1973fe5408d594c50a6 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 16 Aug 2021 14:27:29 +0000 Subject: [PATCH 2/4] - Remove waybar-0.9.7-fmt-compat.patch: upstreamed OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=62 --- waybar-0.9.7-fmt-compat.patch | 40 ----------------------------------- waybar.changes | 1 + waybar.spec | 2 -- 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 waybar-0.9.7-fmt-compat.patch diff --git a/waybar-0.9.7-fmt-compat.patch b/waybar-0.9.7-fmt-compat.patch deleted file mode 100644 index 2329c39..0000000 --- a/waybar-0.9.7-fmt-compat.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001 -From: John Helmert III -Date: Tue, 29 Jun 2021 21:29:12 -0500 -Subject: [PATCH] libfmt >=8.0.0 compatibility - ---- - include/util/format.hpp | 4 ++++ - src/modules/clock.cpp | 3 +++ - 2 files changed, 7 insertions(+) - -diff --git a/include/util/format.hpp b/include/util/format.hpp -index 288d8f0cd..543a100fb 100644 ---- a/include/util/format.hpp -+++ b/include/util/format.hpp -@@ -35,7 +35,11 @@ namespace fmt { - // The rationale for ignoring it is that the only reason to specify - // an alignment and a with is to get a fixed width bar, and ">" is - // sufficient in this implementation. -+#if FMT_VERSION < 80000 - width = parse_nonnegative_int(it, end, ctx); -+#else -+ width = detail::parse_nonnegative_int(it, end, -1); -+#endif - } - return it; - } -diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp -index 22bedc783..82c570102 100644 ---- a/src/modules/clock.cpp -+++ b/src/modules/clock.cpp -@@ -196,6 +196,9 @@ template <> - struct fmt::formatter : fmt::formatter { - template - auto format(const waybar_time& t, FormatContext& ctx) { -+#if FMT_VERSION >= 80000 -+ auto& tm_format = specs; -+#endif - return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime)); - } - }; diff --git a/waybar.changes b/waybar.changes index 0f617a0..c3e72e8 100644 --- a/waybar.changes +++ b/waybar.changes @@ -3,6 +3,7 @@ Mon Aug 16 14:25:05 UTC 2021 - Michael Vetter - Update to 0.9.8: * https://github.com/Alexays/Waybar/compare/0.9.7...0.9.8 +- Remove waybar-0.9.7-fmt-compat.patch: upstreamed ------------------------------------------------------------------- Tue Jul 13 09:50:00 UTC 2021 - Michael Vetter diff --git a/waybar.spec b/waybar.spec index 8a2f575..4100f44 100644 --- a/waybar.spec +++ b/waybar.spec @@ -27,8 +27,6 @@ URL: https://github.com/Alexays/Waybar # to get the `date` dependency. and create own tarball #Source: https://github.com/Alexays/Waybar/archive/%{version}.tar.gz Source: %{version}.tar.xz -# boo#1188200 - https://github.com/Alexays/Waybar/commit/368e4813de5356332d1167e8200cb5633e772ed6 -Patch0: waybar-0.9.7-fmt-compat.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gtk-layer-shell-devel From 38a18fff102c8db92ec80d6a8eba501b4895b05ecdbca7d18ddbcbd434ffd815 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 16 Aug 2021 14:34:48 +0000 Subject: [PATCH 3/4] * Fix incorrect tray icon scaling * Don't start if graphical-session is not running * feat(tray): handle Status property * feat(tray): handle scroll events * feat(tray): fallback to Title for items without ToolTip * feat(tray): implement tooltips (text only) for tray items * refactor(tray): infer changed properties from signal name * fix(tray): ignore unused WindowId property * Fix blurry tray icons for HiDPI displays * Remove unused variable * Add man page for keyboard_state module * Search for device automatically if none given * Add default style * Update css class when locked/unlocked * Add more configuaration * Basic keyboard state module * Fix pulseaudio icon name compilation error * pulseaudio: Control currently running sink * Support per-device icon in pulseaudio * Improve sway/language * Do not fail to parse a multi-bar config * libfmt >=8.0.0 compatibility * Add include man section * Workaround for circular imports * Proper formatting * Add recursive config includes * fix(util): protect std::condition_variable methods from pthread_cancel * network: Fix mix use of default and state specific format * network: Fix one case where default route is deleted without notification * network: Handle ip route priority OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=63 --- waybar.changes | 59 +++++++++++++++++++++++++++++++++++++++++++++++++- waybar.spec | 1 + 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/waybar.changes b/waybar.changes index c3e72e8..a3a0063 100644 --- a/waybar.changes +++ b/waybar.changes @@ -2,7 +2,64 @@ Mon Aug 16 14:25:05 UTC 2021 - Michael Vetter - Update to 0.9.8: - * https://github.com/Alexays/Waybar/compare/0.9.7...0.9.8 + * Fix incorrect tray icon scaling + * Don't start if graphical-session is not running + * feat(tray): handle Status property + * feat(tray): handle scroll events + * feat(tray): fallback to Title for items without ToolTip + * feat(tray): implement tooltips (text only) for tray items + * refactor(tray): infer changed properties from signal name + * fix(tray): ignore unused WindowId property + * Fix blurry tray icons for HiDPI displays + * Remove unused variable + * Add man page for keyboard_state module + * Search for device automatically if none given + * Add default style + * Update css class when locked/unlocked + * Add more configuaration + * Basic keyboard state module + * Fix pulseaudio icon name compilation error + * pulseaudio: Control currently running sink + * Support per-device icon in pulseaudio + * Improve sway/language + * Do not fail to parse a multi-bar config + * libfmt >=8.0.0 compatibility + * Add include man section + * Workaround for circular imports + * Proper formatting + * Add recursive config includes + * fix(util): protect std::condition_variable methods from pthread_cancel + * network: Fix mix use of default and state specific format + * network: Fix one case where default route is deleted without notification + * network: Handle ip route priority + * network: Also clear ifname in clearIface() + * network: Parse whole RTM_NEWROUTE msg before interpreting it + * sway-language: ignore events with empty layout + * network: Update WiFi information when available + * network: Fix use of carrier information + * doc: add man for exclusive and passthrough flags + * feat(bar): add config flag to disable exclusive zone + * feat(bar): add config flag for pointer event passthrough + * Add options to use a .json extension for the config filename + * network: Handle carrier information + * network: Rework interface auto detection, handle route change events + * network: Rework address lookup to use only events + * network: Rework initial interface search by using a dump + * network: Read all available messages on ev_sock_ + * network: Start the module with some text in the label_ + * network: Initialise cidr_ like clearIface() does + * Fix power calculation when battery units are in μA instead of μW + * fix: incorrect battery percentage on Pinebook Pro + * fix: bluetooth status tooltip + * rewriteTitle: allow multiple sequential rewrites + * [modules/battery] allow format-discharging-full + * [modules/pulseaudio] fix bluetooth class for PipeWire + * Document changes in manpage + * Catch exception on erroneous rules + * Add option to rewrite sway/window title + * feat: implement mpd volume format template + * Remove exceed protected + * Add ignore-list param to wlr/taskbar - Remove waybar-0.9.7-fmt-compat.patch: upstreamed ------------------------------------------------------------------- diff --git a/waybar.spec b/waybar.spec index 4100f44..50c7c7b 100644 --- a/waybar.spec +++ b/waybar.spec @@ -50,6 +50,7 @@ BuildRequires: pkgconfig(libmpdclient) BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libnl-genl-3.0) # optional: audio +BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(sigc++-2.0) From f9b008097df8a262697f18843b93ee713a286c5d6686b5c9c480d240f426d1ab Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 16 Aug 2021 14:38:35 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=64 --- waybar.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/waybar.spec b/waybar.spec index 50c7c7b..0e04e85 100644 --- a/waybar.spec +++ b/waybar.spec @@ -59,6 +59,7 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(xkbregistry) # requires branding Requires: %{name}-branding # optional: sway integration