commit: 740103dd3e31496b08863c0b036bd77d2647081b Author: Sebastian Hamann <code <AT> ares-macrotechnology <DOT> com> AuthorDate: Sun Sep 13 10:31:41 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 14 15:57:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740103dd
gui-apps/waybar: Fix runtime crash in v0.9.3 Upstream bug: https://github.com/Alexays/Waybar/issues/810 Patch from: https://github.com/Alexays/Waybar/pull/813 Closes: https://bugs.gentoo.org/742323 Signed-off-by: Sebastian Hamann <code <AT> ares-macrotechnology.com> Closes: https://github.com/gentoo/gentoo/pull/17519 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/waybar-0.9.3-fix-crash-with-fmt.patch | 22 ++++++++++++++++++++++ ...{waybar-0.9.3.ebuild => waybar-0.9.3-r1.ebuild} | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch b/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch new file mode 100644 index 00000000000..73a2d871f2d --- /dev/null +++ b/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch @@ -0,0 +1,22 @@ +From 9b41b9593418772ce578a87de5984d4e37ef7f11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <[email protected]> +Date: Mon, 10 Aug 2020 20:53:29 +0200 +Subject: [PATCH] Fix crash with fmt + +--- + include/util/format.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/util/format.hpp b/include/util/format.hpp +index 0147701b..288d8f0c 100644 +--- a/include/util/format.hpp ++++ b/include/util/format.hpp +@@ -23,7 +23,7 @@ namespace fmt { + constexpr auto parse(ParseContext& ctx) -> decltype (ctx.begin()) { + auto it = ctx.begin(), end = ctx.end(); + if (it != end && *it == ':') ++it; +- if (*it == '>' || *it == '<' || *it == '=') { ++ if (it && (*it == '>' || *it == '<' || *it == '=')) { + spec = *it; + ++it; + } diff --git a/gui-apps/waybar/waybar-0.9.3.ebuild b/gui-apps/waybar/waybar-0.9.3-r1.ebuild similarity index 95% rename from gui-apps/waybar/waybar-0.9.3.ebuild rename to gui-apps/waybar/waybar-0.9.3-r1.ebuild index 09983ab3ef5..ef873b75a8c 100644 --- a/gui-apps/waybar/waybar-0.9.3.ebuild +++ b/gui-apps/waybar/waybar-0.9.3-r1.ebuild @@ -49,6 +49,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-0.9.3-fix-crash-with-fmt.patch" + ) + src_configure() { local emesonargs=( $(meson_feature mpd)
