* Removed some not needed versions from build dependencies
* Bumped Standards to 4.1.0 - no changes needed
* Ported back fix for explicit keyword (Closes: #873599)
  Thanks Adrian Bunk for spotting this.
ubuntu/bionic debian/0.11.1-4
Alf Gaida 7 years ago
parent 86b6f4bde2
commit 605bba5c3e

9
debian/changelog vendored

@ -1,3 +1,12 @@
lxqt-panel (0.11.1-4) unstable; urgency=medium
* Removed some not needed versions from build dependencies
* Bumped Standards to 4.1.0 - no changes needed
* Ported back fix for explicit keyword (Closes: #873599)
Thanks Adrian Bunk for spotting this.
-- Alf Gaida <agaida@siduction.org> Mon, 04 Sep 2017 01:29:45 +0200
lxqt-panel (0.11.1-3) unstable; urgency=medium lxqt-panel (0.11.1-3) unstable; urgency=medium
* Recommends lxqt-notificationd (Closes: #866886) * Recommends lxqt-notificationd (Closes: #866886)

10
debian/control vendored

@ -12,16 +12,16 @@ Build-Depends: debhelper (>= 10),
libicu-dev, libicu-dev,
libkf5windowsystem-dev, libkf5windowsystem-dev,
libkf5solid-dev, libkf5solid-dev,
liblxqt0-dev (>= 0.11.1), liblxqt0-dev,
liblxqt-globalkeys0-dev (>= 0.11.1), liblxqt-globalkeys0-dev,
liblxqt-globalkeys-ui0-dev (>= 0.11.1), liblxqt-globalkeys-ui0-dev,
libmenu-cache-dev, libmenu-cache-dev,
libpulse-dev, libpulse-dev,
libqt5svg5-dev, libqt5svg5-dev,
libqt5x11extras5-dev, libqt5x11extras5-dev,
libsensors4-dev [!hurd-any], libsensors4-dev [!hurd-any],
libstatgrab-dev [linux-any], libstatgrab-dev [linux-any],
libsysstat-qt5-0-dev (>= 0.3.3), libsysstat-qt5-0-dev,
libx11-dev, libx11-dev,
libxcomposite-dev, libxcomposite-dev,
libxcb-util0-dev, libxcb-util0-dev,
@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 10),
libxkbcommon-dev, libxkbcommon-dev,
libxkbcommon-x11-dev, libxkbcommon-x11-dev,
libxrender-dev libxrender-dev
Standards-Version: 4.0.0 Standards-Version: 4.1.0
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git/?h=debian/sid Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-panel.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git -b debian/sid Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-panel.git -b debian/sid
Homepage: https://github.com/lxde/lxqt-panel Homepage: https://github.com/lxde/lxqt-panel

@ -0,0 +1,23 @@
Description: Fixes #873599 FTBFS explicit
No further action needed, patch was taken with description from
upstream and can disappear with the next release.
Last-Update: 2017-09-03
--- 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"

@ -0,0 +1 @@
fix-explicit.patch
Loading…
Cancel
Save