From 067f64af5a2b27502be3817512330af188ba2c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 14 Nov 2017 13:19:45 +0100
Subject: [PATCH] lxqt-panel: update 0.11.1 -> 0.12.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...icator-Undef-the-explicit-workaround.patch | 37 -------------------
 recipes-lxqt/lxqt-panel/lxqt-panel_git.bb     | 10 +++--
 2 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 recipes-lxqt/lxqt-panel/files/0002-plugin-kbindicator-Undef-the-explicit-workaround.patch

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
deleted file mode 100644
index 7966aee6..00000000
--- a/recipes-lxqt/lxqt-panel/files/0002-plugin-kbindicator-Undef-the-explicit-workaround.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
-
-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 <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"
- 
--- 
-2.9.3
-
diff --git a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb
index 7641dfce..8c760a60 100644
--- a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb
+++ b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb
@@ -17,10 +17,9 @@ DEPENDS += " \
 
 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"
+SRCREV = "4b20a41f3442b121485664333f457ee9abc228b8"
+PV = "0.12.0"
 
 PACKAGECONFIG[cpu_plugin] = "-DCPULOAD_PLUGIN=Yes,-DCPULOAD_PLUGIN=No, libstatgrab"
 PACKAGECONFIG[mount_plugin] = "-DMOUNT_PLUGIN=Yes,-DMOUNT_PLUGIN=No, solid"
@@ -32,4 +31,7 @@ PACKAGECONFIG[volume_pulse_plugin] = "-DVOLUME_USE_PULSEAUDIO=Yes,-DVOLUME_USE_P
 
 PACKAGECONFIG ??= "cpu_plugin mount_plugin networkmonitor_plugin sensor_plugin sysstat_plugin volume_alsa_plugin volume_pulse_plugin"
 
-FILES_${PN} += "${datadir}/lxqt/lxqt-panel/*.desktop"
+FILES_${PN} += " \
+    ${datadir}/lxqt/lxqt-panel/*.desktop \
+    ${datadir}/desktop-directories \
+"