Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 49F7A84D01 for ; Sat, 1 Jul 2023 22:14:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id SI3_-y9YRnAQ for ; Sat, 1 Jul 2023 22:14:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id ADD7184D00 for ; Sat, 1 Jul 2023 22:14:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AB6C8FA89; Sat, 1 Jul 2023 22:14:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16882496506460" MIME-Version: 1.0 Date: Sat, 1 Jul 2023 22:14:10 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/sysutils/kfilemetadata5 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230701221410.AB6C8FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_16882496506460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jul 1 22:14:10 UTC 2023 Modified Files: pkgsrc/sysutils/kfilemetadata5: distinfo Added Files: pkgsrc/sysutils/kfilemetadata5/patches: patch-src_extractors_exiv2extractor.cpp Log Message: kfilemetadata5: fix build with exiv2 0.28.0 using upstream patch To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/kfilemetadata5/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_exiv2extractor.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16882496506460 Content-Disposition: inline Content-Length: 2657 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/kfilemetadata5/distinfo diff -u pkgsrc/sysutils/kfilemetadata5/distinfo:1.15 pkgsrc/sysutils/kfilemetadata5/distinfo:1.16 --- pkgsrc/sysutils/kfilemetadata5/distinfo:1.15 Thu Sep 29 19:32:48 2022 +++ pkgsrc/sysutils/kfilemetadata5/distinfo Sat Jul 1 22:14:10 2023 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.15 2022/09/29 19:32:48 markd Exp $ +$NetBSD: distinfo,v 1.16 2023/07/01 22:14:10 wiz Exp $ BLAKE2s (kfilemetadata-5.98.0.tar.xz) = d845bb161e558c07f0c445ef5b255a1a043f0a0a06e7d0564b08f1cc652c692f SHA512 (kfilemetadata-5.98.0.tar.xz) = 49e6606ee11c971a612b33647d025f0ecaf567c61e4b71651b6461350e329c0970035aa253f82fd5d47390f5cfcf9fbc930e6a4dcbd3c493bcd0b3be0dbdf167 Size (kfilemetadata-5.98.0.tar.xz) = 437964 bytes SHA1 (patch-CMakeLists.txt) = 57d022aa86e532e9fe4185a2b5fc8b90b3e5e463 SHA1 (patch-cmake_FindFFmpeg.cmake) = 94c7699d9a62b86f3c188ad162385bc3319b7753 +SHA1 (patch-src_extractors_exiv2extractor.cpp) = a03ca62ce0bea8c980354e5c262d52e39b6a09ef Added files: Index: pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_exiv2extractor.cpp diff -u /dev/null pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_exiv2extractor.cpp:1.1 --- /dev/null Sat Jul 1 22:14:10 2023 +++ pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_exiv2extractor.cpp Sat Jul 1 22:14:10 2023 @@ -0,0 +1,31 @@ +$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 { --_----------=_16882496506460--