summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2016-04-16 11:35:50 -0500
committerDoug Newgard2016-04-16 11:35:50 -0500
commitf32f3e2c6dc8aa7675d42d2e720a2a4f606d756f (patch)
treeb0379ea3e0d03c5f141ef6ed0c0ee1eab2f5c574
parentc95098be724462ada1df3e18b2d2cdaed61d3395 (diff)
downloadaur-f32f3e2c6dc8aa7675d42d2e720a2a4f606d756f.tar.gz
Patch for compatibility with sip 4.18
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
2 files changed, 9 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a31a3c6d8588..c40d3d6c29fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -31,7 +31,9 @@ pkgbase = qgis
optdepends = python2-pyspatialite: Processing plugin
optdepends = python2-yaml: Processing plugin
source = http://qgis.org/downloads/qgis-2.14.1.tar.bz2
+ source = https://github.com/qgis/QGIS/commit/fc6559aa053317cda8ced657c3013a0d4c6549e9.patch
md5sums = 60e0708650303f28fdfe84b555c41c18
+ md5sums = e57b70e88a0cb4e99e9fb4910b7d932d
pkgname = qgis
diff --git a/PKGBUILD b/PKGBUILD
index e50d9e7291ba..b108623099a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,12 +26,17 @@ optdepends=('gpsbabel: GPS Tool plugin'
'python2-pyspatialite: Processing plugin'
'python2-yaml: Processing plugin')
install="$pkgname.install"
-source=("http://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
-md5sums=('60e0708650303f28fdfe84b555c41c18')
+source=("http://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
+ 'https://github.com/qgis/QGIS/commit/fc6559aa053317cda8ced657c3013a0d4c6549e9.patch')
+md5sums=('60e0708650303f28fdfe84b555c41c18'
+ 'e57b70e88a0cb4e99e9fb4910b7d932d')
prepare() {
cd $pkgname-$pkgver
+ # Fix for sip 4.18
+ patch -Np1 -i ../fc6559aa053317cda8ced657c3013a0d4c6549e9.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