From 5085ee1005fce485997775f031bf15e7f9614231 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Wed, 18 May 2016 12:42:10 -0500 Subject: qgis-2.14.2-1.parabola1: updating version --- pcr/qgis/PKGBUILD | 42 +++++++++++++++++++++++------------------- pcr/qgis/qgis.install | 13 ------------- 2 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 pcr/qgis/qgis.install diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD index 864c16ab7..4016407e1 100644 --- a/pcr/qgis/PKGBUILD +++ b/pcr/qgis/PKGBUILD @@ -1,34 +1,36 @@ -# Maintainer: Doug Newgard -# Maintainer: XavierCLL -# Contributor: SaultDon -# Contributor: Lantald < lantald at gmx.com > -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Gerardo Exequiel Pozzi -# Contributor: Eric Forgeot < http://esclinux.tk > +# Maintainer (Arch): Doug Newgard +# Maintainer (Arch): XavierCLL +# Contributor (Arch): SaultDon +# Contributor (Arch): Lantald < lantald at gmx.com > +# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor (Arch): Gerardo Exequiel Pozzi +# Contributor (Arch): Eric Forgeot < http://esclinux.tk > +# Maintainer: Omar Vega Ramos # 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 or fcgi, respectively, before building. +# You will also need to install osgearth-qt4 or fcgi, respectively, before building. pkgname=qgis -pkgver=2.12.3 +pkgver=2.14.2 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' 'python2-sip' 'python2-psycopg2' 'python2-six' 'python2-dateutil' - 'python2-httplib2' 'python2-jinja' 'python2-markupsafe' 'python2-pygments' 'python2-pytz') + 'python2-qscintilla-qt4' 'python2-sip' 'python2-psycopg2' + python2-{httplib2,jinja,markupsafe,owslib,pygments,dateutil,pytz,six}) makedepends=('cmake' 'txt2tags' 'perl') -optdepends=('gpsbabel: GPS Tool plugin') -install="$pkgname.install" +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" "libre.patch") -mkmd5sums=('f57ad5f04451d30032dbdd1836e0cb22') -md5sums=('37ff345be0bde384448b8c2527e523f7' +mkmd5sums=('be8427d171adb07f454e9f3eea349dea') +md5sums=('7674590361b32e157fb8d939aafaf6ad' '6c5f082d7f41f45762030a80aa89d5ff') mksource() { @@ -43,8 +45,9 @@ prepare() { patch -Np1 -i "$srcdir/libre.patch" - # Fixing shebang for .py files + # 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' \ @@ -71,7 +74,8 @@ build() { -DENABLE_TESTS=FALSE \ -DCMAKE_SKIP_RPATH=TRUE \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DWITH_INTERNAL_{QWTPOLAR,DATEUTIL,HTTPLIB2,JINJA2,MARKUPSAFE,PYGMENTS,PYTZ,SIX}=FALSE \ + -DWITH_INTERNAL_QWTPOLAR=FALSE \ + -DWITH_INTERNAL_{HTTPLIB2,JINJA2,MARKUPSAFE,OWSLIB,PYGMENTS,DATEUTIL,PYTZ,YAML,NOSE2,SIX}=FALSE \ # -DWITH_SERVER=TRUE \ # -DWITH_GLOBE=TRUE @@ -85,7 +89,7 @@ package() { [[ -n "$(sed -n '/^GRASS_PREFIX:/ s/.*=//p' CMakeCache.txt)" ]] && optdepends+=('grass6: GRASS6 plugin') [[ -n "$(sed -n '/^GRASS_PREFIX7:/ s/.*=//p' CMakeCache.txt)" ]] && optdepends+=('grass: GRASS7 plugin') [[ "$(sed -n '/^WITH_SERVER:/ s/.*=//p' CMakeCache.txt)" == "TRUE" ]] && optdepends+=('fcgi: Map Server') - [[ "$(sed -n '/^WITH_GLOBE:/ s/.*=//p' CMakeCache.txt)" == "TRUE" ]] && optdepends+=('osgearth: Globe plugin') + [[ "$(sed -n '/^WITH_GLOBE:/ s/.*=//p' CMakeCache.txt)" == "TRUE" ]] && optdepends+=('osgearth-qt4: Globe plugin') make DESTDIR="$pkgdir" install diff --git a/pcr/qgis/qgis.install b/pcr/qgis/qgis.install deleted file mode 100644 index 5ee51bc0e..000000000 --- a/pcr/qgis/qgis.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q usr/share/icons/hicolor - update-mime-database usr/share/mime -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} -- cgit v1.2.3-54-g00ecf