Date: Monday, January 30, 2017 @ 18:58:48
Author: bgyorgy
Revision: 209550
archrelease: copy trunk to community-i686, community-x86_64
Added:
lxqt-panel/repos/community-i686/PKGBUILD
(from rev 209549, lxqt-panel/trunk/PKGBUILD)
lxqt-panel/repos/community-i686/fix-build.patch
(from rev 209549, lxqt-panel/trunk/fix-build.patch)
lxqt-panel/repos/community-x86_64/PKGBUILD
(from rev 209549, lxqt-panel/trunk/PKGBUILD)
lxqt-panel/repos/community-x86_64/fix-build.patch
(from rev 209549, lxqt-panel/trunk/fix-build.patch)
Deleted:
lxqt-panel/repos/community-i686/PKGBUILD
lxqt-panel/repos/community-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 118 +++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 52 ----------------
community-i686/fix-build.patch | 32 ++++++++++
community-x86_64/PKGBUILD | 52 ----------------
community-x86_64/fix-build.patch | 32 ++++++++++
5 files changed, 182 insertions(+), 104 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-01-30 18:58:41 UTC (rev 209549)
+++ community-i686/PKGBUILD 2017-01-30 18:58:48 UTC (rev 209550)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Jerome Leclanche <[email protected]>
-
-pkgname=lxqt-panel
-pkgver=0.11.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-common"
- "lxqt-globalkeys" "menu-cache" "solid"
-)
-optdepends=(
- "libpulse: Volume control plugin"
- "libstatgrab: CPU monitor and Network monitor plugins"
- "libsysstat: System Statistics plugin"
- "lm_sensors: Sensors plugin"
-)
-makedepends=(
- "cmake" "qt5-tools" "git" "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";
-)
-sha256sums=(
- "18415624d862b9b269fd1f74b2b6a51776852babd057e701e5d5b48ce46e777c"
- "SKIP"
-)
-validpgpkeys=(
- "169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche
<[email protected]>
- "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3" # Alf Gaida
<[email protected]>
-)
-
-
-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-i686/PKGBUILD (from rev 209549,
lxqt-panel/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-01-30 18:58:48 UTC (rev 209550)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Jerome Leclanche <[email protected]>
+
+pkgname=lxqt-panel
+pkgver=0.11.1
+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-common"
+ "lxqt-globalkeys" "menu-cache" "solid"
+)
+optdepends=(
+ "libpulse: Volume control plugin"
+ "libstatgrab: CPU monitor and Network monitor plugins"
+ "libsysstat: System Statistics plugin"
+ "lm_sensors: Sensors plugin"
+)
+makedepends=(
+ "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=(
+ "cfbe1862a2614ff8e22bc8db795a6cbce106243822d90370970eb0bbd5aea5e0"
+ "SKIP"
+ "994ad0a8873e1a190fb6890c19e5f65b863fc2b2faf1973ed27b3db31e9a9cfb"
+)
+validpgpkeys=(
+ "169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche
<[email protected]>
+ "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3" # Alf Gaida
<[email protected]>
+)
+
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/fix-build.patch"
+}
+
+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-i686/fix-build.patch (from rev 209549,
lxqt-panel/trunk/fix-build.patch)
===================================================================
--- community-i686/fix-build.patch (rev 0)
+++ community-i686/fix-build.patch 2017-01-30 18:58:48 UTC (rev 209550)
@@ -0,0 +1,32 @@
+From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001
+From: Palo Kisa <[email protected]>
+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"
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-01-30 18:58:41 UTC (rev 209549)
+++ community-x86_64/PKGBUILD 2017-01-30 18:58:48 UTC (rev 209550)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Jerome Leclanche <[email protected]>
-
-pkgname=lxqt-panel
-pkgver=0.11.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-common"
- "lxqt-globalkeys" "menu-cache" "solid"
-)
-optdepends=(
- "libpulse: Volume control plugin"
- "libstatgrab: CPU monitor and Network monitor plugins"
- "libsysstat: System Statistics plugin"
- "lm_sensors: Sensors plugin"
-)
-makedepends=(
- "cmake" "qt5-tools" "git" "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";
-)
-sha256sums=(
- "18415624d862b9b269fd1f74b2b6a51776852babd057e701e5d5b48ce46e777c"
- "SKIP"
-)
-validpgpkeys=(
- "169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche
<[email protected]>
- "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3" # Alf Gaida
<[email protected]>
-)
-
-
-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 209549,
lxqt-panel/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-01-30 18:58:48 UTC (rev 209550)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Jerome Leclanche <[email protected]>
+
+pkgname=lxqt-panel
+pkgver=0.11.1
+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-common"
+ "lxqt-globalkeys" "menu-cache" "solid"
+)
+optdepends=(
+ "libpulse: Volume control plugin"
+ "libstatgrab: CPU monitor and Network monitor plugins"
+ "libsysstat: System Statistics plugin"
+ "lm_sensors: Sensors plugin"
+)
+makedepends=(
+ "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=(
+ "cfbe1862a2614ff8e22bc8db795a6cbce106243822d90370970eb0bbd5aea5e0"
+ "SKIP"
+ "994ad0a8873e1a190fb6890c19e5f65b863fc2b2faf1973ed27b3db31e9a9cfb"
+)
+validpgpkeys=(
+ "169704C6FB490C6892C7F23C37E0AF1FDA48F373" # Jerome Leclanche
<[email protected]>
+ "7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3" # Alf Gaida
<[email protected]>
+)
+
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/fix-build.patch"
+}
+
+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/fix-build.patch (from rev 209549,
lxqt-panel/trunk/fix-build.patch)
===================================================================
--- community-x86_64/fix-build.patch (rev 0)
+++ community-x86_64/fix-build.patch 2017-01-30 18:58:48 UTC (rev 209550)
@@ -0,0 +1,32 @@
+From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001
+From: Palo Kisa <[email protected]>
+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"
+
