up to 0.9.22

diff --git a/fmt-10.1.0.patch b/fmt-10.1.0.patch
deleted file mode 100644 (file)
index b66460c..0000000
--- a/fmt-10.1.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c8237437d27fa255f4d8a380dec6db872d139e7d Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Tue, 15 Aug 2023 20:57:07 +0200
-Subject: [PATCH] Explicitly cast ustring to string when passing to fmt
-
-don't rely on implicit conversion which is no longer present in fmt
-10.1.0
-
-Fixes #2403
----
- include/util/format.hpp  | 2 +-
- src/modules/sni/item.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/util/format.hpp b/include/util/format.hpp
-index 00b6a31..069d889 100644
---- a/include/util/format.hpp
-+++ b/include/util/format.hpp
-@@ -93,7 +93,7 @@ template <>
- struct formatter<Glib::ustring> : formatter<std::string> {
-   template <typename FormatContext>
-   auto format(const Glib::ustring& value, FormatContext& ctx) {
--    return formatter<std::string>::format(value, ctx);
-+    return formatter<std::string>::format(static_cast<std::string>(value), ctx);
-   }
- };
- }  // namespace fmt
-diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp
-index 9d3fc4b..871621f 100644
---- a/src/modules/sni/item.cpp
-+++ b/src/modules/sni/item.cpp
-@@ -22,7 +22,7 @@ struct fmt::formatter<Glib::VariantBase> : formatter<std::string> {
-   template <typename FormatContext>
-   auto format(const Glib::VariantBase& value, FormatContext& ctx) {
-     if (is_printable(value)) {
--      return formatter<std::string>::format(value.print(), ctx);
-+      return formatter<std::string>::format(static_cast<std::string>(value.print()), ctx);
-     } else {
-       return formatter<std::string>::format(value.get_type_string(), ctx);
-     }
--- 
-2.41.0
-

diff --git a/waybar.spec b/waybar.spec
index 992d246e16be874e73da0457d519beb03bc8881c..99cca19d481ea05fcdf8f4d9eeab9b52eb8263d3 100644 (file)
--- a/waybar.spec
+++ b/waybar.spec
@@ -1,13 +1,12 @@
 Summary:       Highly customizable Wayland bar for Sway and Wlroots based compositors
 Summary(pl.UTF-8):     Bardzo konfigurowalny pasek Waylanda do kompozytorów opartych na Sway i Wlroots
 Name:          waybar
-Version:       0.9.21
+Version:       0.9.22
 Release:       1
 License:       MIT
 Group:         Applications
 Source0:       https://github.com/Alexays/Waybar/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: e274ae334ef8f1790989add8412717a2
-Patch0:                fmt-10.1.0.patch
+# Source0-md5: 7d2a3d2ced4cef5532e25cfec09e56c9
 URL:           https://github.com/Alexays/Waybar/
 BuildRequires: cmake
 BuildRequires: date-devel
@@ -57,7 +56,6 @@ i Wlroots.
 
 %prep
 %setup -q -n Waybar-%{version}
-%patch0 -p1
 
 %build
 %meson build