[SCM] kio packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu3-84-gb449cde

[Bhushan Shah]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b449cde16007256dbc393fae627672f2a67413c9
Author: Bhushan Shah <bhush94 at gmail.com>
Date:   Wed Feb 17 16:05:28 2016 +0530

    remove already upstream'd patch
---
 debian/patches/series                             |  1 -
 debian/patches/upstream_autotest__fix_ctest.patch | 40 -----------------------
 2 files changed, 41 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 82a4d3d..ede0465 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@ 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
deleted file mode 100644
index 15757b7..0000000
--- a/debian/patches/upstream_autotest__fix_ctest.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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");

-- 
kio packaging