From 8546c9be5a02c191008b9d52b7731c34e929a02c Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Thu, 25 Jan 2018 04:31:53 -0500
Subject: qgis-2.18.16-1.parabola1: updating version

---
 pcr/qgis/PKGBUILD | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'pcr/qgis')

diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
index f9f81a098..0d99e08d0 100644
--- a/pcr/qgis/PKGBUILD
+++ b/pcr/qgis/PKGBUILD
@@ -14,27 +14,28 @@
 # You will also need to install osgearth-qt4 or fcgi, respectively, before building.
 
 pkgname=qgis
-pkgver=2.18.1
+pkgver=2.18.16
 pkgrel=1.parabola1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats, without nonfree ElvenSword resource'
-url='http://qgis.org/'
+url='https://qgis.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('qca-qt4' 'gdal' 'qwtpolar' 'spatialindex'
-         python2-{qscintilla-qt4,sip,psycopg2,httplib2,future,jinja,markupsafe}
-         python2-{owslib,pygments,dateutil,pytz,six})
+depends=('expat' 'gcc-libs' 'gdal' 'geos' 'glibc' 'libspatialite' 'postgresql-libs' 'proj'
+         'qt4' 'qca-qt4' 'qjson' 'qscintilla-qt4' 'qwt-qt4' 'qwtpolar-qt4' 'spatialindex' 'sqlite'
+         'python2' 'python2-httplib2' 'python2-future' 'python2-qscintilla-qt4' 'python2-sip' 'python2-six')
 makedepends=('cmake' 'gsl' 'perl' 'txt2tags')
 optdepends=('gpsbabel: GPS Tool plugin'
             'python2-pyspatialite: Processing plugin'
             'python2-yaml: Processing plugin')
 mksource=("http://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
+mksha256sums=('8989e0f9003cfec41ff6cf984bb52866dd0f4d97fe88ec2326f1cf1140050835')
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.bz2"
         "https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.bz2.sig"
         "libre.patch")
-sha256sums=('d4dff4a568d86af61c54f275f13765159b272ae06f940161e0de33b0dc30fb50'
+sha256sums=('ea4da40b19fe81c0fcece89a6d87a389e7f0a6f99964e0c33a88f91f0ffeb4a9'
             'SKIP'
             '94c9457dc861a368edefb4fc8173471dbd2c4024b41346202d44d7aa7e03064e')
-validpgpkeys=('38D33EF29A7691134357648733466E12EC7BA943') # Isaac David
+validpgpkeys=('1B8C5E87702444D3D825CC8086ED62396D5DBA58') # Isaac David
 
 mksource() {
   cd $pkgname-$pkgver
@@ -48,6 +49,10 @@ prepare() {
 
   patch -Np1 -i "$srcdir/libre.patch"
 
+  # Make sure we find the -qt4 versions of qwt and qwtpolar
+  sed -i '/QWT_LIBRARY_NAMES/ s/qwt /qwt-qt4 /' cmake/FindQwt.cmake
+  sed -i '/PATH_SUFFIXES/ s/qwt$/&-qt4/;/LIBRARY NAMES/ s/qwtpolar/&-qt4/' cmake/FindQwtPolar.cmake
+
   # Fix references to "python"
   sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py")
 
@@ -70,12 +75,16 @@ build() {
     -DENABLE_TESTS=FALSE \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DWITH_QTWEBKIT=FALSE \
     -DWITH_INTERNAL_QWTPOLAR=FALSE \
-    -DWITH_INTERNAL_{HTTPLIB2,JINJA2,MARKUPSAFE,OWSLIB,PYGMENTS,DATEUTIL,PYTZ,YAML,NOSE2,SIX}=FALSE \
+    -DWITH_INTERNAL_{MARKUPSAFE,OWSLIB,DATEUTIL,PYTZ,YAML,NOSE2,SIX,FUTURE}=FALSE \
 #    -DWITH_SERVER=TRUE \
 #    -DWITH_GLOBE=TRUE
 
   make
+
+  LD_LIBRARY_PATH="$PWD/output/lib/" make synccrsdb
+  mv /tmp/srs.db ../resources/
 }
 
 package() {
-- 
cgit v1.2.3