[arch-commits] Commit in qgis/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Tuesday, November 2, 2021 @ 22:24:56
  Author: arojas
Revision: 1035423

Update to 3.22.0

Modified:
  qgis/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-02 21:19:57 UTC (rev 1035422)
+++ PKGBUILD	2021-11-02 22:24:56 UTC (rev 1035423)
@@ -9,8 +9,8 @@
 # Contributor: Eric Forgeot < http://esclinux.tk >
 
 pkgname=qgis
-pkgver=3.20.3
-pkgrel=3
+pkgver=3.22.0
+pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
 url='https://qgis.org/'
 license=('GPL')
@@ -17,25 +17,19 @@
 arch=('x86_64')
 depends=('exiv2' 'gdal' 'gsl' 'hicolor-icon-theme' 'libzip' 'ocl-icd' 'pdal' 'protobuf'
          'python-gdal' 'python-jinja' 'python-owslib' 'python-psycopg2' 'python-pygments'
-         'python-qscintilla-qt5' 'python-sip4' 'python-yaml' 'qca' 'qt5-3d' 'qt5-imageformats'
+         'python-qscintilla-qt5' 'python-yaml' 'qca' 'qt5-3d' 'qt5-imageformats'
          'qt5-serialport' 'qt5-webkit' 'qtkeychain-qt5' 'qwt' 'spatialindex')
 makedepends=('cmake' 'fcgi' 'ninja' 'opencl-clhpp' 'python-setuptools' 'python-six' 'qt5-tools'
-             'txt2tags' 'sip4')
+             'txt2tags' 'sip' 'pyqt-builder')
 optdepends=('fcgi: Map server'
             'gpsbabel: GPS Tools plugin')
 source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
-         qgstyle-infinite-loop.patch::https://github.com/qgis/QGIS/commit/19823b76.patch
-         qgis-qwt-6.2-1.patch::https://github.com/qgis/QGIS/commit/6f9cbde7.patch
-         qgis-qwt-6.2-2.patch::https://github.com/qgis/QGIS/commit/581cb406.patch)
-sha256sums=('93ac52138f4f7832078e6e79ed5249dcd8c3dd34c8801c4039f87b690657294e'
-            'c5bc388da987c7c21451b3f0f74220c8bd82cfba04657ff599d1896e6ae4b304'
-            '3d976937aa83ef76fa2fbdd1bf0e3e6c8467b50649fadbcdd338f99963cd6a91'
-            '91f4458c1c2d97a1e3f809e46b38c63b22f6aa6b919257f409f169f2fdb84b7f')
+         qgstyle-infinite-loop.patch::https://github.com/qgis/QGIS/commit/19823b76.patch)
+sha256sums=('cf0c169863f332aab67d8c4943e14b73a564f0254bf54015f5826c6427e6785b'
+            'c5bc388da987c7c21451b3f0f74220c8bd82cfba04657ff599d1896e6ae4b304')
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < qgstyle-infinite-loop.patch # Fix infinite loop
-  patch -d $pkgname-$pkgver -p1 < qgis-qwt-6.2-1.patch # Fix build with qwt 6.2
-  patch -d $pkgname-$pkgver -p1 < qgis-qwt-6.2-2.patch # Fix build with qwt 6.2
 }
 
 build() {