[SCM] qtbase packaging branch, experimental, updated. debian/5.7.0+dfsg-1-2-gbcdfff9

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=bcdfff9

The following commit has been merged in the experimental branch:
commit bcdfff961ffb27048f21a97dc3ab3350e0d16445
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 29 18:46:14 2016 +0300

    Add a patch (qdevicediscovery_dummy.diff) to fix linking error on kFreeBSD.
---
 debian/changelog                           |  3 +++
 debian/patches/qdevicediscovery_dummy.diff | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b79d3f3..ea07694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.7.0+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add a patch (qdevicediscovery_dummy.diff) to fix a linking error on
+    GNU/kFreeBSD.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 29 Jun 2016 18:44:30 +0300
 
diff --git a/debian/patches/qdevicediscovery_dummy.diff b/debian/patches/qdevicediscovery_dummy.diff
new file mode 100644
index 0000000..416cc20
--- /dev/null
+++ b/debian/patches/qdevicediscovery_dummy.diff
@@ -0,0 +1,30 @@
+Description: add a destructor to QDeviceDiscoveryDummy
+ Otherwise, the linker fails because of undefined reference to
+ 'vtable for QDeviceDiscoveryDummy'.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2016-06-29
+
+--- a/src/platformsupport/devicediscovery/qdevicediscovery_dummy.cpp
++++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy.cpp
+@@ -51,6 +51,10 @@
+ {
+ }
+ 
++QDeviceDiscoveryDummy::~QDeviceDiscoveryDummy()
++{
++}
++
+ QStringList QDeviceDiscoveryDummy::scanConnectedDevices()
+ {
+     return QStringList();
+--- a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h
++++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h
+@@ -61,6 +61,7 @@
+ 
+ public:
+     QDeviceDiscoveryDummy(QDeviceTypes types, QObject *parent = 0);
++    ~QDeviceDiscoveryDummy();
+     QStringList scanConnectedDevices() Q_DECL_OVERRIDE;
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0a45ca8..6f6ba2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
+qdevicediscovery_dummy.diff

-- 
qtbase packaging