Accepting request 1135147 from Application:Geo

OBS-URL: https://build.opensuse.org/request/show/1135147
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qgis?expand=0&rev=50

exiv2-0.28.patch

@@ -1,52 +0,0 @@
-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:

qgis-3.32.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd52487447ebd952b4fbb158b8602de95f8e940e9d79391bba15f941cddd0740
-size 161368983

qgis-3.32.3.tar.bz2.sha256

@@ -1 +0,0 @@
-cd52487447ebd952b4fbb158b8602de95f8e940e9d79391bba15f941cddd0740  qgis-3.32.3.tar.bz2

qgis-3.34.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cc827aefab62f3a636c17c08b253ff5338ac72b5701d97c39639c43a4174148
+size 169304171

qgis-3.34.1.tar.bz2.sha256

@@ -0,0 +1 @@
+3cc827aefab62f3a636c17c08b253ff5338ac72b5701d97c39639c43a4174148  qgis-3.34.1.tar.bz2

qgis.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 25 20:35:46 UTC 2023 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- update to 3.34.1:
+  https://changelog.qgis.org/en/qgis/version/3.34/
+  Drop exiv2-0.28.patch (included upstream)
+
 -------------------------------------------------------------------
 Thu Oct  5 12:05:10 UTC 2023 - Dirk Stoecker <opensuse@dstoecker.de>
 

qgis.spec

@@ -24,7 +24,7 @@ Name:           qgis-ltr
 %else
 Name:           qgis
 %endif
-Version:        3.32.3
+Version:        3.34.1
 Release:        0
 Summary:        A Geographic Information System (GIS)
 License:        GPL-2.0-only
@@ -38,8 +38,6 @@ Source3:        qgis_sample_data.zip
 Patch1:         fix-fastcgi-include.patch
 # PATCH-FIX-UPSTREAM - scan for pdal-config instead of pdal in cmake
 Patch2:         qgis-fix-cmake-findpdal.patch
-# PATCH-FIX-UPSTREAM - https://github.com/qgis/QGIS/issues/53700#issuecomment-1623365356
-Patch3:         exiv2-0.28.patch
 BuildRequires:  FastCGI-devel
 BuildRequires:  PDAL-devel
 BuildRequires:  bison >= 2.4
@@ -107,6 +105,7 @@ BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5UiTools)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  pkgconfig(draco)
 BuildRequires:  pkgconfig(expat) >= 1.95
 # Requires at least gdal 3.1 for GeoTIFF and Proj >= 6 - https://github.com/qgis/QGIS/issues/36699#issuecomment-633539864
 BuildRequires:  pkgconfig(gdal) >= 3.2.0
@@ -114,6 +113,7 @@ BuildRequires:  pkgconfig(Qt5Qwt6)
 BuildRequires:  pkgconfig(gsl) >= 1.8
 BuildRequires:  pkgconfig(libpq) > 9.4
 BuildRequires:  pkgconfig(libzip)
+BuildRequires:  pkgconfig(netcdf)
 BuildRequires:  pkgconfig(pdal) >= 2.2.0
 BuildRequires:  pkgconfig(proj) >= 7.2.0
 BuildRequires:  pkgconfig(python3) >= 3.7