diff --git a/0001-fix-adapt-to-fmt-9.0.0-breaking-changes.patch b/0001-fix-adapt-to-fmt-9.0.0-breaking-changes.patch deleted file mode 100644 index 6c9becd..0000000 --- a/0001-fix-adapt-to-fmt-9.0.0-breaking-changes.patch +++ /dev/null @@ -1,87 +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] 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 cc514e1..7cd4355 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 be2ec91..a815e2f 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 5894cb6..dec3b50 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 560d736..007862d 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 26234e3..f28b050 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 --- -2.37.1 - diff --git a/sources b/sources index ba2eaf2..954597a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waybar-0.9.13.tar.gz) = d0a87044bcccdd16b1bbb20de750804c06335f11e638d37b5b80b72233e513378ba521f5c9d2c121a78a206877487628a6562cb080dd43eadae27e52d4cf6349 +SHA512 (waybar-0.9.16.tar.gz) = d89067639de8ad560cd1515bb448f47f5994281b35239f069a2012165c0f83e0a3ae861cffbb93e7636d7d95cece9424e5900d40a06b80e71768aabda5f7b54a diff --git a/waybar-0.9.13-add-gamemode-man-file-to-meson.patch b/waybar-0.9.13-add-gamemode-man-file-to-meson.patch deleted file mode 100644 index 4ec378e..0000000 --- a/waybar-0.9.13-add-gamemode-man-file-to-meson.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3c182c9ca9dc8341388885ad0e1d0ed8b28c09aa Mon Sep 17 00:00:00 2001 -From: Erik Reider <35975961+ErikReider@users.noreply.github.com> -Date: Mon, 23 May 2022 14:13:30 +0200 -Subject: [PATCH] Added gamemode man file to meson - ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 21b89fe0..5a59df59 100644 ---- a/meson.build -+++ b/meson.build -@@ -345,6 +345,7 @@ if scdoc.found() - 'waybar-cpu.5.scd', - 'waybar-custom.5.scd', - 'waybar-disk.5.scd', -+ 'waybar-gamemode.5.scd', - 'waybar-idle-inhibitor.5.scd', - 'waybar-keyboard-state.5.scd', - 'waybar-memory.5.scd', diff --git a/waybar-0.9.16-Revert-catch2-update.patch b/waybar-0.9.16-Revert-catch2-update.patch new file mode 100644 index 0000000..46205af --- /dev/null +++ b/waybar-0.9.16-Revert-catch2-update.patch @@ -0,0 +1,105 @@ +From a821179ed6fce1e45f65821571d54a392da7c4a0 Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin +Date: Thu, 24 Nov 2022 21:14:59 -0800 +Subject: [PATCH] Revert catch2 update + +--- + meson.build | 1 - + subprojects/catch2.wrap | 17 ++++++++--------- + test/SafeSignal.cpp | 2 +- + test/config.cpp | 2 +- + test/main.cpp | 19 +++++++++---------- + test/waybar_time.cpp | 2 +- + 6 files changed, 20 insertions(+), 23 deletions(-) + +diff --git a/meson.build b/meson.build +index 557a02d..e6b1670 100644 +--- a/meson.build ++++ b/meson.build +@@ -435,7 +435,7 @@ endif + + catch2 = dependency( + 'catch2', +- version: '>=3.0.0', ++ version: ['>=2.13.0', '<3.0.0'], + fallback: ['catch2', 'catch2_dep'], + required: get_option('tests'), + ) +diff --git a/test/SafeSignal.cpp b/test/SafeSignal.cpp +index 7ff6f2a..6a1e17a 100644 +--- a/test/SafeSignal.cpp ++++ b/test/SafeSignal.cpp +@@ -2,7 +2,7 @@ + + #include + +-#include ++#include + #include + #include + +diff --git a/test/config.cpp b/test/config.cpp +index cdc96b0..29b0502 100644 +--- a/test/config.cpp ++++ b/test/config.cpp +@@ -1,6 +1,6 @@ + #include "config.hpp" + +-#include ++#include + + TEST_CASE("Load simple config", "[config]") { + waybar::Config conf; +diff --git a/test/main.cpp b/test/main.cpp +index 7970c26..5eb060d 100644 +--- a/test/main.cpp ++++ b/test/main.cpp +@@ -3,8 +3,8 @@ + #include + #include + +-#include +-#include ++#include ++#include + #include + + int main(int argc, char* argv[]) { +@@ -13,14 +13,13 @@ int main(int argc, char* argv[]) { + + session.applyCommandLine(argc, argv); + const auto logger = spdlog::default_logger(); +- for (const auto& spec : session.config().getReporterSpecs()) { +- if (spec.name() == "tap") { +- spdlog::set_pattern("# [%l] %v"); +- } else if (spec.name() == "compact") { +- logger->sinks().clear(); +- } else { +- logger->sinks().assign({std::make_shared()}); +- } ++ const auto& reporter_name = session.config().getReporterName(); ++ if (reporter_name == "tap") { ++ spdlog::set_pattern("# [%l] %v"); ++ } else if (reporter_name == "compact") { ++ logger->sinks().clear(); ++ } else { ++ logger->sinks().assign({std::make_shared()}); + } + + return session.run(); +diff --git a/test/waybar_time.cpp b/test/waybar_time.cpp +index 79469d4..5fc3312 100644 +--- a/test/waybar_time.cpp ++++ b/test/waybar_time.cpp +@@ -3,7 +3,7 @@ + #include + #include + +-#include ++#include + #include + #include + +-- +2.38.1 + diff --git a/waybar.spec b/waybar.spec index 30470f5..a8eada8 100644 --- a/waybar.spec +++ b/waybar.spec @@ -1,14 +1,13 @@ Name: waybar -Version: 0.9.13 -Release: 4%{?dist} +Version: 0.9.16 +Release: 1%{?dist} Summary: Highly customizable Wayland bar for Sway and Wlroots based compositors # MIT for main package, Boost for bundled clara.hpp License: MIT and Boost URL: https://github.com/Alexays/Waybar Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: %{url}/commit/3c182c9.patch#/waybar-0.9.13-add-gamemode-man-file-to-meson.patch -# Fix build with fmt 9, upstream PR Alexays/Waybar#1617 -Patch1: 0001-fix-adapt-to-fmt-9.0.0-breaking-changes.patch + +Patch0: waybar-0.9.16-Revert-catch2-update.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -19,11 +18,12 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(catch2) BuildRequires: pkgconfig(date) BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) -BuildRequires: pkgconfig(fmt) >= 7.0.0 +BuildRequires: pkgconfig(fmt) >= 8.1.1 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gtk-layer-shell-0) BuildRequires: pkgconfig(gtkmm-3.0) +BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libevdev) BuildRequires: pkgconfig(libinput) @@ -33,11 +33,12 @@ BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(sigc++-2.0) -BuildRequires: pkgconfig(spdlog) >= 1.8.5 +BuildRequires: pkgconfig(spdlog) >= 1.10.0 BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(wireplumber-0.4) BuildRequires: pkgconfig(xkbregistry) Enhances: sway @@ -79,6 +80,9 @@ Suggests: font(fontawesome5free) %{_userunitdir}/%{name}.service %changelog +* Thu Nov 24 2022 Aleksei Bavshin - 0.9.16-1 +- Update to 0.9.16 (#2139998) + * Thu Nov 03 2022 Vitaly Zaitsev - 0.9.13-4 - Rebuilt due to spdlog update.