diff options
Diffstat (limited to 'kde-frameworks/kio')
| -rw-r--r-- | kde-frameworks/kio/Manifest | 5 | ||||
| -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 | ||||
| -rw-r--r-- | kde-frameworks/kio/kio-5.40.0-r3.ebuild (renamed from kde-frameworks/kio/kio-5.40.0.ebuild) | 6 |
4 files changed, 53 insertions, 4 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 61ba76cf5a2d..13a03530c581 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,9 +1,10 @@ AUX kio-5.37.0-tests.patch 1399 BLAKE2B 4f489f5a6321a73b6a01df33c2cb8deaca2c72940c040c7c7e301cf654039f1c94d0eea4e76e581bfc525c2565eea13dfb863e0d1e2cbf10408e49da151b129d SHA512 a894886d400719ef8b11e83454be55406e2cd677da8cdbfd822e5155945198f54c4b2aed8c92b702fa7c8f858020c5e7c481719317513735c9538f0da5963221 AUX kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch 2506 BLAKE2B 404ce0e81484a20d1841812096830748fffb9bafda15b4146e6c924eaedd3b07ae5f20221f505fdd576a5c3a60e660f82b1edcf698b2f1654fd0c2d14c8a0b79 SHA512 1e39632a67ba8244f992c4a22df837452a09ae0134693066414eeded90c4b8cdf684129d1594e1c7dc5a1cfc445246284dcf1f28006939c2974577691584afbb -AUX kio-5.40.0-mkpath-qt-5.9.3.patch 2442 BLAKE2B 37ec852e1c34233ae00b60af8eb9ba82ccbf33761c78174a9a50ff4a29f33a285b38f5d3ac07e6eeb9f97d1fce3178a4335c9a1fd3fd84e4cbe9755606c88af0 SHA512 71a44dc2ded1218b9d7bd497654cb474690955a6e625057d23fbaa0c45c203cf112768f67d30cb6e97949fe98ba1bef969800cbf888b011c0cc76d662cf460b5 +AUX kio-5.40.0-mkpath-qt-5.9.3.patch 2481 BLAKE2B 7c98a58dfaa7f86cf83179f2615d54fa0c1ef81a226a6533a2c6d0a7c3247ca9414ee7a9863664411f51f4433152f1df6e076402463010f27e9cd656bea036fa SHA512 c8207d96555ddeddc6e8d387fb59d33d2a7a34fc068f6ad9ee30f92b16007d5f53696fcc83e8a3686af6314e127f6556088f418b16759f9a1eea812adce0cd46 +AUX kio-5.40.0-testtrash-qt-5.9.3.patch 1311 BLAKE2B 98bf9667d64e1f408adcde47e05d26c8774459679cd3ad67948dd4a245225ce9cef4c1030aaaa01cb3303d7589bd97565860df7bbe329578bb298282c771c184 SHA512 4761fbb0f7d5034dc66717c2578b095fdb6b85241c5e05fc0ab166c75aae9ddd1d9b3aaa0b9628a44c13cc6f4cfcdb0aa348f3e1c97b7780e53567a1392c11ef DIST kio-5.37.0.tar.xz 3084204 SHA256 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64 WHIRLPOOL 649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6 DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed EBUILD kio-5.37.0.ebuild 1948 BLAKE2B bbfec08de5c047c423f1fc227a1be8b3cfc5dabc6a8437c75c13b1803c29a795f36cfd27d44bfad5a3c6614ad11b2c54cdab880a4288ed540a3fe2e8efc3df71 SHA512 214a136ca904777793d39ad7d88ac9e60df3a253dcb76aea6782b27a4caee9f9581e64d1ddc9793887152661b875092efe09587199e24171bbdf6259f762416c EBUILD kio-5.40.0-r2.ebuild 2006 BLAKE2B d6f87e1f3d217046df97f120f0a4b386bb23f81760ac4fbb34fbb805822618a924f625fc93c18b19c3198da7d65d6563dd5cdb45b4c4005ebebbbe3372fe2d1b SHA512 b4cbdd9493cb46a23ef4d59220d5aff698083d240480b37b80d32d7407ee72266eccf0d3aaf708dc819e66b8aa8986f41c663753fa4963aeae927f3d0235665f -EBUILD kio-5.40.0.ebuild 1896 BLAKE2B 05402887a0107b41fa23472b55e58f9f2420051e61c010745cfebb9dc1257808c12bbf1aed6ca0e9619c597450a56dace4d23da8e1b4256b0a64e48c90e843f2 SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c +EBUILD kio-5.40.0-r3.ebuild 2051 BLAKE2B e25a648b47231c103b2bad3922198142d443d370fc314be5f46c9232806e9d2d3c866cbd4418cfae0cad12359acbdd1930c644037d352a127f63357b8723803d SHA512 3557423215119450d01eef07a12a296228fcbaac6b23b12db7601104a4c059080c5744343065051e2490d9eb0194c337f9e785cc5655c6fe6012c46a089f0b40 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820 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 + diff --git a/kde-frameworks/kio/kio-5.40.0.ebuild b/kde-frameworks/kio/kio-5.40.0-r3.ebuild index 4c595b88b638..8429d9c0378c 100644 --- a/kde-frameworks/kio/kio-5.40.0.ebuild +++ b/kde-frameworks/kio/kio-5.40.0-r3.ebuild @@ -62,6 +62,12 @@ PDEPEND=" $(add_frameworks_dep kded) " +PATCHES=( + "${FILESDIR}/${P}-mkpath-qt-5.9.3.patch" + "${FILESDIR}/${P}-knewfilemenu-mkpath-qt-5.9.3.patch" + "${FILESDIR}/${P}-testtrash-qt-5.9.3.patch" +) + # tests hang RESTRICT+=" test" |