commit kio for openSUSE:Factory
Hello community, here is the log from the commit of package kio for openSUSE:Factory checked in at 2017-12-08 12:48:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio (Old) and /work/SRC/openSUSE:Factory/.kio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kio" Fri Dec 8 12:48:17 2017 rev:56 rq:547260 version:5.40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kio/kio.changes 2017-11-16 14:38:54.575250415 +0100 +++ /work/SRC/openSUSE:Factory/.kio.new/kio.changes 2017-12-08 12:48:18.517359531 +0100 @@ -1,0 +2,6 @@ +Thu Nov 30 20:01:35 UTC 2017 - antoine.belvire@opensuse.org + +- Fix error upon directory creation with Dolphin (kde#387073): + * Add kio-5.40-fix-directory-creation.patch. + +------------------------------------------------------------------- New: ---- kio-5.40-fix-directory-creation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio.spec ++++++ --- /var/tmp/diff_new_pack.fJXMU6/_old 2017-12-08 12:48:19.209334540 +0100 +++ /var/tmp/diff_new_pack.fJXMU6/_new 2017-12-08 12:48:19.209334540 +0100 @@ -81,6 +81,8 @@ Patch0: kio_help-fallback-to-kde4-docs.patch # PATCH-FIX-UPSTREAM Patch1: fix-handling-of-KCookieAdvice_AcceptForSession.patch +# PATCH-FIX-UPSTREAM kio-5.40-fix-directory-creation.patch -- Fix kde#387073 +Patch2: kio-5.40-fix-directory-creation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -128,6 +130,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build ++++++ kio-5.40-fix-directory-creation.patch ++++++
From 298c0e734efdd8a7b66a531959e3fb5357a6495d Mon Sep 17 00:00:00 2001 From: Eike Hein
Date: Tue, 28 Nov 2017 19:42:46 +0900 Subject: Fix creating a directory via KNewFileMenu+KIO::mkpath on Qt 5.9.3+
Summary: f62768d04652 in qtbase.git introduced a behavior change in QUrl causing it to reject URLs with a path of "//foo" (note the double slash) as invalid. Both KNewFileMenu and KIO::mkpath contained code following this pattern: url.path() + '/' + name This is a bad mix with forwarding slaves like kio_desktop, which translate a top-level path of / to some other URL: (desktop:)/ + / + foo = //foo This patch addresses the two instances of this by wrapping the string building in QDir::cleanPath, which I think is the shortest and most readable way to go. 2353119aae8f in kio.git (D8836) was another commit fixing fallout from this Qt change. Is unlikely this patch will be the last one. I suspect many other variations of this problem lurk about the codebase. BUG:387073 Reviewers: dfaure, thiago, elvisangelaccio Subscribers: #frameworks Tags: #frameworks Differential Revision: https://phabricator.kde.org/D9029 --- src/core/mkpathjob.cpp | 3 ++- src/filewidgets/knewfilemenu.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp index c77a9fe..f67a489 100644 --- a/src/core/mkpathjob.cpp +++ b/src/core/mkpathjob.cpp @@ -25,6 +25,7 @@ #include "mkdirjob.h" #include <QTimer> #include <QDebug> +#include <QDir> #include <QFileInfo> using namespace KIO; @@ -123,7 +124,7 @@ void MkpathJobPrivate::slotStart() } if (m_pathIterator != m_pathComponents.constEnd()) { - m_url.setPath(m_url.path() + '/' + *m_pathIterator); + m_url.setPath(QDir::cleanPath(m_url.path() + '/' + *m_pathIterator)); KIO::Job* job = KIO::mkdir(m_url); q->addSubjob(job); q->setProcessedAmount(KJob::Directories, q->processedAmount(KJob::Directories) + 1); diff --git a/src/filewidgets/knewfilemenu.cpp b/src/filewidgets/knewfilemenu.cpp index 023eebd..98c9852 100644 --- a/src/filewidgets/knewfilemenu.cpp +++ b/src/filewidgets/knewfilemenu.cpp @@ -855,7 +855,7 @@ void KNewFileMenuPrivate::_k_slotCreateDirectory(bool writeHiddenDir) } } url = baseUrl; - url.setPath(url.path() + '/' + name); + url.setPath(QDir::cleanPath(url.path() + '/' + name)); } } -- cgit v0.11.2
participants (1)
-
root@hilbert.suse.de