head 1.2; access; symbols; locks; strict; comment @// @; 1.2 date 2023.07.29.02.26.37; author markd; state dead; branches; next 1.1; commitid aOs13Z2Sy9s6RDyE; 1.1 date 2023.07.01.22.14.10; author wiz; state Exp; branches; next ; commitid JHES9hNIFHdok9vE; desc @@ 1.2 log @kfilemetadata5: update to 5.108.0 5.100 OdfExtractorTest: Add test cases for Flat XML documents OdfExtractor: Only go looking for textual content in office:body OdfExtractor: Support "Flat XML" variants PngExtractor: Only extract metadata when it was asked for 5.101 FFmpegExtrator: Try stream metadata if no global metadata is available office2007extractor: Extract text document line count office2007extractor: Update docx to include more properties Add FictionBook2 extractor 5.102 odfextractor: Add support for Open Document Graphics 5.103 Also add external extractors to vector of all plugins Fix loading of external extractors and writers 5.104 Mobi extractor: only extract what is asked 5.106 Test HEIF in Exiv2Extractor Test JXL in Exiv2Extractor, extend JPEG coverage Remove usage of deprecated MP4::ItemListMap in taglib extractor Modernize and extend CMake check for Python3 Make fb2 extractor compilation dependent on KF5Archive 5.107 Cleanup property name/id mapping test Add method to export list of all Property names Reduce PropertyInfo construction overhead Add benchmark for PropertyInfo instantiation 5.108 Reapply ReplayGain changes @ text @$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 { @ 1.1 log @kfilemetadata5: fix build with exiv2 0.28.0 using upstream patch @ text @d1 1 a1 1 $NetBSD$ @