[SCM] kio packaging branch, master, updated. debian/5.16.0-1-16-g14e1cab

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 39c0b0a9322bf8d701ae90fd8cf2e0f052a0fa67
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 8 13:01:23 2016 +0100

    Import upstream patches: upstream_autotest__fix_ctest.patch, upstream_fix_wrong_path.patch, upstream_kioslavetest_fix_crash.patch
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  3 ++
 debian/patches/upstream_autotest__fix_ctest.patch  | 40 ++++++++++++++++++++++
 debian/patches/upstream_fix_wrong_path.patch       | 26 ++++++++++++++
 .../patches/upstream_kioslavetest_fix_crash.patch  | 21 ++++++++++++
 5 files changed, 93 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 55d96a4..b922832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 kio (5.19.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.19.0).
+  * Add upstream patch: upstream_autotest__fix_ctest.patch
+  * Add upstream patch: upstream_fix_wrong_path.patch
+  * Add upstream patch: upstream_kioslavetest_fix_crash.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 06 Feb 2016 19:03:37 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index a8d2efa..02d402a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,6 @@ report_error_removing_dirs
 wait_for_a_bit_longer
 kubuntu_kdelibs4-docs-path.diff
 fix_kfreebsd_build
+upstream_autotest__fix_ctest.patch
+upstream_fix_wrong_path.patch
+upstream_kioslavetest_fix_crash.patch
diff --git a/debian/patches/upstream_autotest__fix_ctest.patch b/debian/patches/upstream_autotest__fix_ctest.patch
new file mode 100644
index 0000000..15757b7
--- /dev/null
+++ b/debian/patches/upstream_autotest__fix_ctest.patch
@@ -0,0 +1,40 @@
+commit 47eaa299c6282a91298661f0d9258ca56a274e5c
+Author: David Faure <faure at kde.org>
+Date:   Mon Feb 8 09:03:10 2016 +0100
+
+    autotest: fix ctest not exiting when running favicontest.
+    
+    ctest starts favicontest, which starts kio_http, which started kio_http_cache_cleaner,
+    and then ctest would wait for all of these programs to exit. But kio_http_cache_cleaner
+    does not exit, so ctest would time out after 2 minutes.
+    
+    My solution is to disable the use of kio_http_cache_cleaner for the unittest.
+    
+    Change-Id: I127c2201bc72c3b73298e7b40debb654781c9d2e
+
+diff --git a/autotests/favicontest.cpp b/autotests/favicontest.cpp
+index bddd5c2..1b2b012 100644
+--- a/autotests/favicontest.cpp
++++ b/autotests/favicontest.cpp
+@@ -79,6 +79,8 @@ void FavIconTest::initTestCase()
+ 
+     // To avoid a runtime dependency on klauncher
+     qputenv("KDE_FORK_SLAVES", "yes");
++    // To let ctest exist, we shouldn't start kio_http_cache_cleaner
++    qputenv("KIO_DISABLE_CACHE_CLEANER", "yes");
+ 
+     if (!checkNetworkAccess()) {
+         QSKIP("no network access", SkipAll);
+diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp
+index a84129f..e1013c8 100644
+--- a/src/ioslaves/http/http.cpp
++++ b/src/ioslaves/http/http.cpp
+@@ -4993,6 +4993,8 @@ void HTTPProtocol::cacheFileClose()
+ void HTTPProtocol::sendCacheCleanerCommand(const QByteArray &command)
+ {
+     qCDebug(KIO_HTTP);
++    if (!qEnvironmentVariableIsEmpty("KIO_DISABLE_CACHE_CLEANER")) // for autotests
++        return;
+     Q_ASSERT(command.size() == BinaryCacheFileHeader::size + s_hashedUrlNibbles + sizeof(quint32));
+     if (m_cacheCleanerConnection.state() != QLocalSocket::ConnectedState) {
+         QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + QLatin1String("kio_http_cache_cleaner");
diff --git a/debian/patches/upstream_fix_wrong_path.patch b/debian/patches/upstream_fix_wrong_path.patch
new file mode 100644
index 0000000..1e517fe
--- /dev/null
+++ b/debian/patches/upstream_fix_wrong_path.patch
@@ -0,0 +1,26 @@
+commit 15dc16141df44b4a8291a07383bd63d9154807f2
+Author: David Faure <faure at kde.org>
+Date:   Mon Feb 8 09:04:48 2016 +0100
+
+    Fix wrong path -> QUrl conversion in URL combo history (e.g. file dialog)
+    
+    Change-Id: I52ce97e28dc8a947ddd2ef9fdfefd875cf1d1ca7
+
+diff --git a/src/widgets/kurlcombobox.cpp b/src/widgets/kurlcombobox.cpp
+index dfe5d68..8eb3fbe 100644
+--- a/src/widgets/kurlcombobox.cpp
++++ b/src/widgets/kurlcombobox.cpp
+@@ -224,7 +224,12 @@ void KUrlComboBox::setUrls(const QStringList &_urls, OverLoadResolving remove)
+             ++it;
+             continue;
+         }
+-        QUrl u(*it);
++        QUrl u;
++        if (QDir::isAbsolutePath(*it)) {
++            u = QUrl::fromLocalFile(*it);
++        } else {
++            u.setUrl(*it);
++        }
+ 
+         // Don't restore if file doesn't exist anymore
+         if (u.isLocalFile() && !QFile::exists(u.toLocalFile())) {
diff --git a/debian/patches/upstream_kioslavetest_fix_crash.patch b/debian/patches/upstream_kioslavetest_fix_crash.patch
new file mode 100644
index 0000000..972acb9
--- /dev/null
+++ b/debian/patches/upstream_kioslavetest_fix_crash.patch
@@ -0,0 +1,21 @@
+commit 8d016d2950778168a9deb90bd51a1d78f91e7705
+Author: David Faure <faure at kde.org>
+Date:   Mon Feb 8 09:05:26 2016 +0100
+
+    kioslavetest: fix crash
+    
+    Change-Id: Ie28859307a4d8a698464c779752745c5f32e2220
+
+diff --git a/tests/kioslavetest.cpp b/tests/kioslavetest.cpp
+index 619d0b6..33dfb86 100644
+--- a/tests/kioslavetest.cpp
++++ b/tests/kioslavetest.cpp
+@@ -314,7 +314,7 @@ void KioslaveTest::startJob()
+ void KioslaveTest::slotResult(KJob *_job)
+ {
+     if (_job->error()) {
+-        job->uiDelegate()->showErrorMessage();
++        _job->uiDelegate()->showErrorMessage();
+     } else if (selectedOperation == Stat) {
+         UDSEntry entry = ((KIO::StatJob *)_job)->statResult();
+         printUDSEntry(entry);

-- 
kio packaging