From e1d9ad53a40b39f3cfc1c971dfabba8b4d32e3c64bf5463a461497fdd4310073 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Fri, 7 Jul 2023 09:23:20 +0000 Subject: [PATCH] Accepting request 1097491 from home:Guillaume_G:branches:Application:Geo - Add patch to build with exiv2 0.28+ - boo#1212936 * exiv2-0.28.patch OBS-URL: https://build.opensuse.org/request/show/1097491 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=378 --- exiv2-0.28.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ qgis.changes | 6 ++++++ qgis.spec | 2 ++ 3 files changed, 60 insertions(+) create mode 100644 exiv2-0.28.patch diff --git a/exiv2-0.28.patch b/exiv2-0.28.patch new file mode 100644 index 0000000..bd5a869 --- /dev/null +++ b/exiv2-0.28.patch @@ -0,0 +1,52 @@ +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: diff --git a/qgis.changes b/qgis.changes index fa04617..b105a7c 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 7 06:41:39 UTC 2023 - Guillaume GARDET + +- Add patch to build with exiv2 0.28+ - boo#1212936 + * exiv2-0.28.patch + ------------------------------------------------------------------- Wed Jun 14 08:59:01 UTC 2023 - Guillaume GARDET diff --git a/qgis.spec b/qgis.spec index 28a7713..004d14c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -40,6 +40,8 @@ Patch1: fix-fastcgi-include.patch 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