[arch-commits] Commit in waybar/trunk (PKGBUILD include_cassert.patch)

Brett Cornwall ainola at archlinux.org
Wed Dec 11 03:30:38 UTC 2019


    Date: Wednesday, December 11, 2019 @ 03:30:37
  Author: ainola
Revision: 536603

Rebuild waybar against ABI change to fmt

The latest release does not include a necessary #include for <cassert>, so we
need to patch that in for now.

https://github.com/gabime/spdlog/commit/1aa9ea92e20142a1ce2f2e1ac40ed1fa781fac19.patch

Added:
  waybar/trunk/include_cassert.patch
Modified:
  waybar/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-11 03:25:51 UTC (rev 536602)
+++ PKGBUILD	2019-12-11 03:30:37 UTC (rev 536603)
@@ -2,7 +2,7 @@
 
 pkgname=waybar
 pkgver=0.8.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Highly customizable Wayland bar for Sway and Wlroots based compositors'
 arch=('x86_64')
 url="https://github.com/Alexays/Waybar/"
@@ -27,9 +27,16 @@
 )
 source=(
     "$pkgname-$pkgver.tar.gz::https://github.com/Alexays/Waybar/archive/$pkgver.tar.gz"
+    "include_cassert.patch"
 )
-sha256sums=('2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa')
+sha256sums=('2de2f0cec243da0d9ff2255ceb9dac9d95e8be06d6ea13926fae460d72e4b8aa'
+            'ca77d1ba64d0852bbf0aaa0b8c648e88f8712ed51fb39862b636eb0b33c6e7e1')
 
+prepare() {
+    cd "Waybar-$pkgver"
+    patch -p1 < ../include_cassert.patch
+}
+
 build() {
     cd "Waybar-$pkgver"
     meson --prefix=/usr build

Added: include_cassert.patch
===================================================================
--- include_cassert.patch	                        (rev 0)
+++ include_cassert.patch	2019-12-11 03:30:37 UTC (rev 536603)
@@ -0,0 +1,10 @@
+--- a/src/modules/network.cpp	2019-08-29 02:56:57.000000000 -0700
++++ b/src/modules/network.cpp	2019-12-10 18:48:47.795028451 -0800
+@@ -2,6 +2,7 @@
+ #include <spdlog/spdlog.h>
+ #include <sys/eventfd.h>
+ #include <fstream>
++#include <cassert>
+ 
+ namespace {
+ 



More information about the arch-commits mailing list