Date: Thursday, May 24, 2018 @ 20:45:19 Author: jleclanche Revision: 329153
archrelease: copy trunk to community-x86_64 Added: lxqt-panel/repos/community-x86_64/PKGBUILD (from rev 329152, lxqt-panel/trunk/PKGBUILD) lxqt-panel/repos/community-x86_64/fix-build.patch (from rev 329152, lxqt-panel/trunk/fix-build.patch) Deleted: lxqt-panel/repos/community-x86_64/PKGBUILD lxqt-panel/repos/community-x86_64/fix-build.patch -----------------+ PKGBUILD | 104 +++++++++++++++++++++++++++--------------------------- fix-build.patch | 64 ++++++++++++++++----------------- 2 files changed, 84 insertions(+), 84 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-24 20:45:11 UTC (rev 329152) +++ PKGBUILD 2018-05-24 20:45:19 UTC (rev 329153) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Jerome Leclanche <jer...@leclan.ch> - -pkgname=lxqt-panel -pkgver=0.12.0 -pkgrel=1 -pkgdesc="The LXQt desktop panel" -arch=("i686" "x86_64") -groups=("lxqt") -url="http://lxqt.org" -license=("LGPL2.1") -depends=( - "libdbusmenu-qt5" "libxcomposite" "lxmenu-data" - "lxqt-globalkeys" "menu-cache" "solid" "libxcb" -) -optdepends=( - "libpulse: Volume control plugin" - "libstatgrab: CPU monitor and Network monitor plugins" - "libsysstat: System Statistics plugin" - "lm_sensors: Sensors plugin" -) -makedepends=( - "lxqt-build-tools" "liblxqt" "libpulse" "libstatgrab" "libsysstat" - "lm_sensors" "libxdamage" -) -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" -) -sha256sums=( - "3d286ba65d7a51403bc01d3efbc01c65c88ee4cf6f062143ed00c104a7b15f11" - "SKIP" -) -validpgpkeys=( - "169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche <jer...@leclan.ch> - "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3" # Alf Gaida <aga...@siduction.org> -) - - -build() { - mkdir -p build - cd build - cmake "$srcdir/$pkgname-$pkgver" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - } Copied: lxqt-panel/repos/community-x86_64/PKGBUILD (from rev 329152, lxqt-panel/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-24 20:45:19 UTC (rev 329153) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jerome Leclanche <jer...@leclan.ch> + +pkgname=lxqt-panel +pkgver=0.13.0 +pkgrel=1 +pkgdesc="The LXQt desktop panel" +arch=("x86_64") +groups=("lxqt") +url="http://lxqt.org" +license=("LGPL2.1") +depends=( + "libdbusmenu-qt5" "libxcomposite" "lxmenu-data" + "lxqt-globalkeys" "menu-cache" "solid" "libxcb" +) +optdepends=( + "libpulse: Volume control plugin" + "libstatgrab: CPU monitor and Network monitor plugins" + "libsysstat: System Statistics plugin" + "lm_sensors: Sensors plugin" +) +makedepends=( + "lxqt-build-tools" "liblxqt" "libpulse" "libstatgrab" "libsysstat" + "lm_sensors" "libxdamage" +) +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" +) +sha256sums=( + "a139dc43d19adf6b7674e7ad518772aebf033aefcb1767b05085d983ff8b2ae3" + "SKIP" +) +validpgpkeys=( + "169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche <jer...@leclan.ch> + "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3" # Alf Gaida <aga...@siduction.org> +) + + +build() { + mkdir -p build + cd build + cmake "$srcdir/$pkgname-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + } Deleted: fix-build.patch =================================================================== --- fix-build.patch 2018-05-24 20:45:11 UTC (rev 329152) +++ fix-build.patch 2018-05-24 20:45:19 UTC (rev 329153) @@ -1,32 +0,0 @@ -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" - Copied: lxqt-panel/repos/community-x86_64/fix-build.patch (from rev 329152, lxqt-panel/trunk/fix-build.patch) =================================================================== --- fix-build.patch (rev 0) +++ fix-build.patch 2018-05-24 20:45:19 UTC (rev 329153) @@ -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" +