| 1 |
commit: 740103dd3e31496b08863c0b036bd77d2647081b |
| 2 |
Author: Sebastian Hamann <code <AT> ares-macrotechnology <DOT> com> |
| 3 |
AuthorDate: Sun Sep 13 10:31:41 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 14 15:57:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740103dd |
| 7 |
|
| 8 |
gui-apps/waybar: Fix runtime crash in v0.9.3 |
| 9 |
|
| 10 |
Upstream bug: https://github.com/Alexays/Waybar/issues/810 |
| 11 |
Patch from: https://github.com/Alexays/Waybar/pull/813 |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/742323 |
| 14 |
Signed-off-by: Sebastian Hamann <code <AT> ares-macrotechnology.com> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/17519 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
.../files/waybar-0.9.3-fix-crash-with-fmt.patch | 22 ++++++++++++++++++++++ |
| 19 |
...{waybar-0.9.3.ebuild => waybar-0.9.3-r1.ebuild} | 4 ++++ |
| 20 |
2 files changed, 26 insertions(+) |
| 21 |
|
| 22 |
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 |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..73a2d871f2d |
| 25 |
--- /dev/null |
| 26 |
+++ b/gui-apps/waybar/files/waybar-0.9.3-fix-crash-with-fmt.patch |
| 27 |
@@ -0,0 +1,22 @@ |
| 28 |
+From 9b41b9593418772ce578a87de5984d4e37ef7f11 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <admin@××××××.net> |
| 30 |
+Date: Mon, 10 Aug 2020 20:53:29 +0200 |
| 31 |
+Subject: [PATCH] Fix crash with fmt |
| 32 |
+ |
| 33 |
+--- |
| 34 |
+ include/util/format.hpp | 2 +- |
| 35 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 36 |
+ |
| 37 |
+diff --git a/include/util/format.hpp b/include/util/format.hpp |
| 38 |
+index 0147701b..288d8f0c 100644 |
| 39 |
+--- a/include/util/format.hpp |
| 40 |
++++ b/include/util/format.hpp |
| 41 |
+@@ -23,7 +23,7 @@ namespace fmt { |
| 42 |
+ constexpr auto parse(ParseContext& ctx) -> decltype (ctx.begin()) { |
| 43 |
+ auto it = ctx.begin(), end = ctx.end(); |
| 44 |
+ if (it != end && *it == ':') ++it; |
| 45 |
+- if (*it == '>' || *it == '<' || *it == '=') { |
| 46 |
++ if (it && (*it == '>' || *it == '<' || *it == '=')) { |
| 47 |
+ spec = *it; |
| 48 |
+ ++it; |
| 49 |
+ } |
| 50 |
|
| 51 |
diff --git a/gui-apps/waybar/waybar-0.9.3.ebuild b/gui-apps/waybar/waybar-0.9.3-r1.ebuild |
| 52 |
similarity index 95% |
| 53 |
rename from gui-apps/waybar/waybar-0.9.3.ebuild |
| 54 |
rename to gui-apps/waybar/waybar-0.9.3-r1.ebuild |
| 55 |
index 09983ab3ef5..ef873b75a8c 100644 |
| 56 |
--- a/gui-apps/waybar/waybar-0.9.3.ebuild |
| 57 |
+++ b/gui-apps/waybar/waybar-0.9.3-r1.ebuild |
| 58 |
@@ -49,6 +49,10 @@ DEPEND=" |
| 59 |
" |
| 60 |
RDEPEND="${DEPEND}" |
| 61 |
|
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}/${PN}-0.9.3-fix-crash-with-fmt.patch" |
| 64 |
+ ) |
| 65 |
+ |
| 66 |
src_configure() { |
| 67 |
local emesonargs=( |
| 68 |
$(meson_feature mpd) |
Archives