| 1 |
commit: c27e67813ed4ccb87f255479ec708f58f00a882b |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 11 01:37:16 2017 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 11 01:37:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27e6781 |
| 7 |
|
| 8 |
lxqt-base/lxqt-panel: fix build error reported in bug #634222 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
.../lxqt-panel-0.11.0-fix-undef-explicit.patch | 32 ++++++++++++++++++++++ |
| 13 |
lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild | 4 +++ |
| 14 |
2 files changed, 36 insertions(+) |
| 15 |
|
| 16 |
diff --git a/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch b/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..c6349c25cba |
| 19 |
--- /dev/null |
| 20 |
+++ b/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch |
| 21 |
@@ -0,0 +1,32 @@ |
| 22 |
+From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Palo Kisa <palo.kisa@×××××.com> |
| 24 |
+Date: Mon, 30 Jan 2017 12:21:10 +0100 |
| 25 |
+Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround |
| 26 |
+ |
| 27 |
+..after include and add explanation of the workaround. |
| 28 |
+ |
| 29 |
+closes lxde/lxqt#1251 |
| 30 |
+--- |
| 31 |
+ plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++ |
| 32 |
+ 1 file changed, 7 insertions(+) |
| 33 |
+ |
| 34 |
+diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp |
| 35 |
+index c4aa4e27..883df074 100644 |
| 36 |
+--- a/plugin-kbindicator/src/x11/kbdlayout.cpp |
| 37 |
++++ b/plugin-kbindicator/src/x11/kbdlayout.cpp |
| 38 |
+@@ -33,8 +33,15 @@ |
| 39 |
+ |
| 40 |
+ #include <xkbcommon/xkbcommon-x11.h> |
| 41 |
+ #include <xcb/xcb.h> |
| 42 |
++ |
| 43 |
++// Note: We need to override "explicit" as this is a C++ keyword. But it is |
| 44 |
++// used as variable name in xkb.h. This is causing a failure in C++ compile |
| 45 |
++// time. |
| 46 |
++// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080 |
| 47 |
+ #define explicit _explicit |
| 48 |
+ #include <xcb/xkb.h> |
| 49 |
++#undef explicit |
| 50 |
++ |
| 51 |
+ #include "../kbdinfo.h" |
| 52 |
+ #include "../controls.h" |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild |
| 56 |
index 65f1bebbd9a..39ae731adb2 100644 |
| 57 |
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild |
| 58 |
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild |
| 59 |
@@ -55,6 +55,10 @@ RDEPEND="${CDEPEND} |
| 60 |
dev-qt/qtsvg:5 |
| 61 |
>=lxde-base/lxmenu-data-0.1.2" |
| 62 |
|
| 63 |
+PATCHES=( |
| 64 |
+ ${FILESDIR}/${P}-fix-undef-explicit.patch |
| 65 |
+) |
| 66 |
+ |
| 67 |
src_configure() { |
| 68 |
local mycmakeargs i y |
| 69 |
mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |
Archives