gentoo auto-resync : 20:05:2023 - 22:19:26

4 files changed, 44 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 73b600376a6e..fe4a21db8d38 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index c901ce95b0f4..7d4c50465bc7 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,6 @@
+AUX kfilemetadata-5.106.0-exiv2-0.28.patch 1476 BLAKE2B 8bfb0c6132b06196aaf4b661ec0db90371f584270f3ff08deaa03595d80f01d76b8c3608ebb637de86ba6478f2a6a1e1817da81cdd13ba1f12af54291cc87440 SHA512 178f6f4c8b2f3066705c19279fb54baaf1acaef38a80baf0b9e5c1e8061b86df4d11b9093fffebbecb45acc81d78ad6ed6db3d1a25295a6d8709dfe74c3d64a7
 DIST kfilemetadata-5.104.0.tar.xz 469760 BLAKE2B 4cd1d17cac69b5069b212d390d09dca92a6d9745c163b26f44f6fd96c1a85de0b1e5cf34806c82be814361c70971295efe530dd3ad81163a099ae24c4c5fcee5 SHA512 4724826d16e867cbd5fef0b766d86ca791926aff3f93187660691e3d2bf5634980220b6e1d75143805834aff8f137cbbb493bddb5583bc087ab740267f560960
 DIST kfilemetadata-5.106.0.tar.xz 470292 BLAKE2B 7294f0b18e05a2c3f7ed91383c0fd02183e6c366b4db349b521e68a7624c11374522b6a6239a99cc3ee0c9434925a3dfbf717d2aa83c60847f536931cb3174e6 SHA512 3ab1657d5b259500fc3a08abca5ba94d43f26b8953509543f16c09f5086bd20a82ea3b90001e184c8af61cc9a105ea580a175647b23c9b2dd636f9991ff4bd31
 EBUILD kfilemetadata-5.104.0.ebuild 1608 BLAKE2B de12b20b6396a00ea6bfbfc78876d53db3149bd522a89b00b6db66064785e55daf370803be13d6030ec434b1a3448feba370e900e40bd20c7d4e7b6ded3dc495 SHA512 8b0307a839c27e48d43c2304c9b06ce6e628eacc79ba5a8c6096860bfc614b822f82cebca79721bd10d81f6e401136b267f288b89c9b854e969c5b11b8007af9
-EBUILD kfilemetadata-5.106.0.ebuild 1611 BLAKE2B 9b2a872b12d779e5f8394f9bcc17465bf705a9a6eb7992dac396e0b98592f0727d8b7e1dc046ce59ef4200161f719aec85b356c952e657cc45da472287ac4eea SHA512 187cde7d09716e8d34cb3136830f57c18c0a89efd4e4777298178ccb733db8f4148ee2992a81fc5c1b3441a34c6b47cb6be29070ae8d1f70e1b23abbd317b7e6
+EBUILD kfilemetadata-5.106.0.ebuild 1673 BLAKE2B c9b0c51c437e71f3e4928bb427476637a4cd1e08cf45be5ea23dbdfca5a20dfe003a173830f4d34b11c682cd381ee8e37a584c465c5e55b2242ba6f3b4fbe122 SHA512 2a7637f39a8f3b6849ec0a3bb123473577ddf887c06e668f82b2dccceda11a8f3fe762773f7d84952d565b0c496f94044cbe047d55396aa34ff19d721c0a21a2
 MISC metadata.xml 645 BLAKE2B a40b11ced7037083642cb3edc9556090c3990213efd3c657d5b92325e4e965e41e0248e7ec8d91bebd263ffc658d1115d611a536adc1888eb7c757d31ce27b86 SHA512 d345ecf2534073c85a1f5eba743247d23ca6ef097fa20db3685b52fd5285b8f4c6f604890d80aaa20d9e0a2f101d947e1b4dbbdf62d740ac9b563e9f88766546
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.106.0-exiv2-0.28.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.106.0-exiv2-0.28.patch
new file mode 100644
index 000000000000..7c8b3012efc6
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.106.0-exiv2-0.28.patch
@@ -0,0 +1,40 @@
+From 6fcce03cfd85fffbe6d7701506de49c5987fdbe5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Thu, 18 May 2023 02:03:56 +0200
+Subject: [PATCH] Fix build with exiv2 >= 0.28
+
+---
+ src/extractors/exiv2extractor.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/extractors/exiv2extractor.cpp b/src/extractors/exiv2extractor.cpp
+index d39247b9..469a6325 100644
+--- a/src/extractors/exiv2extractor.cpp
++++ b/src/extractors/exiv2extractor.cpp
+@@ -75,7 +75,11 @@ QVariant toVariantDateTime(const Exiv2::Value& value)
+ QVariant toVariantLong(const Exiv2::Value& value)
+ {
+     if (value.typeId() == Exiv2::unsignedLong || value.typeId() == Exiv2::signedLong) {
++#if EXIV2_TEST_VERSION(0,28,0)
++        qlonglong val = value.toInt64();
++#else
+         qlonglong val = value.toLong();
++#endif
+         return QVariant(val);
+     }
+ 
+@@ -310,7 +314,11 @@ double Exiv2Extractor::fetchGpsAltitude(const Exiv2::ExifData& data)
+         it = data.findKey(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitudeRef"));
+         if (it != data.end() && it->count() > 0 &&
+             (it->value().typeId() == Exiv2::unsignedByte || it->value().typeId() == Exiv2::signedByte)) {
++#if EXIV2_TEST_VERSION(0,28,0)
++            auto altRef = it->value().toInt64();
++#else
+             auto altRef = it->value().toLong();
++#endif
+             if (altRef) {
+                 alt = -1.0 * ratio.first / ratio.second;
+             } else {
+-- 
+GitLab
+
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild
index 8cef200205be..42a73324ab29 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.106.0.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906090
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 	ecm_pkg_setup