gentoo resync : 15.06.2021

7 files changed, 8 insertions, 209 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c2805aa90502..9e5f415ff1d5 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,3 @@
-AUX kio-5.80.1-MimeTypeFinderJob-file.so.patch 970 BLAKE2B cd73c817449e154d3dc711a1e4ee69b10b433ad37d57a685113d51fb0dad1a4f5019b5f9887bbcb0c157cdaf9a8e1be08305c9fe19ef8acbf39e954465af682f SHA512 a142b9140d2f694336b64d5f333b1f3bf83f913c441eebdec74d79236ab7aa131ae4437b0bab08ac9d6497c42d3513a5a40d2bb76db41254d1a2697d109672d1
-AUX kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch 4334 BLAKE2B d3895b59787a97f46dc8868555eb00043679f75014b1c01d9ba6b853225e17517e74fc2ab0865a8a76d882ab4d2bb566dffe47f1153efccb43d3c2bdca228f2b SHA512 433a06c038d9b965c8d12f485aa353b64aed72b839a80ca8c1243bf9a4d251fd930223a4d6a94b840ed5c33f303b14595cab19ed877e8a942f58ca47f5f2ea87
-AUX kio-5.80.1-fix-create-files-on-ftp.patch 1096 BLAKE2B 9e577af9aeec00d3c95ea1e39df1d06b3e8d548f630a4597041776d6b2b01faf72b32e8492dfcd493ae75f2038aa107369dc1cfc734235d1efb5ac72bbb09f53 SHA512 5d0838e0afb506dda607ab70d245de67459027458cb493e4cb4a9f395df8fa56c489f4ffe1663b44b1deb1003fbfcdd9767d233700070cf3fe94f0773a9907c0
-AUX kio-5.80.1-gcc11-include-order.patch 944 BLAKE2B a95cd2765a528e5d3d11e84cf935271c61e837d22f8d1344a78f5f09889b9a6947c9180854bb1dbdcec857b7b1210a4f4ad46d1de79df0acf4a539fa09380c0d SHA512 73ee379c8acc25ab4a9dc2fbc09ba5a012bc76e67453ca96faa415b0e0688c76ea786785d0caeb75bb167ebd22e50ee778eb8cc024892bb9ac36270115ea5e3a
 AUX kio-5.81.0-fix-qtconcurrent-private-link.patch 1544 BLAKE2B f2e24a00addd20b60f93ee85ab8dab532b95c7dbfe85ba411ad83ff59ccb563e63560b557e33caafac3a385ac3d640bbabb801481ac709b06784c8d6d4a3326c SHA512 afc541a93607ad4e3544bb06631fbba4770d1e3a2d67ece951479dcf6e8bc8c8e12bb44ff79ddf491b526a98e74f350cfce6358da073310122ecd809e56d047c
 AUX kio-5.82.0-MimeTypeFinderJob-memleak-1.patch 2892 BLAKE2B b099cb4ce322c47d9e82c2e0ff9ca9b088a24caf919d22cafc1c1f766f5542fc71c313770e8342909136a9835e58126c8b8f1fca5cd2ffeb9e2deb0b93d5c04b SHA512 136085cf6abc6fb51b6ab3551dab339f97b18b77f51e8174e3a79358d3dd487b1f6306a774cfacafd84917f0ebfebc96d8d3eade2607d870d5791830f3b19a69
 AUX kio-5.82.0-MimeTypeFinderJob-memleak-2.patch 2478 BLAKE2B 51971136c6131a768f716f808278c2019237e42660f8d9c700a6a8cda45a6e9f9e95662317463ebb6026cf314b76658c230dd9b61240de8d6ad171bd3fd3a434 SHA512 fb40aa6a56ef7269645ac957aabb48ea277a5a4abcdf6905dd66cf1b9ecd0bcfcdfc91a0cfa9d1f4ebae563fb7df33c6085747b1f8a5dac66fb538fc2b39aef5
@@ -10,8 +6,8 @@ AUX kio-5.82.0-MimeTypeFinderJob-memleak-4.patch 2467 BLAKE2B e32cf57531afd4532a
 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-r2.ebuild 2936 BLAKE2B e8e993531ff2e384c869c484907601e8daf7d11f0fb98d1f1da042dd069159d0980fc3ce396d3beca90424cad07fc9fcff770a33fffd0941a4b3b6592c35a8a0 SHA512 145cf889944de5bd82592301ccd6541c9085c0451780e24df223b89825b97c2661f10ce203015f6d0a52ba0719c99d19df5b45717f018758ef07f987773d14eb
