kde-frameworks/kio: Fix RAW file image preview

Upstream commit 5002a07e71ff270a8717911b965a75c33993f883

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=453480

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2022-07-26 14:04:52 +02:00
parent 8f9ab097ec
commit befda3cc73
2 changed files with 136 additions and 0 deletions
@@ -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
+99
View File
@@ -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
}