Sat Jul 1 22:14:10 2023 UTC ()
kfilemetadata5: fix build with exiv2 0.28.0 using upstream patch


(wiz)
diff -r1.15 -r1.16 pkgsrc/sysutils/kfilemetadata5/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_exiv2extractor.cpp
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/kfilemetadata5/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/kfilemetadata5/distinfo 2022/09/29 19:32:48 1.15
+++ pkgsrc/sysutils/kfilemetadata5/distinfo 2023/07/01 22:14:10 1.16
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.15 2022/09/29 19:32:48 markd Exp $ 1$NetBSD: distinfo,v 1.16 2023/07/01 22:14:10 wiz Exp $
2 2
3BLAKE2s (kfilemetadata-5.98.0.tar.xz) = d845bb161e558c07f0c445ef5b255a1a043f0a0a06e7d0564b08f1cc652c692f 3BLAKE2s (kfilemetadata-5.98.0.tar.xz) = d845bb161e558c07f0c445ef5b255a1a043f0a0a06e7d0564b08f1cc652c692f
4SHA512 (kfilemetadata-5.98.0.tar.xz) = 49e6606ee11c971a612b33647d025f0ecaf567c61e4b71651b6461350e329c0970035aa253f82fd5d47390f5cfcf9fbc930e6a4dcbd3c493bcd0b3be0dbdf167 4SHA512 (kfilemetadata-5.98.0.tar.xz) = 49e6606ee11c971a612b33647d025f0ecaf567c61e4b71651b6461350e329c0970035aa253f82fd5d47390f5cfcf9fbc930e6a4dcbd3c493bcd0b3be0dbdf167
5Size (kfilemetadata-5.98.0.tar.xz) = 437964 bytes 5Size (kfilemetadata-5.98.0.tar.xz) = 437964 bytes
6SHA1 (patch-CMakeLists.txt) = 57d022aa86e532e9fe4185a2b5fc8b90b3e5e463 6SHA1 (patch-CMakeLists.txt) = 57d022aa86e532e9fe4185a2b5fc8b90b3e5e463
7SHA1 (patch-cmake_FindFFmpeg.cmake) = 94c7699d9a62b86f3c188ad162385bc3319b7753 7SHA1 (patch-cmake_FindFFmpeg.cmake) = 94c7699d9a62b86f3c188ad162385bc3319b7753
 8SHA1 (patch-src_extractors_exiv2extractor.cpp) = a03ca62ce0bea8c980354e5c262d52e39b6a09ef
File Added: pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_exiv2extractor.cpp
$NetBSD: patch-src_extractors_exiv2extractor.cpp,v 1.1 2023/07/01 22:14:10 wiz Exp $

Fix build with exiv2 0.28.0.
https://invent.kde.org/frameworks/kfilemetadata/-/commit/6fcce03cfd85fffbe6d7701506de49c5987fdbe5

--- src/extractors/exiv2extractor.cpp.orig	2022-09-05 12:06:30.000000000 +0000
+++ src/extractors/exiv2extractor.cpp
@@ -75,7 +75,11 @@ QVariant toVariantDateTime(const Exiv2::
 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(
         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 {