Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qgis for openSUSE:Factory checked in at 2023-07-08 22:46:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgis (Old) and /work/SRC/openSUSE:Factory/.qgis.new.23466 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgis" Sat Jul 8 22:46:34 2023 rev:46 rq:1097492 version:3.30.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qgis/qgis.changes 2023-06-17 22:21:26.043942089 +0200 +++ /work/SRC/openSUSE:Factory/.qgis.new.23466/qgis.changes 2023-07-08 22:46:38.154940405 +0200 @@ -1,0 +2,6 @@ +Fri Jul 7 06:41:39 UTC 2023 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Add patch to build with exiv2 0.28+ - boo#1212936 + * exiv2-0.28.patch + +------------------------------------------------------------------- New: ---- exiv2-0.28.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgis.spec ++++++ --- /var/tmp/diff_new_pack.JFWKY2/_old 2023-07-08 22:46:40.098952090 +0200 +++ /var/tmp/diff_new_pack.JFWKY2/_new 2023-07-08 22:46:40.134952307 +0200 @@ -40,6 +40,8 @@ Patch2: qgis-fix-cmake-findpdal.patch # PATCH-FIX-UPSTREAM - add missing include file https://github.com/qgis/QGIS/issues/52526 Patch3: qgis-3.30.0_include_fix.patch +# PATCH-FIX-UPSTREAM - https://github.com/qgis/QGIS/issues/53700#issuecomment-1623365356 +Patch4: exiv2-0.28.patch BuildRequires: FastCGI-devel BuildRequires: PDAL-devel BuildRequires: bison >= 2.4 ++++++ exiv2-0.28.patch ++++++ diff --git a/src/core/raster/qgsexiftools.cpp b/src/core/raster/qgsexiftools.cpp index 7fa2709845..f883d7960c 100644 --- a/src/core/raster/qgsexiftools.cpp +++ b/src/core/raster/qgsexiftools.cpp @@ -66,7 +66,11 @@ QVariant decodeXmpData( const QString &key, Exiv2::XmpData::const_iterator &it ) case Exiv2::signedLong: case Exiv2::unsignedLongLong: case Exiv2::signedLongLong: +#if EXIV2_TEST_VERSION (0, 28, 0) + val = QVariant::fromValue( it->toUint32() ); +#else val = QVariant::fromValue( it->toLong() ); +#endif break; case Exiv2::tiffDouble: @@ -80,7 +84,11 @@ QVariant decodeXmpData( const QString &key, Exiv2::XmpData::const_iterator &it ) case Exiv2::signedByte: case Exiv2::tiffIfd: case Exiv2::tiffIfd8: +#if EXIV2_TEST_VERSION (0, 28, 0) + val = QVariant::fromValue( static_cast< int >( it->toUint32() ) ); +#else val = QVariant::fromValue( static_cast< int >( it->toLong() ) ); +#endif break; case Exiv2::date: @@ -182,7 +190,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it case Exiv2::signedLong: case Exiv2::unsignedLongLong: case Exiv2::signedLongLong: +#if EXIV2_TEST_VERSION (0, 28, 0) + val = QVariant::fromValue( it->toUint32() ); +#else val = QVariant::fromValue( it->toLong() ); +#endif break; case Exiv2::tiffDouble: @@ -196,7 +208,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it case Exiv2::signedByte: case Exiv2::tiffIfd: case Exiv2::tiffIfd8: +#if EXIV2_TEST_VERSION (0, 28, 0) + val = QVariant::fromValue( static_cast< int >( it->toUint32() ) ); +#else val = QVariant::fromValue( static_cast< int >( it->toLong() ) ); +#endif break; case Exiv2::date: