gentoo auto-resync : 26:07:2022 - 14:59:07

3 files changed, 138 insertions, 0 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 27926f29c904..e9136b224dc9 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,6 +1,8 @@
+AUX kio-5.96.0-fix-RAW-file-image-preview.patch 1439 BLAKE2B e987ab2493674d99c24e485f295b3229c852cf35c505b370b7b3603b1e1894a4514978ee8b6cf3edb135c4f0025ab9a1f5fd939ec448a95ce4602ea89087a91e SHA512 b71376b9fd5774037c7d434a248a3c50856e9de60c9b9e547e322e9bced4ee9d9dff3764b7dc0768b597790868545397f2288a5bd2d6fe33f15b009feffac405
 AUX kio-5.96.0-fix-crash-in-dropjob.patch 1568 BLAKE2B 91837508cbcdb278a1b38747beccb9d61f99ca0424558264c422240f83d461c3977f5a9dda365305a4fc0a3c71d523ba55d95ea34dc4d12e9761ea8406809d10 SHA512 9a39c65a9603b73b0aacd51063d28d217a4e0bec26d6c1945e890a39f90c0375cfa5dedd7354326bc6f9a7527663de2ecb4940941d28175af28a0c7bc5f4b0e0
 DIST kio-5.92.0.tar.xz 3304432 BLAKE2B 31b78c2cc5a543126d8494935e9956ce169f9bf6b863c0be562775ba3d5a30cf1fadc7bc48e818530eb51a5726bb528f15c51f89dfb9a7511bd6865d6f7092d9 SHA512 5064db660c5b6207eff2bb12261198118c89014f4d71a09531e72bc6185fd070fa262ef617cbbbacc1f334f69f65cc831fa91fd641d59d89303813ec5ef620b6
 DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3
 EBUILD kio-5.92.0.ebuild 2408 BLAKE2B dbf6929b37fc23ecedb5452e67a6a063bddd276476f70a8c04ff18d0662dd851af960a4f83b64348c2e6ad5782bfb387ebdb4f0849a4e5dcad733b76e937997c SHA512 fda5731b4c8ccf515100b97a029c7b635e0918ab703c62b001d3096669c93de7cf717048691ec557db49bee13cbc9bab0d4104bba7f3685e6e0656b5383f3efd
 EBUILD kio-5.96.0-r1.ebuild 2506 BLAKE2B 9cd53fccf2aa575c7c430da716c3ed6f99bb8347a3fd1084f0bf94c307d4e6dc44c78970599e37e7d8816a50305d8d08d92e47e95f2153dcaff627e098d16970 SHA512 0671c37881ce015ad2dc177afe136b8e8d2839e682b315cd5a63df596b99b5bd9694ec1af18122baf2695a960f34fb47c4a3705c62f7d02cdb9c94457b8f2c58
+EBUILD kio-5.96.0-r2.ebuild 2576 BLAKE2B c6622529b22b402626e44acd7c9f3e11858751f94f63885369c6f5d7570fe1109e2816bc5aa44098aff18f2e17f9e0f6c74d663444ea1b9ac42bf63b488c22e8 SHA512 1a9615f522ee51433fcb03b4da8ef93097ea8f841bf3838d483c0dffcacc7b39d56349dc74971a5e96c51e7baef268788d9b219e95f2ff667fbe3e2f7d9e6300
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch
new file mode 100644
index 000000000000..12d4a4c05f2d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch
@@ -0,0 +1,37 @@
+From 5002a07e71ff270a8717911b965a75c33993f883 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Fri, 8 Jul 2022 11:00:42 +0200
+Subject: [PATCH] Fix thumbnailer result for parent mime types being
+ overwritten
+
+BUG: 453480
+---
+ src/widgets/previewjob.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
+index c53bcc88a..91be5575e 100644
+--- a/src/widgets/previewjob.cpp
++++ b/src/widgets/previewjob.cpp
+@@ -384,11 +384,13 @@ void PreviewJobPrivate::startPreview()
+                     }
+                 }
+ 
+-                // Check the wildcards last, see BUG 453480
+-                QString groupMimeType = mimeType;
+-                static const QRegularExpression expr(QStringLiteral("/.*"));
+-                groupMimeType.replace(expr, QStringLiteral("/*"));
+-                pluginIt = mimeMap.constFind(groupMimeType);
++                if (pluginIt == mimeMap.constEnd()) {
++                    // Check the wildcards last, see BUG 453480
++                    QString groupMimeType = mimeType;
++                    static const QRegularExpression expr(QStringLiteral("/.*"));
++                    groupMimeType.replace(expr, QStringLiteral("/*"));
++                    pluginIt = mimeMap.constFind(groupMimeType);
++                }
+             }
+ 
+             if (pluginIt != mimeMap.constEnd()) {
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.96.0-r2.ebuild b/kde-frameworks/kio/kio-5.96.0-r2.ebuild
new file mode 100644
index 000000000000..f04669079060
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.96.0-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~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=(
+	"${FILESDIR}/${P}-fix-crash-in-dropjob.patch" # KDE-bug 454747
+	"${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
+		$(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
+}