[arch-commits] Commit in qgis/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, February 27, 2021 @ 23:54:22
  Author: arojas
Revision: 875705

archrelease: copy trunk to community-x86_64

Added:
  qgis/repos/community-x86_64/PKGBUILD
    (from rev 875704, qgis/trunk/PKGBUILD)
  qgis/repos/community-x86_64/qgis-qwtpolar-link.patch
    (from rev 875704, qgis/trunk/qgis-qwtpolar-link.patch)
Deleted:
  qgis/repos/community-x86_64/PKGBUILD

--------------------------+
 PKGBUILD                 |   92 +++++++++++++++++++++++----------------------
 qgis-qwtpolar-link.patch |   12 +++++
 2 files changed, 61 insertions(+), 43 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-27 23:54:08 UTC (rev 875704)
+++ PKGBUILD	2021-02-27 23:54:22 UTC (rev 875705)
@@ -1,43 +0,0 @@
-# Maintainer: 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: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
-# Contributor: Eric Forgeot < http://esclinux.tk >
-
-pkgname=qgis
-pkgver=3.16.3
-pkgrel=1
-pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
-url='https://qgis.org/'
-license=(GPL)
-arch=(x86_64)
-depends=(exiv2 gdal 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)
-makedepends=(cmake fcgi python-setuptools python-six qt5-tools txt2tags sip4)
-optdepends=('fcgi: Map server'
-            'gpsbabel: GPS Tools plugin')
-source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
-sha256sums=('fd57314c1913639f02b64df03eef041172aa220f249e318da3849fc71ada4d04')
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_3D=TRUE \
-    -DWITH_SERVER=TRUE \
-    -DWITH_CUSTOM_WIDGETS=TRUE \
-    -DBINDINGS_GLOBAL_INSTALL=TRUE \
-    -DQGIS_MANUAL_SUBDIR=share/man \
-    -DWITH_QWTPOLAR=TRUE \
-    -DWITH_INTERNAL_QWTPOLAR=FALSE
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-  install -Dm644 $pkgname-$pkgver/rpm/sources/qgis-mime.xml "$pkgdir/usr/share/mime/packages/qgis.xml"
-}

Copied: qgis/repos/community-x86_64/PKGBUILD (from rev 875704, qgis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-02-27 23:54:22 UTC (rev 875705)
@@ -0,0 +1,49 @@
+# Maintainer: 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: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
+# Contributor: Eric Forgeot < http://esclinux.tk >
+
+pkgname=qgis
+pkgver=3.18.0
+pkgrel=1
+pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
+url='https://qgis.org/'
+license=(GPL)
+arch=(x86_64)
+depends=(exiv2 gdal 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)
+makedepends=(cmake fcgi python-setuptools python-six qt5-tools txt2tags sip4)
+optdepends=('fcgi: Map server'
+            'gpsbabel: GPS Tools plugin')
+source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
+         qgis-qwtpolar-link.patch)
+sha256sums=('09aa83ea7e193adec1f490feeaae8644fddbcbb964a858a1e8f740e665fa1563'
+            'd4c1e7bad45186822348a3a7f0951a8253506c69075bd2ead090ae017cd26af4')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < qgis-qwtpolar-link.patch # https://github.com/qgis/QGIS/issues/41910
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_3D=TRUE \
+    -DWITH_SERVER=TRUE \
+    -DWITH_CUSTOM_WIDGETS=TRUE \
+    -DBINDINGS_GLOBAL_INSTALL=TRUE \
+    -DQGIS_MANUAL_SUBDIR=share/man \
+    -DWITH_QWTPOLAR=TRUE \
+    -DWITH_INTERNAL_QWTPOLAR=FALSE
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 $pkgname-$pkgver/rpm/sources/qgis-mime.xml "$pkgdir/usr/share/mime/packages/qgis.xml"
+}

Copied: qgis/repos/community-x86_64/qgis-qwtpolar-link.patch (from rev 875704, qgis/trunk/qgis-qwtpolar-link.patch)
===================================================================
--- qgis-qwtpolar-link.patch	                        (rev 0)
+++ qgis-qwtpolar-link.patch	2021-02-27 23:54:22 UTC (rev 875705)
@@ -0,0 +1,12 @@
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index 072e40a9bb..02dcd9795e 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -494,6 +494,7 @@ target_link_libraries(qgis_app
+   ${OPTIONAL_QTWEBKIT}
+   #should only be needed for win
+   ${QT_QTMAIN_LIBRARY}
++  ${QWTPOLAR_LIBRARY}
+   qgis_core
+   qgis_gui
+   qgis_analysis