summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2017-03-25 09:15:06 -0500
committerDoug Newgard2017-03-25 09:15:06 -0500
commit53428741fd77d29f810deabe9a470710cd74d225 (patch)
treee07011ed5ae3e1e4c60a12d2a84416f96c6c2791
parent16c70c6c02cd92d6c33925cbe9261b1bfaf586e8 (diff)
downloadaur-53428741fd77d29f810deabe9a470710cd74d225.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 e2d98214061..a844ce83aee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,7 +45,7 @@ pkgbase = qgis-ltr
provides = qgis=2.14.13
conflicts = qgis
source = https://qgis.org/downloads/qgis-2.14.13.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 = 6d34c123ef04f23c43758b1bfad1da89
md5sums = 0575d848604f0fc6dda0a643523e7e48
diff --git a/PKGBUILD b/PKGBUILD
index db1fd8e17da..3319e408041 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,7 +36,7 @@ optdepends=('gpsbabel: GPS Tool plugin'
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
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=('6d34c123ef04f23c43758b1bfad1da89'
'0575d848604f0fc6dda0a643523e7e48')
@@ -44,8 +44,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")