summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hamann <code@ares-macrotechnology.com>2020-09-13 12:31:41 +0200
committerSam James <sam@gentoo.org>2020-09-14 15:57:57 +0000
commit740103dd3e31496b08863c0b036bd77d2647081b (patch)
tree47c25568a76df255f102089f280c07c17a5be50e /gui-apps/waybar
parenteclass/go-module.eclass: add a missing die call (diff)
downloadgentoo-740103dd3e31496b08863c0b036bd77d2647081b.tar.gz
gentoo-740103dd3e31496b08863c0b036bd77d2647081b.tar.bz2
gentoo-740103dd3e31496b08863c0b036bd77d2647081b.zip
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@ares-macrotechnology.com> Closes: https://github.com/gentoo/gentoo/pull/17519 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gui-apps/waybar')
-rw-r--r--gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch22
-rw-r--r--gui-apps/waybar/waybar-0.9.3-r1.ebuild (renamed from gui-apps/waybar/waybar-0.9.3.ebuild)4
2 files changed, 26 insertions, 0 deletions
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 000000000000..73a2d871f2d6
--- /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?= <admin@xenrox.net>
+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
index 09983ab3ef51..ef873b75a8c1 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)