CVS commit: pkgsrc/geography/qgis

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 19 05:22:18 UTC 2023

Modified Files:
        pkgsrc/geography/qgis: distinfo
Added Files:
        pkgsrc/geography/qgis/patches: patch-src_core_raster_qgsexiftools.cpp

Log Message:
qgis: fix build with exiv2 0.28.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/geography/qgis/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsexiftools.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/qgis/distinfo
diff -u pkgsrc/geography/qgis/distinfo:1.53 pkgsrc/geography/qgis/distinfo:1.54
--- pkgsrc/geography/qgis/distinfo:1.53 Tue Jun 20 22:19:44 2023
+++ pkgsrc/geography/qgis/distinfo      Wed Jul 19 05:22:18 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2023/06/20 22:19:44 gdt Exp $
+$NetBSD: distinfo,v 1.54 2023/07/19 05:22:18 wiz Exp $
 
 BLAKE2s (qgis-3.28.7.tar.bz2) = 1165526f451101f0432512e8c2916d5cadd5c9f7728a8af5721f2229f42cc2b0
 SHA512 (qgis-3.28.7.tar.bz2) = 41135657bc7a71050488cbf287bdd9e6895275af956c2f7d28980aec0cafcdf2de15bbfbd4fc3a4439b81669a806c94ea948789d54a8b9a6c1c530ce061db8fc
@@ -7,4 +7,5 @@ SHA1 (patch-cmake_FindQwt.cmake) = e6999
 SHA1 (patch-mac_CMakeLists.txt) = 7967c0fa4eed8dc2ce24192bdbec8ae8a336be1c
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
 SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
+SHA1 (patch-src_core_raster_qgsexiftools.cpp) = 83cab7f5a0572edba7fbef5001476955a8ddc937
 SHA1 (patch-src_crssync_CMakeLists.txt) = a751be3f55b57a3d039e07c441a4ac81ba735e60

Added files:

Index: pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsexiftools.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsexiftools.cpp:1.1
--- /dev/null   Wed Jul 19 05:22:18 2023
+++ pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsexiftools.cpp        Wed Jul 19 05:22:18 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_core_raster_qgsexiftools.cpp,v 1.1 2023/07/19 05:22:18 wiz Exp $
+
+exiv2 0.28.0 support based on https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94
+
+--- src/core/raster/qgsexiftools.cpp.orig      2023-05-26 12:01:31.000000000 +0000
++++ src/core/raster/qgsexiftools.cpp
+@@ -94,7 +94,11 @@ QVariant decodeExifData( const QString &
+       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:
+@@ -108,7 +112,11 @@ QVariant decodeExifData( const QString &
+       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: