[SCM] kio packaging branch, master, updated. debian/5.19.0-1-17-g43132a4
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Apr 10 07:20:09 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=6674ef5
The following commit has been merged in the master branch:
commit 6674ef597633e1c2ea7ac83dfc051ded4d1ef370
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Thu Mar 31 15:38:49 2016 +0200
Refresh patches
---
debian/patches/fix_kfreebsd_build | 17 ++++++---
debian/patches/kubuntu_kdelibs4-docs-path.diff | 17 ++++++---
debian/patches/report_error_removing_dirs | 23 +++++++++----
debian/patches/return_on_ACCESS_DENIED | 17 ++++++---
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 ------------
debian/patches/wait_for_a_bit_longer | 17 ++++++---
9 files changed, 68 insertions(+), 113 deletions(-)
diff --git a/debian/patches/fix_kfreebsd_build b/debian/patches/fix_kfreebsd_build
index 3f40e49..04fb51e 100644
--- a/debian/patches/fix_kfreebsd_build
+++ b/debian/patches/fix_kfreebsd_build
@@ -1,7 +1,16 @@
-Index: kio/src/widgets/kpropertiesdialog.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 31 Mar 2016 15:38:43 +0200
+Subject: fix_kfreebsd_build
+
===================================================================
---- kio.orig/src/widgets/kpropertiesdialog.cpp 2016-02-08 12:10:30.544431744 +0100
-+++ kio/src/widgets/kpropertiesdialog.cpp 2016-02-08 12:10:30.540431907 +0100
+---
+ src/widgets/kpropertiesdialog.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
+index 59e189f..4f7d891 100644
+--- a/src/widgets/kpropertiesdialog.cpp
++++ b/src/widgets/kpropertiesdialog.cpp
@@ -76,6 +76,10 @@
extern "C" {
# include <errno.h>
@@ -13,7 +22,7 @@ Index: kio/src/widgets/kpropertiesdialog.cpp
}
#endif
-@@ -1915,7 +1919,7 @@
+@@ -1915,7 +1919,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin(KPropertiesDialog *_pro
static bool fileSystemSupportsACL(const QByteArray &path)
{
bool fileSystemSupportsACLs = false;
diff --git a/debian/patches/kubuntu_kdelibs4-docs-path.diff b/debian/patches/kubuntu_kdelibs4-docs-path.diff
index adb976f..81c4294 100644
--- a/debian/patches/kubuntu_kdelibs4-docs-path.diff
+++ b/debian/patches/kubuntu_kdelibs4-docs-path.diff
@@ -1,8 +1,17 @@
-Index: kio/src/ioslaves/help/kio_help.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 31 Mar 2016 15:38:43 +0200
+Subject: kubuntu_kdelibs4-docs-path
+
===================================================================
---- kio.orig/src/ioslaves/help/kio_help.cpp 2015-11-19 14:33:04.080944405 +0100
-+++ kio/src/ioslaves/help/kio_help.cpp 2015-11-19 14:36:35.272354243 +0100
-@@ -49,7 +49,8 @@
+---
+ src/ioslaves/help/kio_help.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp
+index f79c801..8fdeb2f 100644
+--- a/src/ioslaves/help/kio_help.cpp
++++ b/src/ioslaves/help/kio_help.cpp
+@@ -50,7 +50,8 @@ QString HelpProtocol::langLookup(const QString &fname)
QStringList search;
// assemble the local search paths
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
index f1673dd..05cbd83 100644
--- a/debian/patches/report_error_removing_dirs
+++ b/debian/patches/report_error_removing_dirs
@@ -1,8 +1,17 @@
-Index: kio/src/core/copyjob.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 31 Mar 2016 15:38:43 +0200
+Subject: report_error_removing_dirs
+
===================================================================
---- kio.orig/src/core/copyjob.cpp 2016-02-08 12:10:19.904863055 +0100
-+++ kio/src/core/copyjob.cpp 2016-02-08 12:10:19.904863055 +0100
-@@ -146,6 +146,7 @@
+---
+ src/core/copyjob.cpp | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp
+index f6849fc..6b36cc6 100644
+--- a/src/core/copyjob.cpp
++++ b/src/core/copyjob.cpp
+@@ -146,6 +146,7 @@ public:
, m_bOverwriteAllFiles(false)
, m_bOverwriteAllDirs(false)
, m_conflictError(0)
@@ -10,7 +19,7 @@ Index: kio/src/core/copyjob.cpp
, m_reportTimer(0)
{
}
-@@ -200,6 +201,8 @@
+@@ -200,6 +201,8 @@ public:
bool m_bOverwriteAllFiles;
bool m_bOverwriteAllDirs;
int m_conflictError;
@@ -19,7 +28,7 @@ Index: kio/src/core/copyjob.cpp
QTimer *m_reportTimer;
-@@ -1704,6 +1707,10 @@
+@@ -1704,6 +1707,10 @@ void CopyJobPrivate::setNextDirAttribute()
--m_processedFiles; // undo the "start at 1" hack
slotReport(); // display final numbers, important if progress dialog stays up
@@ -30,7 +39,7 @@ Index: kio/src/core/copyjob.cpp
q->emitResult();
}
}
-@@ -1773,12 +1780,14 @@
+@@ -1773,12 +1780,14 @@ void CopyJobPrivate::slotTotalSize(KJob *, qulonglong size)
void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
{
Q_Q(CopyJob);
diff --git a/debian/patches/return_on_ACCESS_DENIED b/debian/patches/return_on_ACCESS_DENIED
index 9a41599..237f0f0 100644
--- a/debian/patches/return_on_ACCESS_DENIED
+++ b/debian/patches/return_on_ACCESS_DENIED
@@ -1,8 +1,17 @@
-Index: kio/src/ioslaves/file/file_unix.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 31 Mar 2016 15:38:43 +0200
+Subject: return_on_ACCESS_DENIED
+
===================================================================
---- kio.orig/src/ioslaves/file/file_unix.cpp 2015-10-06 16:18:18.604960597 +0200
-+++ kio/src/ioslaves/file/file_unix.cpp 2015-10-06 16:18:18.600960758 +0200
-@@ -536,8 +536,8 @@
+---
+ src/ioslaves/file/file_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index f2b67ce..d901a63 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -536,8 +536,8 @@ void FileProtocol::del(const QUrl &url, bool isfile)
} else {
// qDebug() << "could not rmdir " << perror;
error(KIO::ERR_CANNOT_RMDIR, path);
diff --git a/debian/patches/series b/debian/patches/series
index 02d402a..a8d2efa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,3 @@ 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");
diff --git a/debian/patches/upstream_fix_wrong_path.patch b/debian/patches/upstream_fix_wrong_path.patch
deleted file mode 100644
index 1e517fe..0000000
--- a/debian/patches/upstream_fix_wrong_path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 972acb9..0000000
--- a/debian/patches/upstream_kioslavetest_fix_crash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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);
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
index 53d5124..49e1635 100644
--- a/debian/patches/wait_for_a_bit_longer
+++ b/debian/patches/wait_for_a_bit_longer
@@ -1,8 +1,17 @@
-Index: kio/autotests/kdirlistertest.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 31 Mar 2016 15:38:43 +0200
+Subject: wait_for_a_bit_longer
+
===================================================================
---- kio.orig/autotests/kdirlistertest.cpp 2016-02-08 12:10:26.216607188 +0100
-+++ kio/autotests/kdirlistertest.cpp 2016-02-08 12:10:26.212607350 +0100
-@@ -1178,7 +1178,7 @@
+---
+ autotests/kdirlistertest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autotests/kdirlistertest.cpp b/autotests/kdirlistertest.cpp
+index 15e9e52..63550e1 100644
+--- a/autotests/kdirlistertest.cpp
++++ b/autotests/kdirlistertest.cpp
+@@ -1178,7 +1178,7 @@ void KDirListerTest::testRemoveWatchedDirectory()
QVERIFY(QDir().rmdir(path + "abc"));
// This should trigger an update.
--
kio packaging
More information about the pkg-kde-commits
mailing list