diff options
Diffstat (limited to 'kde-frameworks')
18 files changed, 394 insertions, 63 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz Binary files differindex 8e5b1efe1233..bdb2256752bf 100644 --- a/kde-frameworks/Manifest.gz +++ b/kde-frameworks/Manifest.gz diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index c043b1ed9b62..4977df59c594 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,5 +1,6 @@ +AUX extra-cmake-modules-5.40.0-qmlplugindump-path.patch 1270 BLAKE2B f07e75e7558f85f2b1bf0ec49258c489ac64dc8efb0b9d897fec790a91d36e6e44d75cdad5aa34c9f45f269b49531cb82bcdffe7a0627b6f092317ac5ffb01aa SHA512 cbfd90b802f9629573c6bf1b51b2bb46d2d5991ffe41381f8867fe094c43a8f2d80175f70d7372a1df05a835df34faad5049ae87971b581f3fe0ba12e41724db DIST extra-cmake-modules-5.37.0.tar.xz 311696 SHA256 26198cf05c084c158bb23f0585a9df5bba1aa16b746252c80bdf4f0261b527cb SHA512 eb064dcf03960913c41c61dcb02ed12fa1b83abe507f9b161770bae8fe32b74dee45a29b12af26e636e896b97b17221adf67ea8465fcc9ab319b4ee55ab4f8bf WHIRLPOOL 0085edc89a6ac6369b509cd16ee79447f3d6c924aa06ca8bf73471772ae03afd8d57223fad70c5d5e4e3256ffc12e1de0b9176dfdbb2526015b41230a16da12d -DIST extra-cmake-modules-5.40.0.tar.xz 312532 SHA256 83e48889c84474e4f560e10e4eea0cc529f8511b3bd0415fcb898ac0496e630a SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c WHIRLPOOL 8b41b776a90c4126c9291a0bd7cde6a417240e0976b6d3325fbe7d534a90bf51e9f36871b76ebe9a11e06510367620fe63351e625b4b4665b896ed7f17ecd201 +DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c EBUILD extra-cmake-modules-5.37.0-r1.ebuild 1282 BLAKE2B 626c42faf13e2dc17b768eed847996ca283f2d030b29b8b51099e5b9342a18b33c1f6d503be375672e6405f87c859b9564575bc226980ddb0186d4934cbc89b2 SHA512 c52d5b2899eb2dfb2479c8df74af05fc19a64870dda36d42de03cae98cfc61a669600de8c9b22379652759774518a327172057558345108dd1095cdc3bc4ffa7 -EBUILD extra-cmake-modules-5.40.0.ebuild 1267 BLAKE2B f4f7dd512a4324d1a6e0105e2d6c95eaa7099e7bbffbeb5c1be52264b62bc2996c5359c92f43856f9d94755dbf5920b62da10b854f9aeda021275f55cdcb1b7e SHA512 d0f1df995c74a6fd9ba779369f3378c559f63fee5ea0d8482d9d3c0991d72d978e7d786d90370536d350771e53565da5b3aa5a7d873856fb5e2926d52cf51115 +EBUILD extra-cmake-modules-5.40.0-r1.ebuild 1324 BLAKE2B 751a000e97ea546d7195f7d6624960a126d4eb12f4255e113984e7c68ffb3d464260528a0a786f354dc1d70eab0d25c30921ad9e817c5eb90e5900e2f0c63ebc SHA512 0411ef52b469ce4c4787ef8a3aab32467da3018a442e4398b514961b8821e648eff2100cc54ef40b519c88cc816df9584581f013135f9de449154d8086a02f08 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild index f565f9c0be76..76f08e6ba7c6 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild @@ -31,6 +31,8 @@ RDEPEND=" app-arch/libarchive[bzip2] " +PATCHES=( "${FILESDIR}/${P}-qmlplugindump-path.patch" ) + python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch new file mode 100644 index 000000000000..d1bcf791fd4c --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch @@ -0,0 +1,38 @@ +From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sat, 2 Dec 2017 19:04:10 +0100 +Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump + +Summary: +Without any hint, qmlplugindump version is whatever default is set by qtchooser. +Fix uses the same approach as FindQtWaylandScanner.cmake. + +Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. + +Reviewers: apol + +Subscribers: #frameworks, #build_system + +Tags: #frameworks, #build_system + +Differential Revision: https://phabricator.kde.org/D9116 +--- + modules/ECMFindQMLModule.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in +index 428d60a..d72c52b 100644 +--- a/modules/ECMFindQMLModule.cmake.in ++++ b/modules/ECMFindQMLModule.cmake.in +@@ -27,7 +27,7 @@ + + include(FindPackageHandleStandardArgs) + +-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) ++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) + if(NOT QMLPLUGINDUMP_PROGRAM) + message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") + endif() +-- +2.15.1 + diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest index f2ebab3c77c7..a8efe5f1d132 100644 --- a/kde-frameworks/kded/Manifest +++ b/kde-frameworks/kded/Manifest @@ -1,5 +1,6 @@ +AUX kded-5.40.0-obsolete-dbus-calls.patch 2320 BLAKE2B b117043acb993095e9519c651b51dea2f33d326fd72793c6429062fad6b18f83bbf2f02c3347a75a6fb9fca2f19a844fc9e48e7478259dd01aaf07cc57f9cc5a SHA512 23cc995c40ace5f1a9d6156d229c68ad3fd590cbb7f6ca58cd2a1a503acf8852b786d4d604ca2e9b8a5e4722e2a7f9179b4c27e765339ac5d1d3e61e966420ba DIST kded-5.37.0.tar.xz 38020 SHA256 fea1c5e9fb1444be0988455c1e51fb2a8cc846db522297108a0b2c2c3a2e5a98 SHA512 2a420cf97f55858ec6cac4a74bdf97f367b32fc07529714b494576f7828261ae52650972b9f8b80e5e12cd854f66e7bc4d2d2cd339d7ce8a71ab29ebd41e76fa WHIRLPOOL f5c6da6d02ec099072b6ded7ac207c3d6f6f7b674a99531216b2f03408ac16f530bea916f207604c0b76a9de56561ab2234c9b7b4e2413792e5e1fe521c8773e -DIST kded-5.40.0.tar.xz 38152 SHA256 0439d68e2b08a0084b6d15e92679692090271a873ee90dca8ed0a0afa1eac449 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8 WHIRLPOOL 9bb10fa2d135394eb0c33ef15209aeae6037ba91840cf2ad3e2f26ac3acd53541e203fe02202db52d038fa1d0a7c710fd77eb4754ea87451722d1ac569e7260b +DIST kded-5.40.0.tar.xz 38152 BLAKE2B 12e23dcf366fac8714abbfdfe19cac818f5b127b4d44e142363c6cd005924b14237420352314bb0e6f95b9d990b4844ae0ead4a511df46f5316483892a94ae73 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8 EBUILD kded-5.37.0.ebuild 709 BLAKE2B cc0a2750b1a71f589b63d455e9f3ae7469256a5d372e6e61a5d52530753decc27abcc8736cc69fb5dd700a5650cbabdd6535c80801f169b8464367fd0893ccac SHA512 e0c719796f4614e4306aa8b5b49e9f832b81c3d4f9ab5b22a40376920dc996be940a1c444c030b1103c0ae307a057266c9df5b71333c67249a0fd3b3b82041f4 -EBUILD kded-5.40.0.ebuild 730 BLAKE2B 7393aa446f52c6fb54fad5c6222ff5b5d67d7f6f48443a8a0b25461af3eda2b0237a12c191e22d259f2de9754d874f4836b0bb4ba7feee0d9db28713e96cb766 SHA512 d27b0c628c386ee6671b85b8fc075ae40aab27a064dcf86329bb83237254bceedaa9ff372c6139bb9f53f8a80d86e76ea708582253062d3e2b686b888504f2a8 +EBUILD kded-5.40.0-r1.ebuild 788 BLAKE2B d3b0bf94f675dd6000ad34c95953c8f0edd0aeff37e48538730bc0321e26b5d2adb49f2d4e6951d5f71904fdd1c6f0c578019e5477ed19ada313a0037d59ba4a SHA512 4e85acfae33d1e6edeaeecf0b050b057a973667766965458f8f346f1a322b1d988eb4e5c33e21f5ad371202bde061113e554737f9c0bcc9ce7e91bfcfc468f6f MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337 diff --git a/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch b/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch new file mode 100644 index 000000000000..96fa447c9bc2 --- /dev/null +++ b/kde-frameworks/kded/files/kded-5.40.0-obsolete-dbus-calls.patch @@ -0,0 +1,70 @@ +From 185afa8a3af8002172d8f5d6aa08c57244422a12 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Thu, 2 Nov 2017 22:27:29 +0100 +Subject: kded: remove dbus calls to ksplash. + +Summary: +Not needed anymore since June 2016 (b6058a0 in plasma-workspace, i.e. Plasma +5.7). + +Originally at https://git.reviewboard.kde.org/r/129010/ + +Test Plan: none, this is dead code + +Reviewers: davidedmundson + +Reviewed By: davidedmundson + +Subscribers: #plasma, #frameworks + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D8632 +--- + src/kded.cpp | 21 --------------------- + 1 file changed, 21 deletions(-) + +diff --git a/src/kded.cpp b/src/kded.cpp +index 526bd4e..11ddd4f 100644 +--- a/src/kded.cpp ++++ b/src/kded.cpp +@@ -37,7 +37,6 @@ + #include <QDBusConnectionInterface> + #include <QDBusInterface> + #include <QDBusServiceWatcher> +-#include <QDBusPendingCall> + + #include <KDBusService> + #include <kconfiggroup.h> +@@ -777,28 +776,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[]) + (void) new KUpdateD; // Watch for updates + } + +-//NOTE: We are going to change how KDE starts and this certanly doesn't fit on the new design. +-#ifdef Q_OS_LINUX +- // Tell KSplash that KDED has started +- QDBusMessage ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"), +- QStringLiteral("/KSplash"), +- QStringLiteral("org.kde.KSplash"), +- QStringLiteral("setStage")); +- ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("kded")); +- QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage); +-#endif +- + runKonfUpdate(); // Run it once. + +-#ifdef Q_OS_LINUX +- ksplashProgressMessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.KSplash"), +- QStringLiteral("/KSplash"), +- QStringLiteral("org.kde.KSplash"), +- QStringLiteral("setStage")); +- ksplashProgressMessage.setArguments(QList<QVariant>() << QStringLiteral("confupdate")); +- QDBusConnection::sessionBus().asyncCall(ksplashProgressMessage); +-#endif +- + int result = app.exec(); // keep running + + delete kded; +-- +cgit v0.11.2 + diff --git a/kde-frameworks/kded/kded-5.40.0.ebuild b/kde-frameworks/kded/kded-5.40.0-r1.ebuild index 7eb1ce3f4ee3..5c25a5e9226d 100644 --- a/kde-frameworks/kded/kded-5.40.0.ebuild +++ b/kde-frameworks/kded/kded-5.40.0-r1.ebuild @@ -27,6 +27,8 @@ DEPEND="${RDEPEND} man? ( $(add_frameworks_dep kdoctools) ) " +PATCHES=( "${FILESDIR}/${P}-obsolete-dbus-calls.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package man KF5DocTools) diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest index 0b611b49aac8..9abe5c3ff008 100644 --- a/kde-frameworks/kdelibs/Manifest +++ b/kde-frameworks/kdelibs/Manifest @@ -8,7 +8,6 @@ AUX kdelibs-4.14.35-kde3support.patch 3153 BLAKE2B 483afaa0ad8cf2ddc03260b621f69 AUX kdelibs-4.14.35-plasma4.patch 1926 BLAKE2B b65fc5627bda391f0b60b0144e1ebfd7fb03b14c9753027676205b54e67d239f2ee06ff37e4d3ca52dba924ca9e6f0659d47da547622fe2e1ee27deee4142c8e SHA512 3150a6a9821c52c5b131ffdf84d32754c60e83762a6df938f8d6d8afd3182303d0919e91651f6cf0b15c996f2762c02c0124e7bd086582a9874fbf7e69fadfcc AUX kdelibs-4.14.5-fatalwarnings.patch 1070 BLAKE2B 4be7ef58a8e5b87e35eb749a9cd3f9136991f5d6409f09ce2919bf498c5dced456517e5d9a4af7c1300d8c34d0cc2984d61d5d7ef0d39b7b48f84aaa9f7533cd SHA512 69767a980db082bf51ae42948d9703efe22b28f6a0e20a84c4d297a34c018669194e120fa5494dfedf34cc075931bbebc528818b58b1ce45525733768e5d1ec9 AUX kdelibs-4.14.5-mimetypes.patch 805 BLAKE2B 5a8d9f7d36e1d68b43ffdd7be71a4951ebc1be38158dd489e839563971bd4576dcb2a1cbeccbd9e783a898c169f9ef43ce26bcfedd33b3630956ec67bfe4792b SHA512 8037e935de6239ef3a32f540f82bdf00cba99e89a72c4756d703d4dceba088a4af5b7bd6955bb68e430ed040d4abad629caff27a2f4bbe5f140e7cd36b07e28e -AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2144 BLAKE2B 5e980d9b23dfb5ff6280922075cf4dd982b4a64424e8818c6533ed41a752f51977f0ac11b2d3be5ee2689ff8b7ddb9e11e0e1ebc4044d8da134149a5a21be723 SHA512 e4dba43c7695f21366399aac32309c53dc53ec5d7e1af945dde11e63a518c00cbfb36a72606af4de8c11463f411965b1a6ad844f8c39e30568ed7ad6a46421b4 AUX kdelibs-4.4.90-xslt.patch 553 BLAKE2B e692ecbd4126c3e7c1183b192e092a128e549da88836de91e967eac42e3e5d2bdf8d5b7620d01e8245674aacbcde4998b88ef0cf27b2158a11903682eabdfce6 SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 BLAKE2B 19df42a9b0ba3f0ab1b6a5d990b481d525003746af71dbb3ad8d4f749ddf021afb4a0a1dcebc41f76dd779b344563f6e6ef222b18b1239dc647d34eb648a4671 SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1 AUX kdelibs-4.8.1-norpath.patch 788 BLAKE2B cdf6f6cd3df45f53782d81be09ea85051e90e1a9925972b608cec1a9324c2a5d364821b2ef63076c50140f0558ffe46e1f13b7f1754c4c2e3da2c805c3c49e1a SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch deleted file mode 100644 index aca4fe412462..000000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -purN kdeui/util/kkeyserver_mac.cpp kdeui/util/kkeyserver_mac.cpp ---- a/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:05:26.284881642 -0500 -+++ b/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:11:23.393094384 -0500 -@@ -68,7 +68,7 @@ namespace KKeyServer { - #ifdef QT_MAC_USE_COCOA - static TISInputSourceRef lastLayout = 0; - #else -- static KeyboardLayoutRef lastLayout = NULL; -+ static TISInputSourceRef lastLayout = NULL; - #endif - - void updateScancodes() { -@@ -125,16 +125,27 @@ namespace KKeyServer { - #endif - lastLayout = layout; - scancodes.clear(); -- void *kchr; -- if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) { -+ UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData); -+ if (uchr == NULL) { - kWarning() << "Couldn't load active keyboard layout"; - } else { - for (int i = 0; i < 128; i++) { - UInt32 tmpState = 0; -- UInt32 chr = KeyTranslate(kchr, i, &tmpState); -- if (chr && chr != kFunctionKeyCharCode) { -- scancodes.insert(chr, i); -- } -+ UInt32 deadKeyState = 0; -+ UInt32 flags = 0; -+ UniCharCount maxStringLength = 255; -+ UniCharCount actualStringLength = 0; -+ UniChar unicodeString[maxStringLength]; -+ -+ UCKeyTranslate(uchr, i, kUCKeyActionDown, -+ flags, LMGetKbdType(), -+ 1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString); -+ fprintf(stderr, "Got key: %s\n", unicodeString); -+ fflush(stderr); -+ //UInt32 chr = KeyTranslate(kchr, i, &tmpState); -+ //if (chr && chr != kFunctionKeyCharCode) { -+ // scancodes.insert(chr, i); -+ //} - } - } - } diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index 68b71e9f5529..c0ae54971f85 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,5 +1,6 @@ +AUX kdelibs4support-5.40.0-libressl.patch 8790 BLAKE2B 31d9bb613f355716990b0d332b1bc601a4f29047fadd867e94b430552ae2d6654830b7383d81d34ca5ec8618028a611655f20eb32fcaf1adbc796ad10121dda5 SHA512 a6c47354094326a0c665473a563bd0c24ee74ca5206bb6fecb661723cdddbf65c2d39860efb91f401fbb4d723638dfa89cfc20fe461ef8d4beb0c233e5b4d200 DIST kdelibs4support-5.37.0.tar.xz 3339044 SHA256 09d2a7817dbfd0aec82886fb2c5a83321d8b535a438013ed78d5611d2a00e1ff SHA512 c56d821d8f6cea31df7a1138ff050818fd38764fc7bd63de1c125921b86f00144eac7d569c40b2fe0dcd8fc4f006a0ba8af93fba2feab2d4a3fca1a8a1fa3ca7 WHIRLPOOL 0a29ea6febcf441441d3c46e324dd71b5f7926b19fdcb175d360cd477e25cedbfb9e4c668d500f9d74950e4c3248d8d8476366c890f6eff62e3ccfb19e04f57d -DIST kdelibs4support-5.40.0.tar.xz 3341884 SHA256 f9d7508aa6a72a186ba7d922e82ca49a5ac5d76e1fa02af995d17208128995df SHA512 ea6758a42d993af312f0231c75b77f00c0a4938dfd8efa82d443d60e553865ed59621413a651aef1443ec1d07bcc273532b11f1699382b66c0ea91e2bfdf94d1 WHIRLPOOL 296965cafadea8f168e0b14203421195fa2903c91dc04cd0234ce777a46b69a3cffbe3068e9ca82eaa8ba9d08e8507b47e86f7960f7d5699049c891398d75d84 +DIST kdelibs4support-5.40.0.tar.xz 3341884 BLAKE2B 693816728db15b9e8d28fa2c01634083d11d4b3da942fd06606eaf7715e75ac14978bb9020df37ae154e4dddf740e0672fc90f561f2d467307a24f0362bb282a SHA512 ea6758a42d993af312f0231c75b77f00c0a4938dfd8efa82d443d60e553865ed59621413a651aef1443ec1d07bcc273532b11f1699382b66c0ea91e2bfdf94d1 EBUILD kdelibs4support-5.37.0.ebuild 2102 BLAKE2B ec47f7820192f0e141d8acb03029160a0b859896a9ef4b21e6e76975cd79fc67a53ae2701a6babd827c365b176934c81273a1471ff24e0ad15ae26f7c43b4c2e SHA512 a7615623e24a9751fb0b42cc668201745f43bece4ba677b4ec3738a1063b9d8bce1fa26cb12e90a283a899d2cba39399929a81e90e6507dbcb690286d2450172 -EBUILD kdelibs4support-5.40.0.ebuild 2104 BLAKE2B 324f743272e3e3354f0cda61cdec9a3953a7b813adea6b070c2af7d5d30b37e41e0b13b92c3e18800c880a62de69852df4abd188ebef58d2ce6b846437ae2d13 SHA512 ea08baf627fe2efe10a8a33e4c4c9c19b36ca5f7b55f248e42f8ca40f8e787df5ea12f04e8965ab3aeb552b7d58a605b229cdec8d9b5402700d9177fe492c36c +EBUILD kdelibs4support-5.40.0.ebuild 2151 BLAKE2B 0a25556032fc6005ca13cc98a6e88fb707277440bf7cf8905fc3c3258b70064a7cbaea312253889b145ec27682135207bde8815831616f8d1e13e8885fce4fe9 SHA512 64d31de6fb6ae69c09b583e3cdccac1b6f409ed3c315ce5f8b7641806aab298401794063e257fd8289d8a1187655b261c680f0f67748a175c85cdafb533e929c MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch new file mode 100644 index 000000000000..ad7cd7999672 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.40.0-libressl.patch @@ -0,0 +1,208 @@ +From 00cae452ac619810f311cf63d4dfd268887d30e5 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Sun, 5 Nov 2017 22:52:54 +0100 +Subject: Fix build with LibreSSL + +Summary: +Unfortunately LibreSSL sets OPENSSL_VERSION_NUMBER to +0x20000000L and doesn't support the OpenSSL 1.1 API. + +Test Plan: Builds with LibreSSL + +Reviewers: #frameworks + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D8672 +--- + src/kssl/kopenssl.cpp | 34 +++++++++++++++++----------------- + src/kssl/kopenssl.h | 2 +- + src/kssl/ksslcertificate.cpp | 2 +- + 3 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/kssl/kopenssl.cpp b/src/kssl/kopenssl.cpp +index c68a134..ce5f137 100644 +--- a/src/kssl/kopenssl.cpp ++++ b/src/kssl/kopenssl.cpp +@@ -81,7 +81,7 @@ extern "C" { + static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = nullptr; + static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = nullptr; + static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = nullptr; +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + static void (*K_CRYPTO_free)(void *) = nullptr; + #else + static void (*K_CRYPTO_free)(void *, const char *, int) = nullptr; +@@ -430,7 +430,7 @@ KOpenSSLProxy::KOpenSSLProxy() + K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolve("RAND_load_file"); + K_RAND_file_name = (const char *(*)(char *, size_t)) d->cryptoLib->resolve("RAND_file_name"); + K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolve("RAND_write_file"); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + K_CRYPTO_free = (void (*)(void *)) d->cryptoLib->resolve("CRYPTO_free"); + #else + K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolve("CRYPTO_free"); +@@ -485,7 +485,7 @@ KOpenSSLProxy::KOpenSSLProxy() + K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert"); + K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error"); + K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error"); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free"); + K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num"); + K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop"); +@@ -979,7 +979,7 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v) + + void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *)) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + X509_STORE_set_verify_cb_func(store, verify_cb); + #else + if (K_X509_STORE_set_verify_cb) { +@@ -1044,7 +1044,7 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a) + + void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if (psig) { + *psig = x->signature; + } +@@ -1096,7 +1096,7 @@ void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, + } + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + void KOpenSSLProxy::CRYPTO_free(void *x) + { + if (K_CRYPTO_free) { +@@ -1122,7 +1122,7 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509) + + ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return X509_get_notBefore(x); + #else + if (K_X509_getm_notBefore) { +@@ -1135,7 +1135,7 @@ ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x) + + ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return X509_get_notAfter(x); + #else + if (K_X509_getm_notAfter) { +@@ -1413,7 +1413,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) + + X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return v->current_cert; + #else + if (K_X509_STORE_CTX_get_current_cert) { +@@ -1426,7 +1426,7 @@ X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v) + + void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + v->error = error; + #else + if (K_X509_STORE_CTX_set_error) { +@@ -1437,7 +1437,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error) + + int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return v->error; + #else + if (K_X509_STORE_CTX_get_error) { +@@ -1894,7 +1894,7 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key) + + int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return pkey->type; + #else + if (K_EVP_PKEY_base_id) { +@@ -1907,7 +1907,7 @@ int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey) + + RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return pkey->pkey.rsa; + #else + if (K_EVP_PKEY_get0_RSA) { +@@ -1920,7 +1920,7 @@ RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey) + + void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if (n) { + *n = rsa->n; + } +@@ -1939,7 +1939,7 @@ void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, c + + DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + return pkey->pkey.dsa; + #else + if (K_EVP_PKEY_get0_DSA) { +@@ -1952,7 +1952,7 @@ DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey) + + void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if (p) { + *p = dsa->p; + } +@@ -1971,7 +1971,7 @@ void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, c + + void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + if (pub_key) { + *pub_key = dsa->pub_key; + } +diff --git a/src/kssl/kopenssl.h b/src/kssl/kopenssl.h +index 518cd5b..fa23efe 100644 +--- a/src/kssl/kopenssl.h ++++ b/src/kssl/kopenssl.h +@@ -395,7 +395,7 @@ public: + /* + * CRYPTO_free - free up an internally allocated object + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + void CRYPTO_free(void *x); + #else + void CRYPTO_free(void *x, const char *file, int line); +diff --git a/src/kssl/ksslcertificate.cpp b/src/kssl/ksslcertificate.cpp +index 4c96e4b..e9631fb 100644 +--- a/src/kssl/ksslcertificate.cpp ++++ b/src/kssl/ksslcertificate.cpp +@@ -1222,7 +1222,7 @@ QByteArray KSSLCertificate::toNetscape() + { + QByteArray qba; + // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all +-#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + NETSCAPE_X509 nx; + ASN1_OCTET_STRING hdr; + QTemporaryFile ktf; +-- +cgit v0.11.2 + diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild index 705c2f4ded1b..0e6ea402f0fb 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.40.0.ebuild @@ -76,6 +76,8 @@ RDEPEND="${COMMON_DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-libressl.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package X X11) diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest index 9af21aa1f36a..e189550d4537 100644 --- a/kde-frameworks/kinit/Manifest +++ b/kde-frameworks/kinit/Manifest @@ -1,5 +1,5 @@ DIST kinit-5.37.0.tar.xz 121296 SHA256 b9686968cb277a027169bc48ff37a25f44691b1d828af7cee4c6790c89f7ed2c SHA512 c12157a88eb708b5838ba381f31460f21adf190a9f1ca58f2f32824c10901f5c716a251af7a24493e0715605c6c0fc480a361bf2fd656a6f38763f0de99dc576 WHIRLPOOL 4a4a1a082d1ab97dc1910539a4e2f4b069a46fea2011d6245f90451e2c65c4ddf246ea5740521314020713a387e9c52429961c9c9425529b6dc5c4977704e835 -DIST kinit-5.40.0.tar.xz 120920 SHA256 ca97eb8480a7387537166831a6a91892068656a161b9726429af581a436e2689 SHA512 1bfa884726e4379d9e0246e283dd7867bb404416eb90226f644b46e06c4bc17c898470bddafaf9f6ba9fc6be5ea4d975cacb0e5fc5ea4d1038616e91e7ddcb07 WHIRLPOOL c854df4c36b80addb8955994828da0d0e5322840907d747ec69d7d7a552798d9024eff96472d877fd0afea2b25b23f8c6f5d6c8b070218907f54c4f165b696c0 +DIST kinit-5.40.0.tar.xz 120920 BLAKE2B 0bf69e2440a21a1c803859080825e9e25b3657c8f7114701fb62f448982da9bbd830faea8b2654e60c7a1602bc55c56dd4d25a10179408a01a46694c09198e46 SHA512 1bfa884726e4379d9e0246e283dd7867bb404416eb90226f644b46e06c4bc17c898470bddafaf9f6ba9fc6be5ea4d975cacb0e5fc5ea4d1038616e91e7ddcb07 EBUILD kinit-5.37.0.ebuild 879 BLAKE2B ef396b6c58030ce540a2c839df4a3f21316f87c807dc4ca3ba650d62497d214f3035df7839f7d8d8fea3cffd77978168755c3341eb26f1f75365c3daf0ed5978 SHA512 4e5303b713fed172337f93c6ced3826be8805e66d612e98488eefda2ae9043301f6214d83702cf49a4423fcbd3bec6cce623439cec92c2b25564b7a54eb5ff44 -EBUILD kinit-5.40.0.ebuild 900 BLAKE2B 56b799ac22d53cc2916c06fc332b6c913eed53a8c07d93081e5e864ad70e7779c36949611b4d23f7ded7f9afb3db0676d01b5b3d317ff9124b8be7f2e8df3bb2 SHA512 303de026cf90249af559d5dc992d05d1210cbfd12878cef681ee34af256f895c40a764fd485d7062de91edf659dff397e7289d671a0d61934cd1bcbac2fef47c +EBUILD kinit-5.40.0.ebuild 1000 BLAKE2B 5f1f97124a9d6d0febd7a20c41db8eaa5bd81d4f8976acca2c493e94b25363ef695728e6022213e312d8d1aad7a0a2c64b9326814347dcfad4ca4d5c7a222787 SHA512 58d88996b4af050ea968198a42c87057306abec524c0a47be12adec2bf7d6dd3013ea4846206970534f3b14eca8c08728b2873bd8e012b6a9ca1267ef1ced282 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a diff --git a/kde-frameworks/kinit/kinit-5.40.0.ebuild b/kde-frameworks/kinit/kinit-5.40.0.ebuild index 16d82b94ed5c..e0ded3c2fe5c 100644 --- a/kde-frameworks/kinit/kinit-5.40.0.ebuild +++ b/kde-frameworks/kinit/kinit-5.40.0.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Helper library to speed up start of applications on KDE work spaces" LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="+caps +man" +IUSE="+caps +man X" RDEPEND=" $(add_frameworks_dep kconfig) @@ -22,19 +22,23 @@ RDEPEND=" $(add_frameworks_dep kwindowsystem) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) - x11-libs/libX11 - x11-libs/libxcb caps? ( sys-libs/libcap ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + ) " DEPEND="${RDEPEND} man? ( $(add_frameworks_dep kdoctools) ) - x11-proto/xproto + X? ( x11-proto/xproto ) " src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package caps Libcap) $(cmake-utils_use_find_package man KF5DocTools) + $(cmake-utils_use_find_package X X11) + $(cmake-utils_use_find_package X XCB) ) kde5_src_configure 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" |