[arch-commits] Commit in qgis/repos/community-x86_64 (4 files)
Balló György
bgyorgy at archlinux.org
Wed Apr 21 20:35:15 UTC 2021
Date: Wednesday, April 21, 2021 @ 20:35:15
Author: bgyorgy
Revision: 920664
archrelease: copy trunk to community-x86_64
Added:
qgis/repos/community-x86_64/PKGBUILD
(from rev 920663, qgis/trunk/PKGBUILD)
qgis/repos/community-x86_64/qgis-qwtpolar-link.patch
(from rev 920663, qgis/trunk/qgis-qwtpolar-link.patch)
Deleted:
qgis/repos/community-x86_64/PKGBUILD
qgis/repos/community-x86_64/qgis-qwtpolar-link.patch
--------------------------+
PKGBUILD | 101 +++++++++++++++++++++++----------------------
qgis-qwtpolar-link.patch | 24 +++++-----
2 files changed, 64 insertions(+), 61 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-21 20:35:06 UTC (rev 920663)
+++ PKGBUILD 2021-04-21 20:35:15 UTC (rev 920664)
@@ -1,49 +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.18.1
-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=('b2934927f1c9314dbe83aff0c900d2c51fb2f980fb2d313f4bcb1736b92fbaa7'
- '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/PKGBUILD (from rev 920663, qgis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-21 20:35:15 UTC (rev 920664)
@@ -0,0 +1,52 @@
+# 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.2
+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' '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'
+ 'qt5-serialport' 'qt5-webkit' 'qtkeychain-qt5' 'qwtpolar' 'spatialindex')
+makedepends=('cmake' 'fcgi' 'ninja' 'opencl-clhpp' '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=('1913e4d5596bbc8b7d143f3defb18bf376f750a71f334f69d76af5deca7ecc5d'
+ 'd4c1e7bad45186822348a3a7f0951a8253506c69075bd2ead090ae017cd26af4')
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < qgis-qwtpolar-link.patch # https://github.com/qgis/QGIS/issues/41910
+}
+
+build() {
+ cmake -S $pkgname-$pkgver -B build -G Ninja \
+ -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 \
+ -DWITH_PDAL=TRUE
+ 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"
+}
Deleted: qgis-qwtpolar-link.patch
===================================================================
--- qgis-qwtpolar-link.patch 2021-04-21 20:35:06 UTC (rev 920663)
+++ qgis-qwtpolar-link.patch 2021-04-21 20:35:15 UTC (rev 920664)
@@ -1,12 +0,0 @@
-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
Copied: qgis/repos/community-x86_64/qgis-qwtpolar-link.patch (from rev 920663, qgis/trunk/qgis-qwtpolar-link.patch)
===================================================================
--- qgis-qwtpolar-link.patch (rev 0)
+++ qgis-qwtpolar-link.patch 2021-04-21 20:35:15 UTC (rev 920664)
@@ -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
More information about the arch-commits
mailing list