summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2017-03-25 09:13:27 -0500
committerDoug Newgard2017-03-25 09:13:27 -0500
commite5e753805db6afde193153c62560a4a36c0bc43d (patch)
tree598f86c07b33e1e97e89c9c85df97a98ecbbd819
parent914b5f6a1f08dfa516a92bd563960d3cffc47e13 (diff)
downloadaur-e5e753805db6afde193153c62560a4a36c0bc43d.tar.gz
Fix patch URL
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1e016e5a7722..2684492b5eb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -43,7 +43,7 @@ pkgbase = qgis
optdepends = python2-pyspatialite: Processing plugin
optdepends = python2-yaml: Processing plugin
source = https://qgis.org/downloads/qgis-2.18.5.tar.bz2
- source = https://src.fedoraproject.org/cgit/rpms/qgis.git/plain/qgis_sip-ftbfs.patch
+ source = qgis_sip-ftbfs.patch::https://src.fedoraproject.org/cgit/rpms/qgis.git/plain/qgis_sip-ftbfs.patch?id=25b8f81ccabbfdb183d4850a66e884c183444f14
md5sums = dd2fdd649613a9ff14f2e2da86a59aa5
md5sums = 0575d848604f0fc6dda0a643523e7e48
diff --git a/PKGBUILD b/PKGBUILD
index 08942109b909..b5bfde0d4599 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,7 +34,7 @@ optdepends=('gpsbabel: GPS Tool plugin'
'python2-pyspatialite: Processing plugin'
'python2-yaml: Processing plugin')
source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
- "https://src.fedoraproject.org/cgit/rpms/qgis.git/plain/qgis_sip-ftbfs.patch")
+ "qgis_sip-ftbfs.patch::https://src.fedoraproject.org/cgit/rpms/qgis.git/plain/qgis_sip-ftbfs.patch?id=25b8f81ccabbfdb183d4850a66e884c183444f14")
md5sums=('dd2fdd649613a9ff14f2e2da86a59aa5'
'0575d848604f0fc6dda0a643523e7e48')
@@ -42,8 +42,7 @@ prepare() {
cd $pkgname-$pkgver
# Fedora patch to fix with newer sip/pyqt4
- sed -i '184,$d' ../qgis_sip-ftbfs.patch
- patch -Np1 -i ../qgis_sip-ftbfs.patch
+ patch -Np1 -i <(sed '184,$d' ../qgis_sip-ftbfs.patch)
# Fix references to "python"
sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py")