From 000eb451594c53945f285f29b58d74d544f7c2b8bfbff3cd62fee9211baeb1b2 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 31 Oct 2022 08:15:10 +0000 Subject: [PATCH] - Update to 0.9.14: No changelog. Too many commits to list. Please see https://github.com/Alexays/Waybar/compare/0.9.13...0.9.14 - Remove waybar-0.9.13-fmt-compat.patch - Use catch2 >= 3 - Enable sndio OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=79 --- 0.9.13.tar.gz | 3 - 0.9.14.tar.xz | 3 + waybar-0.9.13-fmt-compat.patch | 180 --------------------------------- waybar.changes | 10 ++ waybar.spec | 11 +- 5 files changed, 18 insertions(+), 189 deletions(-) delete mode 100644 0.9.13.tar.gz create mode 100644 0.9.14.tar.xz delete mode 100644 waybar-0.9.13-fmt-compat.patch diff --git a/0.9.13.tar.gz b/0.9.13.tar.gz deleted file mode 100644 index 18b8b31..0000000 --- a/0.9.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61ce252cee66e894c5e213d2246f6f7faf7b2911b269fefb7f97a40694cc5af4 -size 5771902 diff --git a/0.9.14.tar.xz b/0.9.14.tar.xz new file mode 100644 index 0000000..9b585d1 --- /dev/null +++ b/0.9.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57cc77e5e862983c63d453c3105bb03d7379915ea00ad3b00c59e6f4a92ff318 +size 5300600 diff --git a/waybar-0.9.13-fmt-compat.patch b/waybar-0.9.13-fmt-compat.patch deleted file mode 100644 index 62e1472..0000000 --- a/waybar-0.9.13-fmt-compat.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 24a8332b62b5c1c8d480116655ce9c582d1f4516 Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Mon, 11 Jul 2022 22:52:33 -0700 -Subject: [PATCH 1/3] fix: adapt to fmt 9.0.0 breaking changes - ---- - include/util/json.hpp | 8 ++++++++ - src/client.cpp | 2 +- - src/config.cpp | 1 - - src/modules/sni/host.cpp | 1 - - src/modules/sway/bar.cpp | 1 - - 5 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/include/util/json.hpp b/include/util/json.hpp -index cc514e139..7cd43552b 100644 ---- a/include/util/json.hpp -+++ b/include/util/json.hpp -@@ -1,7 +1,15 @@ - #pragma once - -+#include - #include - -+#if (FMT_VERSION >= 90000) -+ -+template <> -+struct fmt::formatter : ostream_formatter {}; -+ -+#endif -+ - namespace waybar::util { - - struct JsonParser { -diff --git a/src/client.cpp b/src/client.cpp -index be2ec9178..a815e2fe1 100644 ---- a/src/client.cpp -+++ b/src/client.cpp -@@ -1,12 +1,12 @@ - #include "client.hpp" - --#include - #include - - #include - - #include "idle-inhibit-unstable-v1-client-protocol.h" - #include "util/clara.hpp" -+#include "util/format.hpp" - #include "wlr-layer-shell-unstable-v1-client-protocol.h" - - waybar::Client *waybar::Client::inst() { -diff --git a/src/config.cpp b/src/config.cpp -index 5894cb6b1..dec3b50b2 100644 ---- a/src/config.cpp -+++ b/src/config.cpp -@@ -1,6 +1,5 @@ - #include "config.hpp" - --#include - #include - #include - #include -diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp -index 560d7368b..007862dcc 100644 ---- a/src/modules/sni/host.cpp -+++ b/src/modules/sni/host.cpp -@@ -1,6 +1,5 @@ - #include "modules/sni/host.hpp" - --#include - #include - - namespace waybar::modules::SNI { -diff --git a/src/modules/sway/bar.cpp b/src/modules/sway/bar.cpp -index 26234e3b5..f28b05025 100644 ---- a/src/modules/sway/bar.cpp -+++ b/src/modules/sway/bar.cpp -@@ -1,6 +1,5 @@ - #include "modules/sway/bar.hpp" - --#include - #include - - #include - -From 3117aefdf3e0bcae6671ab4669241c934bc9ec50 Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Tue, 12 Jul 2022 22:20:49 -0700 -Subject: [PATCH 2/3] fix: drop conditionals for ancient fmt versions - ---- - include/modules/keyboard_state.hpp | 5 ----- - include/modules/simpleclock.hpp | 6 +----- - src/modules/clock.cpp | 9 ++------- - 3 files changed, 3 insertions(+), 17 deletions(-) - -diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp -index 6af19d145..05fbec131 100644 ---- a/include/modules/keyboard_state.hpp -+++ b/include/modules/keyboard_state.hpp -@@ -1,11 +1,6 @@ - #pragma once - --#include --#if FMT_VERSION < 60000 --#include --#else - #include --#endif - #include - - #include "AModule.hpp" -diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp -index aa9a0a224..5cbee4c6c 100644 ---- a/include/modules/simpleclock.hpp -+++ b/include/modules/simpleclock.hpp -@@ -1,11 +1,7 @@ - #pragma once - --#include --#if FMT_VERSION < 60000 --#include --#else - #include --#endif -+ - #include "ALabel.hpp" - #include "util/sleeper_thread.hpp" - -diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp -index 959cad903..467536e1e 100644 ---- a/src/modules/clock.cpp -+++ b/src/modules/clock.cpp -@@ -1,15 +1,10 @@ - #include "modules/clock.hpp" - --#include -- --#include --#if FMT_VERSION < 60000 --#include --#else - #include --#endif -+#include - - #include -+#include - #include - #include - - -From a44622aa9ff4b85c5eeb54663ecf9d7fe617bc08 Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Wed, 13 Jul 2022 22:34:29 -0700 -Subject: [PATCH 3/3] fix: fmt 9.x deprecation warning for implicit enum - conversions - ---- - src/modules/mpd/state.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp -index 4d1e8c91b..aa1a18f8e 100644 ---- a/src/modules/mpd/state.cpp -+++ b/src/modules/mpd/state.cpp -@@ -10,6 +10,13 @@ namespace waybar::modules { - } // namespace waybar::modules - #endif - -+#if FMT_VERSION >= 90000 -+/* Satisfy fmt 9.x deprecation of implicit conversion of enums to int */ -+auto format_as(enum mpd_idle val) { -+ return static_cast>(val); -+} -+#endif -+ - namespace waybar::modules::detail { - - #define IDLE_RUN_NOIDLE_AND_CMD(...) \ diff --git a/waybar.changes b/waybar.changes index fe5dd5c..3443e21 100644 --- a/waybar.changes +++ b/waybar.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 27 06:52:06 UTC 2022 - Michael Vetter + +- Update to 0.9.14: + No changelog. Too many commits to list. Please see + https://github.com/Alexays/Waybar/compare/0.9.13...0.9.14 +- Remove waybar-0.9.13-fmt-compat.patch +- Use catch2 >= 3 +- Enable sndio + ------------------------------------------------------------------- Sun Oct 16 15:41:25 UTC 2022 - Chris Bradbury diff --git a/waybar.spec b/waybar.spec index 43132c1..e5a6cb6 100644 --- a/waybar.spec +++ b/waybar.spec @@ -17,7 +17,7 @@ Name: waybar -Version: 0.9.13 +Version: 0.9.14 Release: 0 Summary: Customizable Wayland bar for Sway and Wlroots based compositors License: MIT @@ -26,8 +26,7 @@ URL: https://github.com/Alexays/Waybar # use this to download tarball. then use `meson subprojects download` # to get the `date` dependency. and create own tarball #Source: https://github.com/Alexays/Waybar/archive/%{version}.tar.gz -Source: %{version}.tar.gz -Patch: https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/1617.patch#/waybar-0.9.13-fmt-compat.patch +Source: %{version}.tar.xz BuildRequires: cmake %if 0%{?sle_version} >= 150400 BuildRequires: gcc11-c++ @@ -40,8 +39,7 @@ BuildRequires: ninja BuildRequires: pkgconfig # test dependency BuildRequires: pkgconfig(catch2) < 3.0 -# wait for SR#860135 -#BuildRequires: sndio-devel >= 1.7.0 +BuildRequires: sndio-devel >= 1.7.0 # optional: man pages BuildRequires: scdoc # optional: tray module @@ -59,6 +57,7 @@ BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libnl-genl-3.0) # optional: audio BuildRequires: pkgconfig(libevdev) +BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(sigc++-2.0) @@ -97,7 +96,7 @@ This package provides the upstream look and feel for sway. %if 0%{?sle_version} >= 150400 export CXX=g++-11 %endif -%meson -Dsndio=disabled +%meson %meson_build %install