rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

Accepting request 1097491 from home:Guillaume_G:branches:Application:Geo

Browse Source 
- 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
This commit is contained in:
Dirk Stoecker 2023-07-07 09:23:20 +00:00 committed by Git OBS Bridge
parent aab69e4030
commit e1d9ad53a4
3 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
exiv2-0.28.patch Normal file
View File

@ -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:

6
qgis.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 7 06:41:39 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add patch to build with exiv2 0.28+ - boo#1212936
* exiv2-0.28.patch
-------------------------------------------------------------------
Wed Jun 14 08:59:01 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>

2
qgis.spec
View File

@ -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