kde-apps/baloo-widgets: Fix displaying image dimensions w/ exiv2-0.28

Backport of upstream commit b8947e1050e25481d12e644fab02ce2df40329cf
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=470859

Bug: https://bugs.gentoo.org/911185
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 62 insertions, 0 deletions

diff --git a/kde-apps/baloo-widgets/baloo-widgets-23.04.3-r1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-23.04.3-r1.ebuild
new file mode 100644
index 000000000000..c7c86f150aeb
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-23.04.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="Widget library for baloo"
+
+LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/baloo-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # 23.08
diff --git a/kde-apps/baloo-widgets/files/baloo-widgets-23.04.3-exiv2-0.28.patch b/kde-apps/baloo-widgets/files/baloo-widgets-23.04.3-exiv2-0.28.patch
new file mode 100644
index 000000000000..c93b9637e917
--- /dev/null
+++ b/kde-apps/baloo-widgets/files/baloo-widgets-23.04.3-exiv2-0.28.patch
@@ -0,0 +1,29 @@
+From a6dda3af5180d39a823224f2aca279b580ae576a Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 13 Jun 2023 11:13:13 +0000
+Subject: [PATCH] Fix displaying image dimensions with exiv2 0.28
+
+Accept UInt as the dimensions type
+
+BUG: 470859
+(cherry picked from commit b8947e1050e25481d12e644fab02ce2df40329cf)
+---
+ src/filemetadataprovider.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/filemetadataprovider.cpp b/src/filemetadataprovider.cpp
+index 84a01d5..7377133 100644
+--- a/src/filemetadataprovider.cpp
++++ b/src/filemetadataprovider.cpp
+@@ -129,7 +129,7 @@ void FileMetaDataProvider::slotFileFetchFinished(KJob *job)
+ 
+         const auto width = m_data.value(QStringLiteral("width"));
+         const auto height = m_data.value(QStringLiteral("height"));
+-        if ((width.type() == QVariant::Double || width.type() == QVariant::Int) && (height.type() == QVariant::Double || height.type() == QVariant::Int)) {
++        if (!width.isNull() && !height.isNull()) {
+             m_data.insert(QStringLiteral("dimensions"), i18nc("width × height", "%1 × %2", width.toInt(), height.toInt()));
+         }
+ 
+-- 
+2.41.0
+