lxqt-panel/0001-lxqt_panel_override_explicit_keyword.patch
Michael Vetter b00b56881a Accepting request 460276 from home:sfalken:branches:X11:LXQt
- Update to 0.11.1:
  * Show Auto-Hiding Panels with Delay (#387)
  * Enabling testing on weston (#380)
  * Update *da.desktop files
  * plugin-showdesktop: Cleanup left behind XCB artifacts
  * plugin-kbindicator: Use FindXCB CMake module
  * plugin-tray: Use the FindXCB CMake module
  * Use the new lxqt-build-tools CMake modules (FindMenuCache)
  * plugin-desktopswitch: Add LABEL_TYPE_NONE
  * Add/Update Portugese translations
  * taskbar: Add "cycle on wheel" configuration
  * taskbar: Forward wheelEvent
  * Add/Update french desktop entries
  * taskbar: Set toolButtonStyle for popup correctly
  * Fix faulty link in README.md
  * Remove arbitrary limit of taskbar button width
  * Remove cpack (#371)
- Added 0001-lxqt_panel_override_explicit_keyword.patch
  * Fixes compile errors  https://github.com/lxde/lxqt/issues/1251
- Added CXXFLAGS change from X11:LXQT:git for libxkbcommon-x11

OBS-URL: https://build.opensuse.org/request/show/460276
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-panel?expand=0&rev=8
2017-02-26 12:18:20 +00:00

21 lines
707 B
Diff

Index: lxqt-panel-0.11.1/plugin-kbindicator/src/x11/kbdlayout.cpp
===================================================================
--- lxqt-panel-0.11.1.orig/plugin-kbindicator/src/x11/kbdlayout.cpp
+++ lxqt-panel-0.11.1/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"