summaryrefslogtreecommitdiff
path: root/kde-frameworks
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
commite748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /kde-frameworks
parent908778078736bd36f7a60a2d576d415cb8e000fa (diff)
gentoo resync : 31.05.2021
Diffstat (limited to 'kde-frameworks')
-rw-r--r--kde-frameworks/Manifest.gzbin13526 -> 13538 bytes
-rw-r--r--kde-frameworks/kglobalaccel/Manifest3
-rw-r--r--kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch242
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild (renamed from kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild)4
-rw-r--r--kde-frameworks/kio/Manifest4
-rw-r--r--kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch28
-rw-r--r--kde-frameworks/kio/kio-5.82.0-r2.ebuild (renamed from kde-frameworks/kio/kio-5.82.0-r1.ebuild)1
-rw-r--r--kde-frameworks/kio/kio-5.82.0.ebuild108
8 files changed, 279 insertions, 111 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index c1cc9f37777a..226f6cac9eec 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
Binary files differ
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index a9ed5eb7b830..418d40cfebaa 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,6 +1,7 @@
AUX kglobalaccel-5.80.0-dont-run-w-root-privs.patch 1383 BLAKE2B 77925b30b0360ced4a2e31c5ab7529604e8d0e11f50bdc1f78c6b808796a3cc9b021ff17da429026e943319ba8ebd0041de4c60e88bd141f17fca7248950a62f SHA512 91a982bbc2b99569b03161e78b53b3fc6bcb7c03e3c69abac4d9a5917e4b5d0766d9289766d00efcd3c9df24016509c389fcea78a9efba190da8eb3e3bc06870
+AUX kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch 7552 BLAKE2B 37de1efd65119ca8df9147a5f52da98711102215a381c9bbf9c8796558ceafab8309225281ace5ec4dd59692a37e11a051f0bc1ff0755ba8a81705f7e4a634d7 SHA512 2c8e910240c3405da9bdc5962fcb3cc2db5a9b5a61f6155d8b2673ec30c957d00819f661e605fba3c2e14734e944c766376df6cb3c3e8708b62d5b64672f3007
DIST kglobalaccel-5.80.0.tar.xz 87360 BLAKE2B f05027f4aeb71ba17b42bfe3214222737df4689e72e7eaa2e848d891e4934acead92051a21ce49313513050d4e3b01148576ca0ab58c609670fc88e7bedc15cb SHA512 6e12d3926f1b44425747bfca3eea21986cfe57ce032a2f691a2ab6b12556feec15cceea4b2b6c21bbdc9ecb6af11e9fb64489d60d9e95f4443b0a74ebab551af
DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
EBUILD kglobalaccel-5.80.0-r1.ebuild 855 BLAKE2B 8772c8ecb5ab37f6d51417f8722e6186e97a086cbb4ffb29db568d06516508acc16e62571a25f8d65bf0966ebe52d02c995539453e383a31c1b06cc0c064da8b SHA512 13c333282bb973e21a7cc381bf593c8beebd746870fc4c641b088bc2f4daa3e24a523999d4742ba66fa13c9919cc24e1103ffe1457745876a0a6f10ec279db68
-EBUILD kglobalaccel-5.82.0.ebuild 835 BLAKE2B 5f93998aa4ed4dd1dc96b9ad0c8f115efa8891dd68624d412987111dbf1f362638c5d7fd6f1082c5278a723f5c858864478ccca60bffe64334da0013577b6800 SHA512 a3b4887bd7292d887809cf101002da27274388e068471eba66f8e464fad18fb2512cfd00f6be713fb57e86ca4a76fa3da0e81b95de8e3a66df6f5d61358b9a49
+EBUILD kglobalaccel-5.82.0-r1.ebuild 926 BLAKE2B 71c1e4f00a7aa6d1e4a12ad841dd4baad6546f4a6b8860649a5afd5201efa3305a28b5d28a2d36db61b2e7147519d071faea19f1766e30738dc40cce13f4f954 SHA512 9cef7f7825749d3bee612a5427e0c7bc0c11326ec1de4c813c993c60894fa6fc493e1dc2e11243241c470cb280f01092b77eca15d8dd335a29a1f61b2a1be41d
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch
new file mode 100644
index 000000000000..1cea821ebe96
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch
@@ -0,0 +1,242 @@
+From 9a48818abf50340e31d718cc675501dec6c51429 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Wed, 26 May 2021 13:14:13 -0600
+Subject: [PATCH] Revert "Prevent kglobalaccel5 getting activated on non-Plasma
+ systems"
+
+This reverts commit 48c3376927e5e9c13377bf3cfc8b0c411783e7f3.
+
+This change broke users of KGlobalAccel run outside of the Plasma
+Desktop. This sort of behavior change probably needs to be made during
+a major transition like KF6 so that developers have some notice and it
+doesn't randomly change and break stuff unexpectedly.
+
+CCBUG: 435420
+BUG: 437034
+FIXED-IN: 5.83
+---
+ src/kglobalaccel.cpp | 80 --------------------------------------------
+ 1 file changed, 80 deletions(-)
+
+diff --git a/src/kglobalaccel.cpp b/src/kglobalaccel.cpp
+index 8bb43e5..154caed 100644
+--- a/src/kglobalaccel.cpp
++++ b/src/kglobalaccel.cpp
+@@ -25,11 +25,6 @@
+ #include <QX11Info>
+ #endif
+
+-bool active()
+-{
+- return qgetenv("XDG_CURRENT_DESKTOP") == QByteArrayLiteral("KDE");
+-}
+-
+ org::kde::kglobalaccel::Component *KGlobalAccelPrivate::getComponent(const QString &componentUnique, bool remember = false)
+ {
+ // Check if we already have this component
+@@ -148,11 +143,6 @@ KGlobalAccel::~KGlobalAccel()
+ void KGlobalAccel::activateGlobalShortcutContext(const QString &contextUnique, const QString &contextFriendly, const QString &programName)
+ {
+ Q_UNUSED(contextFriendly);
+-
+- if (!active()) {
+- return;
+- }
+-
+ // TODO: provide contextFriendly
+ self()->d->iface()->activateGlobalShortcutContext(programName, contextUnique);
+ }
+@@ -160,10 +150,6 @@ void KGlobalAccel::activateGlobalShortcutContext(const QString &contextUnique, c
+ // static
+ bool KGlobalAccel::cleanComponent(const QString &componentUnique)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique);
+ if (!component) {
+ return false;
+@@ -175,10 +161,6 @@ bool KGlobalAccel::cleanComponent(const QString &componentUnique)
+ // static
+ bool KGlobalAccel::isComponentActive(const QString &componentUnique)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ org::kde::kglobalaccel::Component *component = self()->getComponent(componentUnique);
+ if (!component) {
+ return false;
+@@ -196,10 +178,6 @@ bool KGlobalAccel::isEnabled() const
+
+ org::kde::kglobalaccel::Component *KGlobalAccel::getComponent(const QString &componentUnique)
+ {
+- if (!active()) {
+- return nullptr;
+- }
+-
+ return d->getComponent(componentUnique);
+ }
+
+@@ -526,10 +504,6 @@ void KGlobalAccelPrivate::reRegisterAll()
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ QList<QStringList> KGlobalAccel::allMainComponents()
+ {
+- if (!active()) {
+- return {};
+- }
+-
+ return d->iface()->allMainComponents();
+ }
+ #endif
+@@ -537,9 +511,6 @@ QList<QStringList> KGlobalAccel::allMainComponents()
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actionId)
+ {
+- if (!active()) {
+- return {};
+- }
+ return d->iface()->allActionsForComponent(actionId);
+ }
+ #endif
+@@ -548,29 +519,17 @@ QList<QStringList> KGlobalAccel::allActionsForComponent(const QStringList &actio
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ QStringList KGlobalAccel::findActionNameSystemwide(const QKeySequence &seq)
+ {
+- if (!active()) {
+- return {};
+- }
+-
+ return self()->d->iface()->action(seq[0]);
+ }
+ #endif
+
+ QList<KGlobalShortcutInfo> KGlobalAccel::getGlobalShortcutsByKey(const QKeySequence &seq)
+ {
+- if (!active()) {
+- return {};
+- }
+-
+ return self()->d->iface()->getGlobalShortcutsByKey(seq[0]);
+ }
+
+ bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QString &comp)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ return self()->d->iface()->isGlobalShortcutAvailable(seq[0], comp);
+ }
+
+@@ -578,10 +537,6 @@ bool KGlobalAccel::isGlobalShortcutAvailable(const QKeySequence &seq, const QStr
+ #if KGLOBALACCEL_BUILD_DEPRECATED_SINCE(4, 2)
+ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringList &actionIdentifier, const QKeySequence &seq)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ if (actionIdentifier.size() < 4) {
+ return false;
+ }
+@@ -604,10 +559,6 @@ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QStringL
+ // static
+ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList<KGlobalShortcutInfo> &shortcuts, const QKeySequence &seq)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ if (shortcuts.isEmpty()) {
+ // Usage error. Just say no
+ return false;
+@@ -640,10 +591,6 @@ bool KGlobalAccel::promptStealShortcutSystemwide(QWidget *parent, const QList<KG
+ // static
+ void KGlobalAccel::stealShortcutSystemwide(const QKeySequence &seq)
+ {
+- if (!active()) {
+- return;
+- }
+-
+ // get the shortcut, remove seq, and set the new shortcut
+ const QStringList actionId = self()->d->iface()->action(seq[0]);
+ if (actionId.size() < 4) { // not a global shortcut
+@@ -676,10 +623,6 @@ bool checkGarbageKeycode(const QList<QKeySequence> &shortcut)
+
+ bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ if (checkGarbageKeycode(shortcut)) {
+ return false;
+ }
+@@ -695,10 +638,6 @@ bool KGlobalAccel::setDefaultShortcut(QAction *action, const QList<QKeySequence>
+
+ bool KGlobalAccel::setShortcut(QAction *action, const QList<QKeySequence> &shortcut, GlobalShortcutLoading loadFlag)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ if (checkGarbageKeycode(shortcut)) {
+ return false;
+ }
+@@ -724,9 +663,6 @@ QList<QKeySequence> KGlobalAccel::shortcut(const QAction *action) const
+
+ QList<QKeySequence> KGlobalAccel::globalShortcut(const QString &componentName, const QString &actionId) const
+ {
+- if (!active()) {
+- return {};
+- }
+ // see also d->updateGlobalShortcut(action, KGlobalAccelPrivate::ActiveShortcut, KGlobalAccel::Autoloading);
+
+ // how componentName and actionId map to QAction, e.g:
+@@ -740,19 +676,11 @@ QList<QKeySequence> KGlobalAccel::globalShortcut(const QString &componentName, c
+
+ void KGlobalAccel::removeAllShortcuts(QAction *action)
+ {
+- if (!active()) {
+- return;
+- }
+-
+ d->remove(action, KGlobalAccelPrivate::UnRegister);
+ }
+
+ bool KGlobalAccel::hasShortcut(const QAction *action) const
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ return d->actionShortcuts.contains(action) || d->actionDefaultShortcuts.contains(action);
+ }
+
+@@ -765,10 +693,6 @@ bool KGlobalAccel::eventFilter(QObject *watched, QEvent *event)
+
+ bool KGlobalAccel::setGlobalShortcut(QAction *action, const QList<QKeySequence> &shortcut)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ KGlobalAccel *g = KGlobalAccel::self();
+ return g->d->setShortcutWithDefault(action, shortcut, Autoloading);
+ }
+@@ -780,10 +704,6 @@ bool KGlobalAccel::setGlobalShortcut(QAction *action, const QKeySequence &shortc
+
+ bool KGlobalAccelPrivate::setShortcutWithDefault(QAction *action, const QList<QKeySequence> &shortcut, KGlobalAccel::GlobalShortcutLoading loadFlag)
+ {
+- if (!active()) {
+- return false;
+- }
+-
+ if (checkGarbageKeycode(shortcut)) {
+ return false;
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
index c07636e53c53..a8a3e30dd7ed 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
@@ -30,6 +30,10 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
+PATCHES=(
+ "${FILESDIR}"/${P}-revert-prevent-activate-w-o-plasma.patch # KDE-bug 437034
+)
+
src_test() {
XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 4eccbe863665..c2805aa90502 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -7,11 +7,11 @@ AUX kio-5.82.0-MimeTypeFinderJob-memleak-1.patch 2892 BLAKE2B b099cb4ce322c47d9e
AUX kio-5.82.0-MimeTypeFinderJob-memleak-2.patch 2478 BLAKE2B 51971136c6131a768f716f808278c2019237e42660f8d9c700a6a8cda45a6e9f9e95662317463ebb6026cf314b76658c230dd9b61240de8d6ad171bd3fd3a434 SHA512 fb40aa6a56ef7269645ac957aabb48ea277a5a4abcdf6905dd66cf1b9ecd0bcfcdfc91a0cfa9d1f4ebae563fb7df33c6085747b1f8a5dac66fb538fc2b39aef5
AUX kio-5.82.0-MimeTypeFinderJob-memleak-3.patch 2179 BLAKE2B b32879d9ef0b88c3a2241eb1da21d7f390c3c2fb7c7fb8a5e6e812c60b50b5798f296e79c451f380c77b5d873909e3c8d5fb1661dae51fe753b5f7170e8a7236 SHA512 639635f6aa6acad149c90a3d277d142cf78fa28c59cd86ad56e11e825ee9938a05cfe151fff34164d81d15f3fcb41c2fb255cf706f9d0009c4b3afca4710d213
AUX kio-5.82.0-MimeTypeFinderJob-memleak-4.patch 2467 BLAKE2B e32cf57531afd4532a7edccb48e185519ffba23e2e30877de2954730e8bc74b5569317d5d8eb7083b4f532aa2f7a49637c556f2ff136b41d03ef055cbbd0d6c6 SHA512 10559a3fb0b09901008d8eef7d494efc82e134701084bb30b62389e9255efc9821d9e30c408fa697995f04ad88caac0843803a33fbb2001d172e5f9b615e97c9
+AUX kio-5.82.0-fix-filenamesearch-crashes.patch 1046 BLAKE2B 3024bc3b143b1e5f261097ad47bf7c12ea54bdefba32faff9040a0128dd837453324f3b5b2cd2926b8f5ec2b899ff91daf4cbb3ae5c53cb401af88d78ff1fc01 SHA512 ae4ee91602dd0a7b54e9081db61056c775c2998542c326716fce4f8027173bb9893350a29b8d38ecb9e0a3194a314f6de97dc6a4e27a703c89cf77ee00d2f7f0
AUX kio-5.82.0-no-cache-kcm.patch 2801 BLAKE2B 6779c2d1e77aff1e530beeb002b9aa7a993b365d8bdb22b7f77532038314cae62a237666b6d033a92f1219761f845c678b8367d86a757e5fc499165455f6345e SHA512 422ac748100d1e227ffc29da898437e4c4142b4c7f85ce46239ac6c76ae8feffe048fa1a44f3484b5859eb37baa3be96047652016c96c10b5fa2a262ce85b51a
AUX kio-5.82.0-no-useragent-kcm.patch 3751 BLAKE2B 09ea333db392f0b35a531ff6921f4d9b0f8059ecc3bf48c8229c39815c49b4e6cbd6516fb2f99489ac468c33317260bb714915e971884d93dfa8b6284ba96039 SHA512 3641673476efab1c8e69408bc8472b1c6490209805d4039776ba397c39c98b59feed28cce9c03c55a8f87379d351cb87358773695dcdb5398aadb5cc1b89c4a4
DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213
DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
EBUILD kio-5.80.1-r2.ebuild 2614 BLAKE2B 4ef207fb64570f85403458b350e7ceb31fefe8d0f22dc09ee567e97c2bc3a1c0ac0c13b1050b2ab949b1b2036bbacdce0ad1050477c202799043720dff8fea96 SHA512 533a59b34d618f3ebff2a12de264c1bf2734b5f3149cc787bc3fc950b2af659422153db77883c381a6aa782e0819399d88b8641769766c747d1c46c8dc91267e
-EBUILD kio-5.82.0-r1.ebuild 2866 BLAKE2B 710b1f44ce0a8b367648493e77a238e17408ed91fda22c4ab16ffe4a9f1dc25433f7a0a264b1a7f934c419bc09e524529ebb1cfe691c616c481ec91e41a09657 SHA512 6fbe5b5f3c11dc7ab95165fd6631c77c54193083ff75fe7404aebeff4b186d5a2bafdad3833a1664ed645487fc22b96dee421a0244f4e34e264a8160cd0e4e1e
-EBUILD kio-5.82.0.ebuild 2749 BLAKE2B dcb50ccc4b3d9ccdeaec792f4686e243b0f401953feac932260520a41451f3d2f9fb2055943f1b2703008951a737ed3249b64460747b2665b87148996e2cf2be SHA512 d409c142979d4ad96fa6e70219c65e4bbb1cf078fe15f0c6b0d996e0bf4225624bfab4f051ee7ea1fa771a2683957a5db34e8e1f72fe5e8793e04cba4e3bd5c6
+EBUILD kio-5.82.0-r2.ebuild 2936 BLAKE2B e8e993531ff2e384c869c484907601e8daf7d11f0fb98d1f1da042dd069159d0980fc3ce396d3beca90424cad07fc9fcff770a33fffd0941a4b3b6592c35a8a0 SHA512 145cf889944de5bd82592301ccd6541c9085c0451780e24df223b89825b97c2661f10ce203015f6d0a52ba0719c99d19df5b45717f018758ef07f987773d14eb
MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
new file mode 100644
index 000000000000..b92139a51871
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
@@ -0,0 +1,28 @@
+From a38fcf356de0cbba1ce97c8ef70979ed897a8094 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Tue, 18 May 2021 19:54:54 +0200
+Subject: [PATCH] [KCoreDirLister] Guard uiDelegate(), it might be null
+
+BUG: 437153
+---
+ src/core/kcoredirlister.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/kcoredirlister.cpp b/src/core/kcoredirlister.cpp
+index a836f0aa..58d8791c 100644
+--- a/src/core/kcoredirlister.cpp
++++ b/src/core/kcoredirlister.cpp
+@@ -1288,7 +1288,9 @@ void KCoreDirListerCache::slotResult(KJob *j)
+ Q_EMIT kdl->jobError(job);
+ if (kdl->d->m_autoErrorHandling && !errorShown) {
+ errorShown = true; // do it only once
+- job->uiDelegate()->showErrorMessage();
++ if (job->uiDelegate()) {
++ job->uiDelegate()->showErrorMessage();
++ }
+ }
+ #if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82)
+ kdl->handleError(job);
+--
+2.31.1
+
diff --git a/kde-frameworks/kio/kio-5.82.0-r1.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
index 297ae2bbe4af..79d4c76e5a5f 100644
--- a/kde-frameworks/kio/kio-5.82.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
# upstream backport request - see also KDE-bug 398908
"${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch
+ "${FILESDIR}"/${P}-fix-filenamesearch-crashes.patch # KDE-bug 437153
# git master/KIO 5.83:
"${FILESDIR}"/${P}-no-useragent-kcm.patch
"${FILESDIR}"/${P}-no-cache-kcm.patch
diff --git a/kde-frameworks/kio/kio-5.82.0.ebuild b/kde-frameworks/kio/kio-5.82.0.ebuild
deleted file mode 100644
index 4f99cc9cee3d..000000000000
--- a/kde-frameworks/kio/kio-5.82.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT+=" test"
-
-RDEPEND="
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kauth-${PVCUT}*:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kbookmarks-${PVCUT}*:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kcompletion-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kcrash-${PVCUT}*:5
- =kde-frameworks/kdbusaddons-${PVCUT}*:5
- =kde-frameworks/kguiaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5
- =kde-frameworks/kservice-${PVCUT}*:5
- =kde-frameworks/ktextwidgets-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
- =kde-frameworks/solid-${PVCUT}*:5
- acl? (
- sys-apps/attr
- virtual/acl
- )
- handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
- kerberos? ( virtual/krb5 )
- kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
- X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
- test? ( sys-libs/zlib )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- )
-"
-PDEPEND="
- >=kde-frameworks/kded-${PVCUT}:5
-"
-
-PATCHES=(
- # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
- "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
- # git master/KIO 5.83:
- "${FILESDIR}"/${P}-no-useragent-kcm.patch
- "${FILESDIR}"/${P}-no-cache-kcm.patch
-)
-
-src_prepare() {
- ecm_src_prepare
- rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(cmake_use_find_package kerberos GSSAPI)
- $(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}