summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD10
2 files changed, 4 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2cca137ec9f..988486f7ac0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,9 +45,7 @@ pkgbase = qgis-ltr
provides = qgis=2.14.16
conflicts = qgis
source = https://qgis.org/downloads/qgis-2.14.16.tar.bz2
- source = qgis_sip-ftbfs.patch::https://src.fedoraproject.org/cgit/rpms/qgis.git/plain/qgis_sip-ftbfs.patch?id=25b8f81ccabbfdb183d4850a66e884c183444f14
md5sums = 364851be6a7c64b7f3b5902179902a68
- md5sums = 0575d848604f0fc6dda0a643523e7e48
pkgname = qgis-ltr
diff --git a/PKGBUILD b/PKGBUILD
index 6a6b380312d..b756a28325a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,16 +35,14 @@ optdepends=('gpsbabel: GPS Tool plugin'
'python2-yaml: Processing plugin')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
-source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2"
- "qgis_sip-ftbfs.patch::https://src.fedoraproject.org/cgit/rpms/qgis.git/plain/qgis_sip-ftbfs.patch?id=25b8f81ccabbfdb183d4850a66e884c183444f14")
-md5sums=('364851be6a7c64b7f3b5902179902a68'
- '0575d848604f0fc6dda0a643523e7e48')
+source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2")
+md5sums=('364851be6a7c64b7f3b5902179902a68')
prepare() {
cd $_pkgname-$pkgver
- # Fedora patch to fix with newer sip/pyqt4
- patch -Np1 -i <(sed '184,$d' ../qgis_sip-ftbfs.patch)
+ # Build with current sip
+ sed -i '18 s|^|//|' python/core/qgscoordinatetransform.sip
# Make sure we find the -qt4 versions of qwt and qwtpolar
sed -i '/QWT_LIBRARY_NAMES/ s/qwt /qwt-qt4 /' cmake/FindQwt.cmake