diff options
| author | Doug Newgard | 2017-02-12 22:35:47 -0600 |
|---|---|---|
| committer | Doug Newgard | 2017-02-12 22:35:47 -0600 |
| commit | e42f7b05abd0ff5e899eb6e42e7555781e2aefd2 (patch) | |
| tree | 1124def46394310baa66532d2fa9ea31eb008c6a | |
| parent | 773c51dd4ef26d4fc9817859d0789362e97c674c (diff) | |
| download | aur-e42f7b05abd0ff5e899eb6e42e7555781e2aefd2.tar.gz | |
Fix for sip 4.19 and pyqt4 4.12-4
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
2 files changed, 13 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = qgis-ltr pkgdesc = Geographic Information System (GIS) that supports vector, raster & database formats; Long Term Release pkgver = 2.14.11 - pkgrel = 1 + pkgrel = 2 url = http://qgis.org/ arch = i686 arch = x86_64 @@ -12,6 +12,7 @@ pkgbase = qgis-ltr makedepends = txt2tags depends = qca-qt4 depends = gdal + depends = qtwebkit depends = qwtpolar depends = spatialindex depends = python2-httplib2 @@ -32,7 +33,9 @@ pkgbase = qgis-ltr provides = qgis=2.14.11 conflicts = qgis source = https://qgis.org/downloads/qgis-2.14.11.tar.bz2 + source = https://github.com/qgis/QGIS/commit/70f51aeedac0013247457c9274fcef746447796c.patch md5sums = a23566264a83b1a5689c5cc1710d0552 + md5sums = 45077d8f4daef8fcad0be51fa5c361e6 pkgname = qgis-ltr @@ -13,12 +13,12 @@ pkgname=qgis-ltr _pkgname=${pkgname//-ltr} pkgver=2.14.11 -pkgrel=1 +pkgrel=2 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats; Long Term Release' url='http://qgis.org/' license=('GPL') arch=('i686' 'x86_64') -depends=('qca-qt4' 'gdal' 'qwtpolar' 'spatialindex' +depends=('qca-qt4' 'gdal' 'qtwebkit' 'qwtpolar' 'spatialindex' 'python2-httplib2' 'python2-qscintilla-qt4' 'python2-sip' 'python2-six') makedepends=('cmake' 'gsl' 'perl' 'txt2tags') optdepends=('gpsbabel: GPS Tool plugin' @@ -34,12 +34,17 @@ optdepends=('gpsbabel: GPS Tool plugin' 'python2-yaml: Processing plugin') provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") -source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2") -md5sums=('a23566264a83b1a5689c5cc1710d0552') +source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2" + "https://github.com/qgis/QGIS/commit/70f51aeedac0013247457c9274fcef746447796c.patch") +md5sums=('a23566264a83b1a5689c5cc1710d0552' + '45077d8f4daef8fcad0be51fa5c361e6') prepare() { cd $_pkgname-$pkgver + # fix build with sip 4.19 + patch -Np1 < ../70f51aeedac0013247457c9274fcef746447796c.patch + # Fix references to "python" sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py") sed -i 's/python /python2 /' scripts/pyuic4-wrapper.sh |