Date: Monday, January 30, 2017 @ 18:58:41 Author: bgyorgy Revision: 209549
upgpkg: lxqt-panel 0.11.1-1 Update to new version Added: lxqt-panel/trunk/fix-build.patch Modified: lxqt-panel/trunk/PKGBUILD -----------------+ PKGBUILD | 13 ++++++++++--- fix-build.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-30 18:48:29 UTC (rev 209548) +++ PKGBUILD 2017-01-30 18:58:41 UTC (rev 209549) @@ -2,7 +2,7 @@ # Maintainer: Jerome Leclanche <jer...@leclan.ch> pkgname=lxqt-panel -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=1 pkgdesc="The LXQt desktop panel" arch=("i686" "x86_64") @@ -20,16 +20,18 @@ "lm_sensors: Sensors plugin" ) makedepends=( - "cmake" "qt5-tools" "git" "libpulse" "libstatgrab" "libsysstat" + "lxqt-build-tools" "libpulse" "libstatgrab" "libsysstat" "lm_sensors" ) source=( "https://github.com/lxde/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" "https://github.com/lxde/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz.asc" + "fix-build.patch" ) sha256sums=( - "18415624d862b9b269fd1f74b2b6a51776852babd057e701e5d5b48ce46e777c" + "cfbe1862a2614ff8e22bc8db795a6cbce106243822d90370970eb0bbd5aea5e0" "SKIP" + "994ad0a8873e1a190fb6890c19e5f65b863fc2b2faf1973ed27b3db31e9a9cfb" ) validpgpkeys=( "169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche <jer...@leclan.ch> @@ -37,6 +39,11 @@ ) +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-build.patch" +} + build() { mkdir -p build cd build Added: fix-build.patch =================================================================== --- fix-build.patch (rev 0) +++ fix-build.patch 2017-01-30 18:58:41 UTC (rev 209549) @@ -0,0 +1,32 @@ +From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001 +From: Palo Kisa <palo.k...@gmail.com> +Date: Mon, 30 Jan 2017 12:21:10 +0100 +Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround + +..after include and add explanation of the workaround. + +closes lxde/lxqt#1251 +--- + plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp +index c4aa4e2..883df07 100644 +--- a/plugin-kbindicator/src/x11/kbdlayout.cpp ++++ b/plugin-kbindicator/src/x11/kbdlayout.cpp +@@ -33,8 +33,15 @@ + + #include <xkbcommon/xkbcommon-x11.h> + #include <xcb/xcb.h> ++ ++// Note: We need to override "explicit" as this is a C++ keyword. But it is ++// used as variable name in xkb.h. This is causing a failure in C++ compile ++// time. ++// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080 + #define explicit _explicit + #include <xcb/xkb.h> ++#undef explicit ++ + #include "../kbdinfo.h" + #include "../controls.h" +