update to version 3.28.8

4 files changed, 66 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f6b780d616b..a6350e0343b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 pkgbase = qgis-ltr
 	pkgdesc = Geographic Information System (GIS); Long Term Release
-	pkgver = 3.28.7
+	pkgver = 3.28.8
 	pkgrel = 1
 	url = https://qgis.org/
 	arch = x86_64
 	license = GPL
-	makedepends = gcc12
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = opencl-clhpp
@@ -46,9 +45,13 @@ pkgbase = qgis-ltr
 	depends = libxml2
 	optdepends = fcgi: Map server
 	optdepends = gpsbabel: GPS Tools plugin
-	provides = qgis=3.28.7
+	provides = qgis=3.28.8
 	conflicts = qgis
-	source = https://download.qgis.org/downloads/qgis-3.28.7.tar.bz2
-	sha256sums = 6798c941745f233112d2e93cb531d9a5fc750812d1a6facaa6d0457cf32bf4fa
+	source = https://download.qgis.org/downloads/qgis-3.28.8.tar.bz2
+	source = protobuf-23.patch
+	source = exiv2-0.28.patch
+	sha256sums = c1a9e936af52050dd584d39ef4707fa5ab4eaf780107750fb191a2032a9a5b35
+	sha256sums = ac6c96e88346c1cec739b1e628afb02aef1895c0d09213269bad75b1a8cee617
+	sha256sums = b8f7181211263866829531d239e07ab7400d18b9afde70a8ced23f602dfb5c2f
 
 pkgname = qgis-ltr
diff --git a/PKGBUILD b/PKGBUILD
index f99d1521082e..f01f267e9bac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 _pkgname=qgis
 pkgname="$_pkgname"-ltr
-pkgver=3.28.7
+pkgver=3.28.8
 pkgrel=1
 pkgdesc='Geographic Information System (GIS); Long Term Release'
 arch=(x86_64)
@@ -23,17 +23,26 @@ depends=(ocl-icd proj geos gdal expat spatialindex qwt libzip sqlite3 protobuf
          qt5-base qt5-svg qt5-serialport qt5-location qt5-3d qt5-declarative
          qscintilla-qt5 qtkeychain-qt5 qca-qt5 gsl python-pyqt5 python-qscintilla-qt5
          hdf5 netcdf libxml2) # laz-perf
-makedepends=(gcc12 cmake ninja opencl-clhpp fcgi qt5-tools sip pyqt-builder)
+makedepends=(cmake ninja opencl-clhpp fcgi qt5-tools sip pyqt-builder)
 optdepends=('fcgi: Map server'
             'gpsbabel: GPS Tools plugin')
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
-source=("https://download.qgis.org/downloads/$_pkgname-$pkgver.tar.bz2")
-sha256sums=('6798c941745f233112d2e93cb531d9a5fc750812d1a6facaa6d0457cf32bf4fa')
+source=("https://download.qgis.org/downloads/$_pkgname-$pkgver.tar.bz2"
+        protobuf-23.patch
+        exiv2-0.28.patch)
+sha256sums=('c1a9e936af52050dd584d39ef4707fa5ab4eaf780107750fb191a2032a9a5b35'
+            'ac6c96e88346c1cec739b1e628afb02aef1895c0d09213269bad75b1a8cee617'
+            'b8f7181211263866829531d239e07ab7400d18b9afde70a8ced23f602dfb5c2f')
 # curl https://download.qgis.org/downloads/qgis-latest-ltr.tar.bz2.sha256
 
+prepare () {
+  cd "$_pkgname-$pkgver"
+  patch -p1 -i ../protobuf-23.patch
+  patch -p1 -i ../exiv2-0.28.patch
+}
+
 build() {
-  export CC=gcc-12 CXX=g++-12
   cmake -G Ninja -B build -S "$_pkgname-$pkgver" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DWITH_3D=TRUE \
@@ -61,7 +70,6 @@ build() {
 }
 
 package() {
-  export CC=gcc-12 CXX=g++-12
   DESTDIR="$pkgdir" cmake --install build
   install -Dm644 $_pkgname-$pkgver/rpm/sources/qgis-mime.xml "$pkgdir/usr/share/mime/packages/qgis.xml"
 }
diff --git a/exiv2-0.28.patch b/exiv2-0.28.patch
new file mode 100644
index 000000000000..33756b2d6dca
--- /dev/null
+++ b/exiv2-0.28.patch
@@ -0,0 +1,29 @@
+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
+@@ -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/protobuf-23.patch b/protobuf-23.patch
new file mode 100644
index 000000000000..8e236e692734
--- /dev/null
+++ b/protobuf-23.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48a34626b0..e2b5cca718 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,7 +363,9 @@ if(WITH_CORE)
+     message (SEND_ERROR "sqlite3 dependency was not found!")
+   endif()
+ 
+-  find_package(Protobuf REQUIRED)   # for decoding of vector tiles in MVT format
++  find_package(Protobuf CONFIG REQUIRED)  # for decoding of vector tiles in MVT format
++  find_package(Protobuf) # for protobuf_generate_cpp
++  set(Protobuf_LITE_LIBRARY protobuf::libprotobuf-lite)
+   message(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}")
+   if (NOT Protobuf_PROTOC_EXECUTABLE)
+     message (SEND_ERROR "Protobuf library's 'protoc' tool was not found!")