diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
| commit | 6b933047f46efec1aa747570f945344254227457 (patch) | |
| tree | a12a4b87b38f954c4de435272cf4b90d721df5e8 /lxqt-base/lxqt-panel | |
| parent | f45955e60d4da9b7f4a1088c98042f9c06669039 (diff) | |
gentoo resync : 15.12.2017
Diffstat (limited to 'lxqt-base/lxqt-panel')
| -rw-r--r-- | lxqt-base/lxqt-panel/Manifest | 5 | ||||
| -rw-r--r-- | lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch | 32 | ||||
| -rw-r--r-- | lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild | 8 |
3 files changed, 41 insertions, 4 deletions
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest index f90ea22df5ff..91649a79813b 100644 --- a/lxqt-base/lxqt-panel/Manifest +++ b/lxqt-base/lxqt-panel/Manifest @@ -1,3 +1,4 @@ -DIST lxqt-panel-0.11.0.tar.xz 262964 SHA256 18415624d862b9b269fd1f74b2b6a51776852babd057e701e5d5b48ce46e777c SHA512 875ec28868bb68dff8c4e3be0adb5e5c88213f9ebdeb83eb0df9d5c31a7b4cb70a4d9b347f1ed9526a1eef7adb07f92c36263e12a6455291ec7022901abd100c WHIRLPOOL 9a9f6ff92afbf598d6a1f29d083e3fc85f3282f644508d1bc03683eb9bbe06048d65688e016bb17e7553aba23b10de251949000e2da65c3b5e547e9f273e7cd1 -EBUILD lxqt-panel-0.11.0.ebuild 2265 BLAKE2B a8b14e2b0a0e9da21fa9e1d05cc40f389e13e891c90d30c4859ad35ab12d6843ce36e8b832778d1ce80d0680ce854667d25b72b4bd372d57a3fc42e76ad86b7c SHA512 70aae2ead76739fe39b6fece25fea740ddc2fe34b1bad96c1e903552495b95fda73a9c7a0f7ed44cfdf60ba176d75e831b5621fcfcfa2f34898231c21e12a0a6 +AUX lxqt-panel-0.11.0-fix-undef-explicit.patch 1052 BLAKE2B 15ace146aa361659b80188c5061444f413d13812fb1982363a8d28d1d2442318598d3f613494bfce5fa170aa536a686b9b0d945084bf570f16dd7b491bf97dc5 SHA512 e7c29561dac09b90cc6f924f73ff80114e705337f6f40086682c236d6c387a776d733e34ac6421e7af34a0ae77e2debd000ae6b74ebeb2eb967fedcbe6a99a88 +DIST lxqt-panel-0.11.0.tar.xz 262964 BLAKE2B 6cbb741731e89dbe99fefc8ceb983e346128a3122507a6816db848c9bed0b8f4f3b5f08e8f7ccd3a1b72ed7161a0772188836bec55610e248c17425f806dec44 SHA512 875ec28868bb68dff8c4e3be0adb5e5c88213f9ebdeb83eb0df9d5c31a7b4cb70a4d9b347f1ed9526a1eef7adb07f92c36263e12a6455291ec7022901abd100c +EBUILD lxqt-panel-0.11.0.ebuild 2321 BLAKE2B 4e145dad5e06f303464b3663bdf8c49ba3ac432f814a41bbfb10bad0ccac1b7725e58518a403321513a3fed950d608168ccd0b0b239ba4080c13a70009ac2599 SHA512 288416b1f06b70523264fb55d9f51ae403558724245b51e53617542c6499d23afd4627776a963d2ba853a01949c0146efcd41cc9eccbbd1b5d6fda8df855aff1 MISC metadata.xml 1269 BLAKE2B ec1757e2cc0f802a24b4993138b263853d3204efc33c5d572409f60548059fe5a526a7a5b74c260ad6df3a57fcb78ccdea2347dab579f3a6d0efcc31475f379c SHA512 122c92913b9b0ed474099f8f1957e2c1399f59e290bf01c0948a10dee9e30bb90a4c29cd101d31efe8b2e49d34940b67a52b24a7b5503475d663c935285169b8 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 new file mode 100644 index 000000000000..c6349c25cba0 --- /dev/null +++ b/lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch @@ -0,0 +1,32 @@ +From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001 +From: Palo Kisa <palo.kisa@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 c4aa4e27..883df074 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" + diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild index adcf675304e6..44c8aede1399 100644 --- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild +++ b/lxqt-base/lxqt-panel/lxqt-panel-0.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git" else SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="LGPL-2.1+" @@ -55,6 +55,10 @@ RDEPEND="${CDEPEND} dev-qt/qtsvg:5 >=lxde-base/lxmenu-data-0.1.2" +PATCHES=( + "${FILESDIR}"/${P}-fix-undef-explicit.patch +) + src_configure() { local mycmakeargs i y mycmakeargs=( -DPULL_TRANSLATIONS=OFF ) |