From 4651afa8edefb30aa550e2174477c876faae7417 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Sun, 22 Jul 2018 11:09:05 +0200 Subject: [PATCH] polybar: rebuild for gcc stdc++ dropping gcc4 compat - Add patch to fix build (KeyError: 'eventstruct') MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #1102 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- .../patches/Add-support-for-eventstruct.patch | 44 +++++++++++++++++++ srcpkgs/polybar/template | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/polybar/patches/Add-support-for-eventstruct.patch diff --git a/srcpkgs/polybar/patches/Add-support-for-eventstruct.patch b/srcpkgs/polybar/patches/Add-support-for-eventstruct.patch new file mode 100644 index 00000000000..bd52e5e88f3 --- /dev/null +++ b/srcpkgs/polybar/patches/Add-support-for-eventstruct.patch @@ -0,0 +1,44 @@ +From 00165e1a6d5dd61bc153e1352b21ec07fc81245d Mon Sep 17 00:00:00 2001 +From: patrick96 +Date: Sun, 11 Feb 2018 21:27:52 +0100 +Subject: [PATCH] fix(generators): Add support for eventstruct + +Newer xcb-proto commits after the 1.12 release require the 'eventstruct' +key in the output dictionary, otherwise the generator crashes. + +I don't see a need for xpp to actually support the eventstruct key and +thus it uses a NOP lambda function +--- + generators/cpp_client.py | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/generators/cpp_client.py b/generators/cpp_client.py +index 20d116f..709e8d8 100644 +--- lib/xpp/generators/cpp_client.py ++++ lib/xpp/generators/cpp_client.py +@@ -3130,15 +3130,16 @@ def cpp_type_classes(): + # } + + # Must create an "output" dictionary before any xcbgen imports. +-output = {'open' : c_open, +- 'close' : c_close, +- 'simple' : c_simple, # lambda x, y: None, +- 'enum' : lambda x, y: None, +- 'struct' : lambda x, y: None, +- 'union' : lambda x, y: None, +- 'request' : c_request, +- 'event' : cpp_event, +- 'error' : cpp_error, ++output = {'open' : c_open, ++ 'close' : c_close, ++ 'simple' : c_simple, # lambda x, y: None, ++ 'enum' : lambda x, y: None, ++ 'struct' : lambda x, y: None, ++ 'union' : lambda x, y: None, ++ 'request' : c_request, ++ 'event' : cpp_event, ++ 'error' : cpp_error, ++ 'eventstruct' : lambda x, y: None, + } + + # Boilerplate below this point diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template index 2bcb9333dc9..23b49e0ecfe 100644 --- a/srcpkgs/polybar/template +++ b/srcpkgs/polybar/template @@ -1,7 +1,7 @@ # Template file for 'polybar' pkgname=polybar version=3.1.0 -revision=2 +revision=3 _i3ipcpp_version=0.7.0 _xpp_version=1.4.0 build_style=cmake