diff --git a/recipes-lxqt/lxqt-panel/files/0002-plugin-kbindicator-Undef-the-explicit-workaround.patch b/recipes-lxqt/lxqt-panel/files/0002-plugin-kbindicator-Undef-the-explicit-workaround.patch new file mode 100644 index 00000000..7966aee6 --- /dev/null +++ b/recipes-lxqt/lxqt-panel/files/0002-plugin-kbindicator-Undef-the-explicit-workaround.patch @@ -0,0 +1,37 @@ +From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001 +From: Palo Kisa +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 + +Upstream-Status: Backport +--- + 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 + #include ++ ++// 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 ++#undef explicit ++ + #include "../kbdinfo.h" + #include "../controls.h" + +-- +2.9.3 + diff --git a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb index fac81b38..c7d756f0 100644 --- a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb +++ b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb @@ -15,7 +15,10 @@ DEPENDS += " \ kwindowsystem \ " -SRC_URI += "file://0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch" +SRC_URI += " \ + file://0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch \ + file://0002-plugin-kbindicator-Undef-the-explicit-workaround.patch \ +" SRCREV = "85b532485d97a9d4ffa477218911b46f1c0998cd" PV = "0.11.1"