[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=146162e

The following commit has been merged in the master branch:
commit 146162ed00d0a59d995497609780431ce21451d3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Apr 4 17:20:20 2017 +0200

    Add new upstream patchs to fix the way the flags are being passed: ForwardingSlaveBase-fix-passing-of-Overwrite-flag-to-kio_.patch, Fix-another-clear-porting-bug-in-ForwardingSlaveBase.patch
---
 ...-clear-porting-bug-in-ForwardingSlaveBase.patch | 23 ++++++++++++++++++++
 ...ase-fix-passing-of-Overwrite-flag-to-kio_.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 50 insertions(+)

diff --git a/debian/patches/Fix-another-clear-porting-bug-in-ForwardingSlaveBase.patch b/debian/patches/Fix-another-clear-porting-bug-in-ForwardingSlaveBase.patch
new file mode 100644
index 0000000..77a9d11
--- /dev/null
+++ b/debian/patches/Fix-another-clear-porting-bug-in-ForwardingSlaveBase.patch
@@ -0,0 +1,23 @@
+From: David Faure <faure at kde.org>
+Date: Sun, 1 Jan 2017 13:38:30 +0100
+Subject: Fix another clear porting bug in ForwardingSlaveBase
+
+---
+ src/core/forwardingslavebase.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/core/forwardingslavebase.cpp b/src/core/forwardingslavebase.cpp
+index 0a16c2ef..12fa5f54 100644
+--- a/src/core/forwardingslavebase.cpp
++++ b/src/core/forwardingslavebase.cpp
+@@ -321,9 +321,7 @@ void ForwardingSlaveBase::copy(const QUrl &src, const QUrl &dest,
+     if (!d->internalRewriteUrl(src, new_src)) {
+         error(KIO::ERR_DOES_NOT_EXIST, src.toDisplayString());
+     } else if (d->internalRewriteUrl(dest, new_dest)) {
+-        // Are you sure you want to display here a ProgressInfo ???
+-        KIO::Job *job = KIO::file_copy(new_src, new_dest, permissions,
+-                                       (flags & (~Overwrite) & (~HideProgressInfo)));
++        KIO::Job *job = KIO::file_copy(new_src, new_dest, permissions, flags | HideProgressInfo);
+         d->connectJob(job);
+ 
+         d->eventLoop.exec();
diff --git a/debian/patches/ForwardingSlaveBase-fix-passing-of-Overwrite-flag-to-kio_.patch b/debian/patches/ForwardingSlaveBase-fix-passing-of-Overwrite-flag-to-kio_.patch
new file mode 100644
index 0000000..98de66c
--- /dev/null
+++ b/debian/patches/ForwardingSlaveBase-fix-passing-of-Overwrite-flag-to-kio_.patch
@@ -0,0 +1,25 @@
+From: David Faure <faure at kde.org>
+Date: Sun, 1 Jan 2017 13:16:10 +0100
+Subject: ForwardingSlaveBase: fix passing of Overwrite flag to kio_desktop
+
+Unittest will be committed to plasma-workspace/kioslave/desktop later.
+
+BUG: 360487
+FIXED-IN: 5.30
+---
+ src/core/forwardingslavebase.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/forwardingslavebase.cpp b/src/core/forwardingslavebase.cpp
+index 5e724764..0a16c2ef 100644
+--- a/src/core/forwardingslavebase.cpp
++++ b/src/core/forwardingslavebase.cpp
+@@ -273,7 +273,7 @@ void ForwardingSlaveBase::symlink(const QString &target, const QUrl &dest,
+ 
+     QUrl new_dest;
+     if (d->internalRewriteUrl(dest, new_dest)) {
+-        KIO::SimpleJob *job = KIO::symlink(target, new_dest, flags & HideProgressInfo);
++        KIO::SimpleJob *job = KIO::symlink(target, new_dest, flags | HideProgressInfo);
+         d->connectSimpleJob(job);
+ 
+         d->eventLoop.exec();
diff --git a/debian/patches/series b/debian/patches/series
index 102cca3..6022d76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ fix_hurd_build.patch
 Never-stretch-the-last-date-column-in-the-file-dialog.patch
 Also-change-the-resize-mode-the-other-way.patch
 Allow-uppercase-checksums-matching-in-Checksums-tab.patch
+ForwardingSlaveBase-fix-passing-of-Overwrite-flag-to-kio_.patch
+Fix-another-clear-porting-bug-in-ForwardingSlaveBase.patch

-- 
kio packaging