5 files changed, 43 insertions, 2 deletions
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 24e59829bfad..e5cd5a5c7c25 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 6169c1928d5a..3fb03bf50c4b 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,6 +1,7 @@
+AUX waybar-0.9.7-libfmt-8.patch 1141 BLAKE2B 0be30ec869c1893078eaed0d57e80da8ddfb7b6e1b7658b52f588ebb44aa3b981e570dabb0f4595e3a4df3daeb069ec7f12f8b1406ae17edf75e560b480f299a SHA512 ffa892473cd20d1f8456f82b4df20d1d3d9084c2d5c537d8384ab9372bd7bf099c4243b25b8e19e04f564a5676fad5f7b7451cd281014b754d31529c3072b3b7
 DIST waybar-0.9.5.tar.gz 146094 BLAKE2B cd46e308d282df5ba6ce34417c0fe5468c188acb3c0f9bf5b2d4dd4c2c80547cab65172b4f4162c2dde0b78f68d15c8b79be74113cacd2610fd2a48299e14013 SHA512 0bbb9e898e205728fc564389927fec661a8dd6a9995a6c5d318f930f4527d6afd0be11a6b71dfa9aafb05c982e0f131e51eb0eec9a3e92c28f5cb04ff780fa8b
 DIST waybar-0.9.7.tar.gz 150768 BLAKE2B 41dbcac30ffc42e04d565a590c1bce086271938936a05599bca6b74bac3fb2a8d1a4a4ddc5bec079dea6963eef8722c2c87a99c066de495caa163b1103a08095 SHA512 731b686235b1f0f94ce263e7ffa854f980fb8fccf30a0bd89e7aa0e1ca2c3fabd6d0df837bace6d6915d7a633500ed1f0497d012e082ca99fb32a78142b99279
-EBUILD waybar-0.9.5-r1.ebuild 1514 BLAKE2B 85f7e0da291abfe35793f3b7a8e2ae1278c1e333f763b59c6d0f3c503683cf706f814cc07697082198dc2296b2280f29ba17b78b73fa5b262b77d26d12599601 SHA512 74452b41856774a0bc86839ccfec4e1f07346dfaa0eaad1f2c34fed4f5d60bf2b3beb2d71fba8325c5934cf3ffc3aab24910331f0d408925ccc84b36d4b4a523
-EBUILD waybar-0.9.7-r1.ebuild 1514 BLAKE2B 85f7e0da291abfe35793f3b7a8e2ae1278c1e333f763b59c6d0f3c503683cf706f814cc07697082198dc2296b2280f29ba17b78b73fa5b262b77d26d12599601 SHA512 74452b41856774a0bc86839ccfec4e1f07346dfaa0eaad1f2c34fed4f5d60bf2b3beb2d71fba8325c5934cf3ffc3aab24910331f0d408925ccc84b36d4b4a523
+EBUILD waybar-0.9.5-r1.ebuild 1569 BLAKE2B 18ffdcdac39f0e1aa26b64bf05862531c560afbc6373d45ae64663023f91daa48b90663e6938274e55bc3c4b98fbb257b1c3c1eaaed4664d05d95b6e50c9f6cb SHA512 05798491284e0ac6dd18feccc226385c732a646eb436b685cb5e9dc3b25b1a966fffa0dad30773ab60005088d3b635182d0a3541075eb8c80e09e83665db1792
+EBUILD waybar-0.9.7-r1.ebuild 1562 BLAKE2B 6b34b81169cac84b943a62d7ab36aecb40a1ce286a39ae94732bb5a4b467c5849307e4684efdc02409fe3ea476e611fa1f0699d6f1dedde7509ce40a63c47295 SHA512 0df2679ab7bb90e448a4d471d4c4455abcbc67e97055dd9e2da9b971b8bdb4696adb866142edb1eb4a687de622bca867a3244b99c96bb5d83be0cca143c7af4a
 EBUILD waybar-9999.ebuild 1486 BLAKE2B b81b7d2c46f9713bbea12d8b3dc29d6e522c8c1bdb697fafa5a848b5589bce945264a5fcb4052761f5640580a4c0674f53d3d1cea9c0d98639332d1377119ffa SHA512 0807d6f355a104cfa5f764c5d21dfa6ef011d73a62e740f405f4a31e63f98d29925ba7935d55ba16912248e0f909323077121b4cdb920d8069f7c8ceb770b4ad
 MISC metadata.xml 1028 BLAKE2B 83224cb07773a149b3df13204dfef980b423d42cfe017733b7e9710a357d949397d8b657958e7dd15d8ec610332dbcdf67a8de34b25be6caf974e0b373946e25 SHA512 2e53d76855c8ad8e8b73426a455482e622a768b4d757022a4c61d989b0275b3aae02ce7df1bd7c386a29984e2b086e07c836b981c5051db06be3f24daf774b33
diff --git a/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch b/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch
new file mode 100644
index 000000000000..8ffc8a42a9f1
--- /dev/null
+++ b/gui-apps/waybar/files/waybar-0.9.7-libfmt-8.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/797649
+https://github.com/Alexays/Waybar/pull/1144
+
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+--- 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;
+         }
+--- 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/gui-apps/waybar/waybar-0.9.5-r1.ebuild b/gui-apps/waybar/waybar-0.9.5-r1.ebuild
index 3247d86629bc..9bc5d7b989d9 100644
--- a/gui-apps/waybar/waybar-0.9.5-r1.ebuild
+++ b/gui-apps/waybar/waybar-0.9.5-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.7-libfmt-8.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)
diff --git a/gui-apps/waybar/waybar-0.9.7-r1.ebuild b/gui-apps/waybar/waybar-0.9.7-r1.ebuild
index 3247d86629bc..aeaa8117b737 100644
--- a/gui-apps/waybar/waybar-0.9.7-r1.ebuild
+++ b/gui-apps/waybar/waybar-0.9.7-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libfmt-8.patch"
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature mpd)