3 files changed, 7 insertions, 54 deletions
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index a900439988fb..dbc0393687f7 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,6 +1,5 @@
-AUX kio-extras-20.12.3-thumbnail-check-shm-size.patch 1945 BLAKE2B 07318d918a264d62023d7058e718b2a30ec3e8f937a2f7b278ca1c0200485b843249ea0a26eed8f785a544bed5a021e3c5fbaa72030dc65dadcd0cd5b9bc2de6 SHA512 dc7183cfda0fbad5e3d9ddd5a1535e261f8137b313e8485badac4c5a3b1a4af20b7b6b468f0d5864045bc753b171f899a8c70c2b20dad25655dee6c19c34a785
-DIST kio-extras-20.12.3.tar.xz 636012 BLAKE2B c5145871443ab7bfb562ac935462eb5dfdeb7caab63c123c53a929af9d41f3780bf03ac9f16153434854f785122455e1767573ce84b88bef196a01c62fc2e609 SHA512 a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
 DIST kio-extras-21.04.3.tar.xz 663328 BLAKE2B a509513732dbacc2f63a162cef49f297b5ee83a1d4bcd436aee474571d4aad8ff5b34710ca23d590b87c9cef8b58add2be507692648e61abc197befc478effb7 SHA512 98cdf33a73b9321c127cb3174f5ffc243e51222c2c4572afc7b51a949a41c85e8758aafaca5db613b11109af693eb6de061d78bcf1138c12fbaebf3b5dc82da9
-EBUILD kio-extras-20.12.3-r1.ebuild 2701 BLAKE2B f9e5ac55c51b8d9e8c098efdd379c3f9501ccbe7b752be1ed3b152d7c31c7dec239374e43747a20b8662ae3523ff5d75e24cbe859bb9c4fee9f46712843258b1 SHA512 c13f91a704042b8c81a749793667a0317986a6412d04135d7aa4a29845169cd92f407c72d06305f67341d7ed1c6dd609ae9b7b37b6a2ead23b18338b5deae349
+DIST kio-extras-21.08.0.tar.xz 626644 BLAKE2B 39c17cdd2b433086230430ecb8f07bd87fe69a44b44bfb5e3e5b4bf19ec20692b868dcd8076ff10dd505f3ea5b109aa1b3a4d06f5e9a988a85459a28f17161c7 SHA512 afefd61db602fcc7f75494158b6b76b928d49eb84bfa8b237f8f6e57c6cb224c4d8e9263d86f99d10c00b32f09dff8fd281ca73bd212594f2015e8831fcd7ab7
 EBUILD kio-extras-21.04.3-r2.ebuild 2702 BLAKE2B 5ab41c79256e2520cdf79d5d29d254edda9fe87a9fd3995fd3d7ebfa7c155034714ec53e720dabdf91971993ae47e15f505858eabfd06336ad9ffa2f4fac7f7d SHA512 26fa285a0dc973c2b8a273a8f5067b768de353b556756d7037ac14ccdf54799bc6248f8f8567ad3b53c665ac7d53a9f3732edadc0caedf4a413f336545df8898
+EBUILD kio-extras-21.08.0.ebuild 2632 BLAKE2B ca7ca82fa058f6fc1d1e9ba0fc3a1da443fb2e118b62933c363dbf380a73e78de350bdb8288e30ae8058cf26e39f99dbfb2a2f85624e58f3d2f1346f4ab367b0 SHA512 48c4d200034c5bb3c8892425949791d8d38f5da4cca346c6f52b87006d5baafa0cf568c460527931fa8aa76d84f6df56338a015ab8beeaa0da74ff1ef8e1dce4
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/files/kio-extras-20.12.3-thumbnail-check-shm-size.patch b/kde-apps/kio-extras/files/kio-extras-20.12.3-thumbnail-check-shm-size.patch
deleted file mode 100644
index ef53e0fc3f69..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-20.12.3-thumbnail-check-shm-size.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a288a7ba4283b2102a4602aa105072f33bc25645 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Tue, 4 May 2021 20:52:59 +0200
-Subject: [PATCH] thumbnail: Check shm size before writing to it
-
-The SHM is created by the application, which might've done a different size
-calculation. Verify that the data fits instead of writing past the end and
-crashing.
-
-CCBUG: 430862
-
-
-(cherry picked from commit 112b67ae7895bdc4f32d851c09a4d6baecbb6666)
----
- thumbnail/thumbnail.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/thumbnail/thumbnail.cpp b/thumbnail/thumbnail.cpp
-index 6b133323..afdb088e 100644
---- a/thumbnail/thumbnail.cpp
-+++ b/thumbnail/thumbnail.cpp
-@@ -288,14 +288,15 @@ void ThumbnailProtocol::get(const QUrl &url)
-             error(KIO::ERR_INTERNAL, i18n("Failed to attach to shared memory segment %1", shmid));
-             return;
-         }
--        if (img.width() * img.height() > m_width * m_height) {
-+        if( img.format() != QImage::Format_ARGB32 ) { // KIO::PreviewJob and this code below completely ignores colortable :-/,
-+            img = img.convertToFormat(QImage::Format_ARGB32); //  so make sure there is none
-+        }
-+        struct shmid_ds shmStat;
-+        if (shmctl(shmid.toInt(), IPC_STAT, &shmStat) == -1 || shmStat.shm_segsz < img.sizeInBytes()) {
-             error(KIO::ERR_INTERNAL, i18n("Image is too big for the shared memory segment"));
-             shmdt((char*)shmaddr);
-             return;
-         }
--        if( img.format() != QImage::Format_ARGB32 ) { // KIO::PreviewJob and this code below completely ignores colortable :-/,
--            img = img.convertToFormat(QImage::Format_ARGB32); //  so make sure there is none
--        }
-         // Keep in sync with kdelibs/kio/kio/previewjob.cpp
-         stream << img.width() << img.height() << quint8(img.format());
-         memcpy(shmaddr, img.bits(), img.sizeInBytes());
--- 
-GitLab
-
diff --git a/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-21.08.0.ebuild
index 34c6ad6aeba4..0eec2c010a27 100644
--- a/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.08.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.75.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
@@ -38,7 +38,6 @@ DEPEND="
 	>=kde-frameworks/kdnssd-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
@@ -52,7 +51,7 @@ DEPEND="
 	)
 	mtp? ( >=media-libs/libmtp-1.1.16:= )
 	nfs? ( net-libs/libtirpc:= )
-	openexr? ( media-libs/openexr:= )
+	openexr? ( media-libs/openexr:* )
 	phonon? ( >=media-libs/phonon-4.11.0 )
 	samba? (
 		net-fs/samba[client]
@@ -71,14 +70,13 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="man? ( dev-util/gperf )"
 
-PATCHES=( "${FILESDIR}"/${P}-thumbnail-check-shm-size.patch ) # KDE-bug 430862
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package activities KF5ActivitiesStats)
+		$(cmake_use_find_package activities Qt5Sql)
 		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package mtp Libmtp)
 		$(cmake_use_find_package nfs TIRPC)
 		$(cmake_use_find_package openexr OpenEXR)
 		$(cmake_use_find_package phonon Phonon4Qt5)