diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
commit | 4cd2370bed609c118b6edfde5d3f116e5c35b897 (patch) | |
tree | ec58f2c41f49754e41521d5ebc9dce4597ddd0a5 /kde-frameworks/kio/files | |
parent | f443475c824b4b5c086e6d040961cb35ad81bc60 (diff) |
gentoo resync : 03.12.2017
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r-- | kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch | 6 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch | 40 |
2 files changed, 44 insertions, 2 deletions
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 index d9cf7402741d..503a8c773780 100644 --- 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 @@ -21,6 +21,8 @@ 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(-) @@ -37,7 +39,7 @@ index bff46ca..a177805 100644 - 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() == QLatin1Char('/')) { ++ if (m_url.path() == QLatin1String("/")) { + m_url.setPath(m_url.path() + pathComponent); + } else { + m_url.setPath(m_url.path() + '/' + pathComponent); @@ -52,7 +54,7 @@ index bff46ca..a177805 100644 - QString testDir = m_url.toLocalFile() + '/' + m_pathComponents.at(i); + const QString localFile = m_url.toLocalFile(); + QString testDir; -+ if (localFile == QLatin1Char('/')) { ++ if (localFile == QLatin1String("/")) { + testDir = localFile + m_pathComponents.at(i); + } else { + testDir = localFile + '/' + m_pathComponents.at(i); 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 new file mode 100644 index 000000000000..f3e1112720da --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch @@ -0,0 +1,40 @@ +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 + |