[arch-commits] Commit in waybar/trunk (813-fmt-crash.patch PKGBUILD)

[Maxim Baz]

    Date: Monday, August 10, 2020 @ 19:11:03
  Author: maximbaz
Revision: 674065

waybar: add patch to fix segfault in network module

Added:
  waybar/trunk/813-fmt-crash.patch
Modified:
  waybar/trunk/PKGBUILD

---------------------+
 813-fmt-crash.patch |   11 +++++++++++
 PKGBUILD            |   10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

Added: 813-fmt-crash.patch
===================================================================
--- 813-fmt-crash.patch	                        (rev 0)
+++ 813-fmt-crash.patch	2020-08-10 19:11:03 UTC (rev 674065)
@@ -0,0 +1,11 @@
+--- 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;
+           }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-10 19:08:24 UTC (rev 674064)
+++ PKGBUILD	2020-08-10 19:11:03 UTC (rev 674065)
@@ -3,7 +3,7 @@
 
 pkgname=waybar
 pkgver=0.9.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Highly customizable Wayland bar for Sway and Wlroots based compositors'
 arch=('x86_64')
 url="https://github.com/Alexays/Waybar/"
@@ -35,9 +35,15 @@
 )
 source=(
     "$pkgname-$pkgver.tar.gz::https://github.com/Alexays/Waybar/archive/$pkgver.tar.gz"
+    "813-fmt-crash.patch"
 )
-sha256sums=('15cadd05c6a366fd99a92b0f149974c697902c4683c50e2af69f3e59571793e5')
+sha256sums=('15cadd05c6a366fd99a92b0f149974c697902c4683c50e2af69f3e59571793e5'
+            '9088cc460005719f2718b40698dfca8a9a2a97cf9a6a018106d9f38cf609732d')
 
+prepare() {
+    patch -Np1 -i "$srcdir/813-fmt-crash.patch" -d "Waybar-$pkgver"
+}
+
 build() {
     cd "Waybar-$pkgver"
     meson --prefix=/usr --wrap-mode=nofallback build