diff options
author | 2018-03-11 17:50:58 +0100 | |
---|---|---|
committer | 2018-03-11 23:21:16 +0100 | |
commit | 44fe498c423b888cbe2c88f3776a9144e241c8c9 (patch) | |
tree | 261b870b84ede031cca2a8629deb55ce434920fa /kde-frameworks/kio/files | |
parent | dev-games/openscenegraph: Drop 3.5.1 (diff) | |
download | gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.gz gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.bz2 gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.zip |
kde-frameworks: Drop KDE Frameworks 5.40.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'kde-frameworks/kio/files')
3 files changed, 0 insertions, 187 deletions
diff --git a/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch deleted file mode 100644 index 9645620d04d..00000000000 --- a/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 298c0e734efdd8a7b66a531959e3fb5357a6495d Mon Sep 17 00:00:00 2001 -From: Eike Hein <hein@kde.org> -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 - diff --git a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch deleted file mode 100644 index 503a8c77378..00000000000 --- a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2353119aae8f03565bc7779ed1d597d266f5afda Mon Sep 17 00:00:00 2001 -From: Elvis Angelaccio <elvis.angelaccio@kde.org> -Date: Thu, 16 Nov 2017 10:41:19 +0100 -Subject: Fix KIO::mkpath with qtbase 5.10 beta 4 - -Summary: -The latest Qt 5.10 beta includes [1] which breaks a bunch of unit tests, -since `url.setPath("//foo")` will now result in an invalid (empty) QUrl. - -This patch fixes the KIO::mkpath() case. - -[1]: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f62768d046528636789f901ac79e2cfa1843a7b7 - -Test Plan: - -* I can now create folders from dolphin and plasma. -* fileundomanagertest and mkpathjobtest no longer fail - -Reviewers: #frameworks, dfaure - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D8836 - -* asturm: Fix build with Qt-5.7.1 ---- - src/core/mkpathjob.cpp | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp -index bff46ca..a177805 100644 ---- a/src/core/mkpathjob.cpp -+++ b/src/core/mkpathjob.cpp -@@ -43,8 +43,13 @@ public: - m_url.setPath(QStringLiteral("/")); - int i = 0; - for (; i < basePathComponents.count() && i < m_pathComponents.count(); ++i) { -- if (m_pathComponents.at(i) == basePathComponents.at(i)) { -- m_url.setPath(m_url.path() + '/' + m_pathComponents.at(i)); -+ const QString pathComponent = m_pathComponents.at(i); -+ if (pathComponent == basePathComponents.at(i)) { -+ if (m_url.path() == QLatin1String("/")) { -+ m_url.setPath(m_url.path() + pathComponent); -+ } else { -+ m_url.setPath(m_url.path() + '/' + pathComponent); -+ } - } else { - break; - } -@@ -57,7 +62,13 @@ public: - if (m_url.isLocalFile()) { - i = 0; - for (; i < m_pathComponents.count(); ++i) { -- QString testDir = m_url.toLocalFile() + '/' + m_pathComponents.at(i); -+ const QString localFile = m_url.toLocalFile(); -+ QString testDir; -+ if (localFile == QLatin1String("/")) { -+ testDir = localFile + m_pathComponents.at(i); -+ } else { -+ testDir = localFile + '/' + m_pathComponents.at(i); -+ } - if (QFileInfo(testDir).isDir()) { - m_url.setPath(testDir); - } else { --- -cgit v0.11.2 - diff --git a/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch deleted file mode 100644 index f3e1112720d..00000000000 --- a/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 05938a167dd4190014d800bb02446e2779a9b3b2 Mon Sep 17 00:00:00 2001 -From: Elvis Angelaccio <elvis.angelaccio@kde.org> -Date: Thu, 16 Nov 2017 12:06:41 +0100 -Subject: Fix testtrash with qtbase 5.10 beta 4 - -Summary: -Same fix as in D8836, this time for testtrash. - -Test Plan: -Run testtrash. - -Reviewed By: dfaure - -Differential Revision: https://phabricator.kde.org/D8837 - -*asturm: Fix build with Qt-5.7.1 ---- - src/core/listjob.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/core/listjob.cpp b/src/core/listjob.cpp -index 4b7b510..54a422a 100644 ---- a/src/core/listjob.cpp -+++ b/src/core/listjob.cpp -@@ -117,7 +117,11 @@ void ListJobPrivate::slotListEntries(const KIO::UDSEntryList &list) - itemURL = q->url(); - filename = entry.stringValue(KIO::UDSEntry::UDS_NAME); - Q_ASSERT(!filename.isEmpty()); // we'll recurse forever otherwise :) -- itemURL.setPath(itemURL.path() + '/' + filename); -+ if (itemURL.path() == QLatin1String("/")) { -+ itemURL.setPath(itemURL.path() + filename); -+ } else { -+ itemURL.setPath(itemURL.path() + '/' + filename); -+ } - } - - if (entry.isDir() && !entry.isLink()) { --- -cgit v0.11.2 - |