+DIST kio-5.83.0.tar.xz 3187064 BLAKE2B 2a11566cae3bbe48d57ffc188d6ccd9b98796139fc34c6e68535e7c126e376874364f9d338ebc92f5996e9c32318ba69a2c8743b87183f775ec4c1309813c862 SHA512 0b2b9effdf8ceef148176852428256dcdfb49dcb256478f2400130b2bcf091a2a2e4f54a5baeb38c7c74b83d7560fc4e699fd3d8c476c530ae6828e0eef0bfb0
+EBUILD kio-5.82.0-r2.ebuild 2933 BLAKE2B 0a5403e19ca99bfd4aca781fe39db28da02d1cd83717aebed1ca51d245ac49e57ee0fa4ca60c98ee675b331ef7947a2768728dfe6e5a5bc78c27a52a0b07d58b SHA512 e7172bcc1813bca6f08486db2af8dd33a3de5ebb2dd46ccaf137c74b34a4ab74237cc1dd7a13aa732667353f70020aa1b8a6977318537a08901849edb165bea3
+EBUILD kio-5.83.0.ebuild 2535 BLAKE2B 8b33c4923592ef379ca9f77bc6ea29c3d99aab924639f2c7f48bea35210c23685fa2cbe2ab8bc99909f9491eb0978cb3ff6fcadd2a47e21b9496254168c85c2d SHA512 5973eef46e6c54fa14e222a2b642c2fc6b1929272d1b1fa7c8165a34c5c2def28dd04a7f3ab2b5a5f8a34f2bca76a52085d502f696ea2d95e6e15f47749fc872
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch b/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch
deleted file mode 100644
index a25898fb88b5..000000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 23 Mar 2021 00:29:31 +0100
-Subject: [PATCH] MimeTypeFinderJob: don't put job on hold for local files
-
-Fixes: 434455
----
- src/core/mimetypefinderjob.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
-index 147f3aa9a..f5e50cdc4 100644
---- a/src/core/mimetypefinderjob.cpp
-+++ b/src/core/mimetypefinderjob.cpp
-@@ -241,8 +241,10 @@ void KIO::MimeTypeFinderJobPrivate::scanFileWithGet()
-             m_suggestedFileName = job->queryMetaData(QStringLiteral("content-disposition-filename"));
-         }
- 
--        job->putOnHold();
--        KIO::Scheduler::publishSlaveOnHold();
-+        if (!m_url.isLocalFile()) { // #434455
-+            job->putOnHold();
-+            KIO::Scheduler::publishSlaveOnHold();
-+        }
-         q->emitResult();
-     });
- }
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch
deleted file mode 100644
index 059c9f824241..000000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From a68cb73c4e071ed24b18a95e11fbbbc8d59840b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@gmail.com>
-Date: Sun, 21 Mar 2021 05:22:57 +0100
-Subject: [PATCH] PreviewJob: Initialize cachesSize with 0, only pass size > 0
- to shmget, improve createThumbnail
-
-BUG: 430862
----
- src/widgets/previewjob.cpp | 48 +++++++++++++++++++++++---------------
- 1 file changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
-index 988da16b0..9b6e661e8 100644
---- a/src/widgets/previewjob.cpp
-+++ b/src/widgets/previewjob.cpp
-@@ -70,7 +70,7 @@ public:
-         : initialItems(items)
-         , width(size.width())
-         , height(size.height())
--        , cacheSize(-1)
-+        , cacheSize(0)
-         , bScale(true)
-         , bSave(true)
-         , ignoreMaximumSize(false)
-@@ -114,8 +114,8 @@ public:
-     // Size of thumbnail
-     int width;
-     int height;
--    // Unscaled size of thumbnail (128 or 256 if cache is enabled)
--    int cacheSize;
-+    // Unscaled size of thumbnail (128, 256 or 512 if cache is enabled)
-+    ushort cacheSize;
-     // Whether the thumbnail should be scaled
-     bool bScale;
-     // Whether we should save the thumbnail
-@@ -712,39 +712,49 @@ void PreviewJobPrivate::createThumbnail(const QString &pixPath)
-     });
- 
-     bool save = bSave && currentItem.plugin->property(QStringLiteral("CacheThumbnail")).toBool() && !sequenceIndex;
-+    int thumb_width = width;
-+    int thumb_height = height;
-+    int thumb_iconSize = iconSize;
-+    if (save) {
-+        thumb_width = thumb_height = cacheSize;
-+        thumb_iconSize = 64;
-+    }
-+
-     job->addMetaData(QStringLiteral("mimeType"), currentItem.item.mimetype());
--    job->addMetaData(QStringLiteral("width"), QString().setNum(save ? cacheSize : width));
--    job->addMetaData(QStringLiteral("height"), QString().setNum(save ? cacheSize : height));
--    job->addMetaData(QStringLiteral("iconSize"), QString().setNum(save ? 64 : iconSize));
--    job->addMetaData(QStringLiteral("iconAlpha"), QString().setNum(iconAlpha));
-+    job->addMetaData(QStringLiteral("width"), QString::number(thumb_width));
-+    job->addMetaData(QStringLiteral("height"), QString::number(thumb_height));
-+    job->addMetaData(QStringLiteral("iconSize"), QString::number(thumb_iconSize));
-+    job->addMetaData(QStringLiteral("iconAlpha"), QString::number(iconAlpha));
-     job->addMetaData(QStringLiteral("plugin"), currentItem.plugin->library());
-     job->addMetaData(QStringLiteral("enabledPlugins"), enabledPlugins.join(QLatin1Char(',')));
-     job->addMetaData(QStringLiteral("devicePixelRatio"), QString::number(devicePixelRatio));
-     if (sequenceIndex) {
--        job->addMetaData(QStringLiteral("sequence-index"), QString().setNum(sequenceIndex));
-+        job->addMetaData(QStringLiteral("sequence-index"), QString::number(sequenceIndex));
-     }
- 
- #if WITH_SHM
-     if (shmid == -1) {
-         if (shmaddr) {
-+            // clean previous shared memory segment
-             shmdt((char *)shmaddr);
-             shmctl(shmid, IPC_RMID, nullptr);
-+            shmaddr = nullptr;
-         }
--        auto size = std::max(cacheSize * cacheSize, width * height);
--        shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600);
--        if (shmid != -1) {
--            shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY));
--            if (shmaddr == (uchar *)-1) {
--                shmctl(shmid, IPC_RMID, nullptr);
--                shmaddr = nullptr;
--                shmid = -1;
-+        auto size = thumb_width * thumb_height;
-+        if (size > 0) {
-+            shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600);
-+            if (shmid != -1) {
-+                shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY));
-+                if (shmaddr == (uchar *)-1) {
-+                    shmctl(shmid, IPC_RMID, nullptr);
-+                    shmaddr = nullptr;
-+                    shmid = -1;
-+                }
-             }
--        } else {
--            shmaddr = nullptr;
-         }
-     }
-     if (shmid != -1) {
--        job->addMetaData(QStringLiteral("shmid"), QString().setNum(shmid));
-+        job->addMetaData(QStringLiteral("shmid"), QString::number(shmid));
-     }
- #endif
- }
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch
deleted file mode 100644
index cece00965294..000000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 71c7420e4b33b4bace8ed6d4fa45fa5e281d38bd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car@enioka.com>
-Date: Sat, 27 Mar 2021 11:00:07 +0100
-Subject: [PATCH] KNewFileMenu: use destination side to stat destination
-
-BUG: 429541
----
- src/filewidgets/knewfilemenu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/filewidgets/knewfilemenu.cpp b/src/filewidgets/knewfilemenu.cpp
-index 64c4b1c2e..48fdf8622 100644
---- a/src/filewidgets/knewfilemenu.cpp
-+++ b/src/filewidgets/knewfilemenu.cpp
-@@ -1242,7 +1242,7 @@ void KNewFileMenuPrivate::_k_slotTextChanged(const QString &text)
-         } else {
-             url = QUrl(m_baseUrl.toString() + QLatin1Char('/') + text);
-         }
--        KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::SourceSide, KIO::StatDetail::StatBasic);
-+        KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::DestinationSide, KIO::StatDetail::StatBasic);
-         QObject::connect(job, &KJob::result, q, [this](KJob *job) {
-             _k_slotStatResult(job);
-         });
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
deleted file mode 100644
index e3675ce02345..000000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 493188b3d616f3223ccf3a41327a4c7e69282df8 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Mon, 15 Mar 2021 14:29:42 +0200
-Subject: [PATCH] Fix #include's order
-
-According to[1] <limits> needs to be included first when building with
-GCC 11.
-
-[1] https://invent.kde.org/frameworks/kio/-/issues/3
-
-GIT_SILENT
----
- src/kntlm/des.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
-index d90e6d21a..78c7a3fd2 100644
---- a/src/kntlm/des.cpp
-+++ b/src/kntlm/des.cpp
-@@ -26,11 +26,11 @@
- 
- #include "des.h"
- 
-+#include <limits> // This needs to be first with GCC 11
-+
- #include <qendian.h>
- #include <string.h>
- 
--#include <limits>
--
- static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
- static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
- static void perminit_ip(DES_KEY *key);
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
index 79d4c76e5a5f..74aef058f24f 100644
--- a/kde-frameworks/kio/kio-5.82.0-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
diff --git a/kde-frameworks/kio/kio-5.80.1-r2.ebuild b/kde-frameworks/kio/kio-5.83.0.ebuild
index ca570e4df59f..154cff27d395 100644
--- a/kde-frameworks/kio/kio-5.80.1-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.83.0.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
@@ -38,6 +38,7 @@ RDEPEND="
 	=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
@@ -72,10 +73,8 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-MimeTypeFinderJob-file.so.patch # KDE-Bug 434455
-	"${FILESDIR}"/${P}-gcc11-include-order.patch # bug 766480
-	"${FILESDIR}"/${P}-fix-create-files-on-ftp.patch # KDE-Bug 429541
-	"${FILESDIR}"/${P}-fix-crash-in-ThumbnailProtocol.patch # KDE-Bug 430862
+	# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
+	"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
 )
 
 src_configure() {