update to version 3.34.4

4 files changed, 20 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 029d9538d403..a770c1b6eae7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qgis-ltr
 	pkgdesc = Geographic Information System (GIS); Long Term Release
-	pkgver = 3.28.15
+	pkgver = 3.34.4
 	pkgrel = 1
 	url = https://qgis.org/
 	arch = x86_64
@@ -10,6 +10,8 @@ pkgbase = qgis-ltr
 	makedepends = opencl-clhpp
 	makedepends = fcgi
 	makedepends = qt5-tools
+	makedepends = sip
+	makedepends = pyqt-builder
 	depends = ocl-icd
 	depends = proj
 	depends = geos
@@ -25,12 +27,14 @@ pkgbase = qgis-ltr
 	depends = postgresql-libs
 	depends = libspatialite
 	depends = zstd
+	depends = pdal
 	depends = qt5-base
 	depends = qt5-svg
 	depends = qt5-serialport
 	depends = qt5-location
 	depends = qt5-3d
 	depends = qt5-declarative
+	depends = qt5-multimedia
 	depends = qscintilla-qt5
 	depends = qtkeychain-qt5
 	depends = qca-qt5
@@ -40,15 +44,12 @@ pkgbase = qgis-ltr
 	depends = hdf5
 	depends = netcdf
 	depends = libxml2
+	depends = draco
 	optdepends = fcgi: Map server
 	optdepends = gpsbabel: GPS Tools plugin
-	provides = qgis=3.28.15
+	provides = qgis=3.34.4
 	conflicts = qgis
-	source = https://download.qgis.org/downloads/qgis-3.28.15.tar.bz2
-	source = protobuf-23.patch
-	source = exiv2-0.28.patch
-	sha256sums = 217342ba2232cc8fe5bf8f3671c2b3d6daf5504c33006b67424373e70d568dfa
-	sha256sums = ac6c96e88346c1cec739b1e628afb02aef1895c0d09213269bad75b1a8cee617
-	sha256sums = b8f7181211263866829531d239e07ab7400d18b9afde70a8ced23f602dfb5c2f
+	source = https://qgis.org/downloads/qgis-3.34.4.tar.bz2
+	sha256sums = 7d1c5fafff13f508a9bcf6244c9666f891351deb1ace2aedcc63504f070c5ce4
 
 pkgname = qgis-ltr
diff --git a/PKGBUILD b/PKGBUILD
index 19d04148c352..2e6e9820ca19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,39 +12,29 @@
 
 _pkgname=qgis
 pkgname="$_pkgname"-ltr
-pkgver=3.28.15
+pkgver=3.34.4
 pkgrel=1
 pkgdesc='Geographic Information System (GIS); Long Term Release'
 arch=(x86_64)
 url='https://qgis.org/'
 license=(GPL)
 depends=(ocl-icd proj geos gdal expat spatialindex qwt libzip sqlite3 protobuf
-         zlib exiv2 postgresql-libs libspatialite zstd
-         qt5-base qt5-svg qt5-serialport qt5-location qt5-3d qt5-declarative
+         zlib exiv2 postgresql-libs libspatialite zstd pdal
+         qt5-base qt5-svg qt5-serialport qt5-location qt5-3d qt5-declarative qt5-multimedia
          qscintilla-qt5 qtkeychain-qt5 qca-qt5 gsl python-pyqt5 python-qscintilla-qt5
-         hdf5 netcdf libxml2) # laz-perf
-makedepends=(cmake ninja opencl-clhpp fcgi qt5-tools)
+         hdf5 netcdf libxml2 draco) # laz-perf
+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"
-        protobuf-23.patch
-        exiv2-0.28.patch)
-sha256sums=('217342ba2232cc8fe5bf8f3671c2b3d6daf5504c33006b67424373e70d568dfa'
-            '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
-}
+source=(https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2)
+sha256sums=('7d1c5fafff13f508a9bcf6244c9666f891351deb1ace2aedcc63504f070c5ce4')
+# curl -s https://download.qgis.org/downloads/qgis-latest-ltr.tar.bz2.sha256
 
 build() {
-  cmake -G Ninja -B build -S "$_pkgname-$pkgver" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -S $_pkgname-$pkgver -B build -G Ninja \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
     -DWITH_3D=TRUE \
     -DWITH_QUICK=TRUE \
     -DWITH_SERVER=TRUE \
@@ -57,8 +47,7 @@ build() {
     -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DQWT_POLAR_VERSION=0x060200" \
     -DWITH_INTERNAL_QWTPOLAR=FALSE \
-    -DWITH_PDAL=FALSE \
-    -DWITH_BINDINGS=FALSE \
+    -DWITH_PDAL=TRUE \
     -DHAS_KDE_QT5_PDF_TRANSFORM_FIX=TRUE \
     -DHAS_KDE_QT5_SMALL_CAPS_FIX=TRUE \
     -DHAS_KDE_QT5_FONT_STRETCH_FIX=TRUE
diff --git a/exiv2-0.28.patch b/exiv2-0.28.patch
deleted file mode 100644
index 33756b2d6dca..000000000000
--- a/exiv2-0.28.patch
+++ /dev/null
@@ -1,29 +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
-@@ -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
deleted file mode 100644
index 8e236e692734..000000000000
--- a/protobuf-23.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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!")