[SCM] kio packaging branch, master, updated. debian/5.28.0-1-14-g6a34213

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=8a4915b

The following commit has been merged in the master branch:
commit 8a4915bee9c238a531380f7932ca990cbeb01b01
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Apr 5 09:31:35 2017 +0200

    Add new upstream patch, to fix the testsuite: Fix-KDynamicJobTrackerTest-for-linkers-dropping-linked-li.patch
---
 ...rackerTest-for-linkers-dropping-linked-li.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/Fix-KDynamicJobTrackerTest-for-linkers-dropping-linked-li.patch b/debian/patches/Fix-KDynamicJobTrackerTest-for-linkers-dropping-linked-li.patch
new file mode 100644
index 0000000..2d69225
--- /dev/null
+++ b/debian/patches/Fix-KDynamicJobTrackerTest-for-linkers-dropping-linked-li.patch
@@ -0,0 +1,31 @@
+From: "Friedrich W. H. Kossebau" <kossebau at kde.org>
+Date: Fri, 13 Jan 2017 01:25:54 +0100
+Subject: Fix KDynamicJobTrackerTest for linkers dropping linked libs w/o used
+ symbols
+
+---
+ autotests/kdynamicjobtrackernowidgetstest.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/autotests/kdynamicjobtrackernowidgetstest.cpp b/autotests/kdynamicjobtrackernowidgetstest.cpp
+index a8dbee05..5f6b88e5 100644
+--- a/autotests/kdynamicjobtrackernowidgetstest.cpp
++++ b/autotests/kdynamicjobtrackernowidgetstest.cpp
+@@ -20,6 +20,7 @@
+ #include <KIO/JobTracker>
+ #include <KJobTrackerInterface>
+ #include <KJob>
++#include <KFile>
+ 
+ #include <QtTest>
+ #include <QEventLoop>
+@@ -48,6 +49,9 @@ private Q_SLOTS:
+ 
+ void KDynamicJobTrackerTest::testNoCrashWithoutQWidgetsPossible()
+ {
++    // dummy call: need to use some symbol from KIOWidgets so linkers do not drop linking to it
++    KFile::isDefaultView(KFile::Default);
++
+     // simply linking to KIOWidgets results in KDynamicJobTracker installing itself as KIO's jobtracker
+     KJobTrackerInterface* jobtracker = KIO::getJobTracker();
+     QCOMPARE(jobtracker->metaObject()->className(), "KDynamicJobTracker");
diff --git a/debian/patches/series b/debian/patches/series
index 74a1c1c..7ed935b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ Fix-parsing-of-directories-listing-on-a-specific-ftp-serv.patch
 Sanitize-URLs-before-passing-them-to-FindProxyForURL.patch
 keep-query-encoding-when-HTTP-Proxy-is-used.patch
 kioexec-fix-support-for-suggestedfilename.patch
+Fix-KDynamicJobTrackerTest-for-linkers-dropping-linked-li.patch

-- 
kio packaging