From 10bbec44515d2479c0dd606ae48a2e0721ad94c0 Mon Sep 17 00:00:00 2001 From: patrick96 Date: Sun, 25 Apr 2021 13:02:28 +0200 Subject: [PATCH] Fix abort in i3 module with new ArchLinux flags Fixes #2416 Ref: https://github.com/polybar/i3ipcpp/pull/11 --- contrib/polybar.aur/PKGBUILD | 6 ++++-- lib/i3ipcpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD index 655b7503..3802f930 100644 --- a/contrib/polybar.aur/PKGBUILD +++ b/contrib/polybar.aur/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrick Ziegler pkgname=polybar pkgver=3.5.5 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and easy-to-use status bar" arch=("i686" "x86_64") url="https://github.com/polybar/polybar" @@ -26,7 +26,9 @@ prepare() { build() { cd "${_dir}/build" || exit 1 # Force cmake to use system python (to detect xcbgen) - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 .. + # We need to turn off _GLIBCXX_ASSERTIONS because of a bug in polybar: + # https://github.com/polybar/polybar/issues/2416 + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-U_GLIBCXX_ASSERTIONS" -DPYTHON_EXECUTABLE=/usr/bin/python3 .. cmake --build . } diff --git a/lib/i3ipcpp b/lib/i3ipcpp index cb008b30..86ddf710 160000 --- a/lib/i3ipcpp +++ b/lib/i3ipcpp @@ -1 +1 @@ -Subproject commit cb008b30fc5f3febfe467884cb0211ee3c16386b +Subproject commit 86ddf7102c6903ae0cc543071e2d375403fc0727