pcr/postgis: update and rebuild -> https://labs.parabola.nu/issues/1127

1 files changed, 11 insertions, 15 deletions

diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
index 4016407e1..f9f81a098 100644
--- a/pcr/qgis/PKGBUILD
+++ b/pcr/qgis/PKGBUILD
@@ -7,31 +7,34 @@
 # Contributor (Arch): Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 # Contributor (Arch): Eric Forgeot < http://esclinux.tk >
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 # Globe Plugin and Map Server are disabled in cmake by default.
 # Uncomment them in the build() portion if you'd like them enabled.
 # You will also need to install osgearth-qt4 or fcgi, respectively, before building.
 
 pkgname=qgis
-pkgver=2.14.2
+pkgver=2.18.1
 pkgrel=1.parabola1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats, without nonfree ElvenSword resource'
 url='http://qgis.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('qca-qt4' 'gdal' 'qwtpolar' 'gsl' 'spatialindex' 'icu'
-         'python2-qscintilla-qt4' 'python2-sip' 'python2-psycopg2'
-         python2-{httplib2,jinja,markupsafe,owslib,pygments,dateutil,pytz,six})
-makedepends=('cmake' 'txt2tags' 'perl')
+depends=('qca-qt4' 'gdal' 'qwtpolar' 'spatialindex'
+         python2-{qscintilla-qt4,sip,psycopg2,httplib2,future,jinja,markupsafe}
+         python2-{owslib,pygments,dateutil,pytz,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")
 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")
-mkmd5sums=('be8427d171adb07f454e9f3eea349dea')
-md5sums=('7674590361b32e157fb8d939aafaf6ad'
-         '6c5f082d7f41f45762030a80aa89d5ff')
+sha256sums=('d4dff4a568d86af61c54f275f13765159b272ae06f940161e0de33b0dc30fb50'
+            'SKIP'
+            '94c9457dc861a368edefb4fc8173471dbd2c4024b41346202d44d7aa7e03064e')
+validpgpkeys=('38D33EF29A7691134357648733466E12EC7BA943') # Isaac David
 
 mksource() {
   cd $pkgname-$pkgver
@@ -47,7 +50,6 @@ prepare() {
 
   # Fix references to "python"
   sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py")
-  sed -i 's/python /python2 /' scripts/pyuic4-wrapper.sh
 
   # Remove mime types already defined by freedesktop.org
   sed -e '/type="image\/tiff"/,/<\/mime-type>/d' \
@@ -56,12 +58,6 @@ prepare() {
       -e '/type="application\/x-adobe-mif"/,/<\/mime-type>/d' \
       -i debian/qgis.xml
 
-  # Fix console.py for new pyqt build system
-  sed -e '/from PyQt4.QtCore/ s/$/, QT_VERSION/' \
-      -e '/import pyqtconfig/d' \
-      -e 's/pyqtconfig.*qt_version/QT_VERSION/' \
-      -i python/console/console.py
-
   [[ -d build ]] || mkdir build
 }