summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Springer2021-02-28 15:28:01 +0100
committerStephan Springer2021-02-28 15:28:01 +0100
commitb97e757c0c3c7d723892c666483c6ada791297d6 (patch)
tree4dee79c5f9107d763ce0d147c860db4a450ffec5
parent60e4eb5087494189ce0554ee626fc9793f3aff60 (diff)
downloadaur-b97e757c0c3c7d723892c666483c6ada791297d6.tar.gz
update to version 3.16.4
-rw-r--r--.SRCINFO34
-rw-r--r--PKGBUILD51
-rw-r--r--qgis-pyqt5-sip5.patch22
-rw-r--r--t2t-toc-level.patch24
4 files changed, 34 insertions, 97 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f441bf71954..b19dfa65c18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qgis-ltr
pkgdesc = Geographic Information System (GIS); Long Term Release
- pkgver = 3.10.14
+ pkgver = 3.16.4
pkgrel = 1
url = https://qgis.org/
arch = x86_64
@@ -8,43 +8,41 @@ pkgbase = qgis-ltr
makedepends = cmake
makedepends = ninja
makedepends = fcgi
- makedepends = gsl
makedepends = python-setuptools
makedepends = python-six
makedepends = qt5-tools
makedepends = txt2tags
makedepends = sip4
+ makedepends = opencl-clhpp
depends = exiv2
- depends = gdal
+ depends = gsl
depends = hicolor-icon-theme
depends = libzip
+ depends = protobuf
+ depends = python-gdal
+ depends = python-jinja
+ depends = python-owslib
+ depends = python-psycopg2
+ depends = python-pygments
depends = python-qscintilla-qt5
depends = python-sip4
+ depends = python-yaml
depends = qca
depends = qt5-3d
+ depends = qt5-imageformats
depends = qt5-serialport
depends = qt5-webkit
depends = qtkeychain
depends = qwtpolar
depends = spatialindex
+ depends = opencl-icd-loader
optdepends = fcgi: Map server
+ optdepends = opencl-driver: packaged OpenCL driver
optdepends = gpsbabel: GPS Tools plugin
- optdepends = gsl: Georeferencer plugin
- optdepends = python-gdal: DB Manager plugin; Processing plugin
- optdepends = python-jinja: MetaSearch plugin
- optdepends = python-owslib: MetaSearch plugin
- optdepends = python-psycopg2: DB Manager plugin; Processing plugin
- optdepends = python-pygments: MetaSearch plugin
- optdepends = python-numpy: Processing plugin
- optdepends = python-yaml: Processing plugin
- provides = qgis=3.10.14
+ provides = qgis=3.16.4
conflicts = qgis
- source = https://qgis.org/downloads/qgis-3.10.14.tar.bz2
- source = qgis-pyqt5-sip5.patch
- source = t2t-toc-level.patch
- sha256sums = add0a24cb6ec0ed5120cdcfceb478d5941936c7187ed85f2f7e7d22628e36131
- sha256sums = 47fdab75c94ecf5b61a41b334e23714226e895cef507c35a3bc4b46c7d307981
- sha256sums = f7e91914cfe366a63383b39c63d5731f6f20a1a0a0d7e9f3d16809a40bb5acff
+ source = https://qgis.org/downloads/qgis-3.16.4.tar.bz2
+ sha256sums = a31b4aa9b54a47f5dce3d944c32b4609348fa2ffdd1b533bdffb935f62b7049f
pkgname = qgis-ltr
diff --git a/PKGBUILD b/PKGBUILD
index 17000b723d2..a7290a98ab4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,37 @@
# Maintainer: Stephan Springer <buzo+arch@Lini.de>
-# Contributor: Doug Newgard <scimmia at archlinux dot info>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Doug Newgard <scimmia at archlinux dot org>
+# Contributor: XavierCLL <xavier.corredor.llano (a) gmail.com>
# Contributor: SaultDon <sault.don gmail>
-# Contributor: Lantald <lantald at gmx.com>
-# Contributor: Thomas Dziedzic <gostrc at gmail>
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.dot.org>
+# Contributor: Lantald < lantald at gmx.com >
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Contributor: Eric Forgeot <http://esclinux.tk>
+# Contributor: Eric Forgeot < http://esclinux.tk >
_pkgname=qgis
pkgname="$_pkgname"-ltr
-pkgver=3.10.14
+pkgver=3.16.4
pkgrel=1
pkgdesc='Geographic Information System (GIS); Long Term Release'
url='https://qgis.org/'
license=(GPL)
arch=(x86_64)
-depends=(exiv2 gdal hicolor-icon-theme libzip python-qscintilla-qt5 python-sip4 qca qt5-3d
- qt5-serialport qt5-webkit qtkeychain qwtpolar spatialindex)
-makedepends=(cmake ninja fcgi gsl python-setuptools python-six qt5-tools txt2tags sip4)
+depends=(exiv2 gsl hicolor-icon-theme libzip protobuf python-gdal python-jinja python-owslib
+ python-psycopg2 python-pygments python-qscintilla-qt5 python-sip4 python-yaml qca qt5-3d
+ qt5-imageformats qt5-serialport qt5-webkit qtkeychain qwtpolar spatialindex opencl-icd-loader)
+makedepends=(cmake ninja fcgi python-setuptools python-six qt5-tools txt2tags sip4 opencl-clhpp)
optdepends=('fcgi: Map server'
- 'gpsbabel: GPS Tools plugin'
- 'gsl: Georeferencer plugin'
- 'python-gdal: DB Manager plugin; Processing plugin'
- 'python-jinja: MetaSearch plugin'
- 'python-owslib: MetaSearch plugin'
- 'python-psycopg2: DB Manager plugin; Processing plugin'
- 'python-pygments: MetaSearch plugin'
- 'python-numpy: Processing plugin'
- 'python-yaml: Processing plugin')
+ 'opencl-driver: packaged OpenCL driver'
+ 'gpsbabel: GPS Tools plugin')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
-source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2"
- qgis-pyqt5-sip5.patch
- t2t-toc-level.patch
-)
+source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2")
# curl https://qgis.org/downloads/qgis-latest-ltr.tar.bz2.sha256
-sha256sums=('add0a24cb6ec0ed5120cdcfceb478d5941936c7187ed85f2f7e7d22628e36131'
- '47fdab75c94ecf5b61a41b334e23714226e895cef507c35a3bc4b46c7d307981'
- 'f7e91914cfe366a63383b39c63d5731f6f20a1a0a0d7e9f3d16809a40bb5acff')
-
-prepare() {
- mkdir -p build
- cd "$_pkgname-$pkgver"
- patch -p1 -i ../qgis-pyqt5-sip5.patch # Use new pyqt sip file location
- patch -p1 -i ../t2t-toc-level.patch # --toc-level has been removed in txt2tags
-}
+sha256sums=('a31b4aa9b54a47f5dce3d944c32b4609348fa2ffdd1b533bdffb935f62b7049f')
build() {
- cmake -B build "$_pkgname-$pkgver" \
+ cmake -G Ninja -B build -S "$_pkgname-$pkgver" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_3D=TRUE \
-DWITH_SERVER=TRUE \
@@ -61,4 +45,5 @@ build() {
package() {
DESTDIR="$pkgdir" cmake --install build
+ install -Dm644 $_pkgname-$pkgver/rpm/sources/qgis-mime.xml "$pkgdir/usr/share/mime/packages/qgis.xml"
}
diff --git a/qgis-pyqt5-sip5.patch b/qgis-pyqt5-sip5.patch
deleted file mode 100644
index 3e140db6b40..00000000000
--- a/qgis-pyqt5-sip5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py
-index 6a55a0f801..ba46441059 100644
---- a/cmake/FindPyQt5.py
-+++ b/cmake/FindPyQt5.py
-@@ -37,7 +37,7 @@ except ImportError:
- import PyQt5.QtCore
- import sipconfig # won't work for SIP v5
- import os.path
-- import sys
-+ import sys, site
- cfg = sipconfig.Configuration()
- sip_dir = cfg.default_sip_dir
- if sys.platform.startswith('freebsd'):
-@@ -54,7 +54,7 @@ except ImportError:
- 'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
- 'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
- 'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
-- 'pyqt_sip_dir': sip_dir,
-+ 'pyqt_sip_dir': os.path.join(site.getsitepackages()[0], "PyQt5", "bindings"),
- 'pyqt_bin_dir': cfg.default_bin_dir,
- }
- pyqtcfg = sipconfig.Configuration([cfg])
diff --git a/t2t-toc-level.patch b/t2t-toc-level.patch
deleted file mode 100644
index 5fcf882c273..00000000000
--- a/t2t-toc-level.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru orig/doc/INSTALL.t2t qgis-3.10.6/doc/INSTALL.t2t
---- orig/doc/INSTALL.t2t 2020-06-18 15:24:50.000000000 +0200
-+++ qgis-3.10.6/doc/INSTALL.t2t 2020-06-18 15:46:06.409978439 +0200
-@@ -4,7 +4,7 @@
-
- %! target : html
- %! style : style.css
--%! Options : --toc --toc-level 2 --enum-title
-+%! Options : --toc --enum-title
- %! preproc : TUT_URL https://qgis.org
- %! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
- %! PostProc(html): '(?i)(</pre>)' '\1</div>'
-diff -ru orig/doc/news.t2t qgis-3.10.6/doc/news.t2t
---- orig/doc/news.t2t 2020-06-18 15:24:50.000000000 +0200
-+++ qgis-3.10.6/doc/news.t2t 2020-06-18 15:45:58.409978465 +0200
-@@ -4,7 +4,7 @@
-
- %! target : html
- %! style : style.css
--%! Options : --toc --toc-level 1 --enum-title
-+%! Options : --toc --enum-title
- %! preproc : TUT_URL https://qgis.org
- %! PostProc(html): '(?i)(<pre>)' '<div class="code">\1'
- %! PostProc(html): '(?i)(</pre>)' '\1</div>'