From d231d457134d8ac7169905f2780ab831fbc1b0e42d23f7dd4f021e99b4f2ed1b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 22 Dec 2017 16:25:28 +0000 Subject: [PATCH] KDE Frameworks 5.41 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=209 --- kio-5.40-fix-directory-creation.patch | 80 --------------------------- kio-5.40.0.tar.xz | 3 - kio-5.41.0.tar.xz | 3 + kio.changes | 12 ++++ kio.spec | 7 +-- 5 files changed, 17 insertions(+), 88 deletions(-) delete mode 100644 kio-5.40-fix-directory-creation.patch delete mode 100644 kio-5.40.0.tar.xz create mode 100644 kio-5.41.0.tar.xz diff --git a/kio-5.40-fix-directory-creation.patch b/kio-5.40-fix-directory-creation.patch deleted file mode 100644 index 05b78bd..0000000 --- a/kio-5.40-fix-directory-creation.patch +++ /dev/null @@ -1,80 +0,0 @@ -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 - #include -+#include - #include - - 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 - diff --git a/kio-5.40.0.tar.xz b/kio-5.40.0.tar.xz deleted file mode 100644 index d280a04..0000000 --- a/kio-5.40.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30ea0b231b995faaf4283b9c9ecfaffb589268f5d7b5b805f69ed95601ac389b -size 3100424 diff --git a/kio-5.41.0.tar.xz b/kio-5.41.0.tar.xz new file mode 100644 index 0000000..498cc61 --- /dev/null +++ b/kio-5.41.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90c4c27959efec70849fd03e6cf9708d09c0101a15f3c14ab731ec0997bb649e +size 3108068 diff --git a/kio.changes b/kio.changes index a4ec67b..bec1db8 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Dec 17 09:43:48 CET 2017 - lbeltrame@kde.org + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Too many changes to list here +- Dropped patches, now upstream: + * kio-5.40-fix-directory-creation.patch + ------------------------------------------------------------------- Thu Nov 30 20:01:35 UTC 2017 - antoine.belvire@opensuse.org diff --git a/kio.spec b/kio.spec index 52dd74c..8fd7ed5 100644 --- a/kio.spec +++ b/kio.spec @@ -17,13 +17,13 @@ %bcond_without lang -%define _tar_path 5.40 +%define _tar_path 5.41 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kio -Version: 5.40.0 +Version: 5.41.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -81,8 +81,6 @@ Source1: baselibs.conf 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 @@ -130,7 +128,6 @@ Development files. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %cmake_kf5 -d build