From f55e882f9d03940cff00724d347ae00c4b307ef4c88bd1973fe5408d594c50a6 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Mon, 16 Aug 2021 14:27:29 +0000
Subject: [PATCH] - 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 <jchelmert3@posteo.net>
-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<waybar_time> : fmt::formatter<std::tm> {
-   template <typename FormatContext>
-   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 <mvetter@suse.com>
 
 - 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 <mvetter@suse.com>
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