summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2017-02-25 16:22:47 -0600
committerDoug Newgard2017-02-25 16:22:47 -0600
commitf6d1329c4aaed0bd11756ac06fed6ef3ff944d53 (patch)
tree327864b8a9fbd65cc8e6e02258ac55f747406891
parent6d959431407b0a9d83054379cb2abd8eb533ba67 (diff)
downloadaur-f6d1329c4aaed0bd11756ac06fed6ef3ff944d53.tar.gz
Restrict qscintilla version
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f517318c7c4..fa188d6b5006 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,7 +21,7 @@ pkgbase = qgis
depends = postgresql-libs
depends = proj
depends = qca-qt4
- depends = qscintilla-qt4
+ depends = qscintilla-qt4<2.10
depends = qt4
depends = qwt
depends = qwtpolar
@@ -30,9 +30,10 @@ pkgbase = qgis
depends = python2
depends = python2-httplib2
depends = python2-future
- depends = python2-qscintilla-qt4
+ depends = python2-qscintilla-qt4<2.10
depends = python2-sip
depends = python2-six
+ depends = python-qscintilla-qt4-common<2.10
optdepends = gpsbabel: GPS Tool plugin
optdepends = gsl: Georeferencer plugin
optdepends = python2-jinja: MetaSearch plugin
diff --git a/PKGBUILD b/PKGBUILD
index 06bbf1d788de..f385a4e19a96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,8 +19,8 @@ url='http://qgis.org/'
license=('GPL')
arch=('i686' 'x86_64')
depends=('expat' 'gcc-libs' 'gdal' 'geos' 'glibc' 'libspatialite' 'postgresql-libs' 'proj'
- 'qca-qt4' 'qscintilla-qt4' 'qt4' 'qwt' 'qwtpolar' 'spatialindex' 'sqlite'
- 'python2' 'python2-httplib2' 'python2-future' 'python2-qscintilla-qt4' 'python2-sip' 'python2-six')
+ 'qca-qt4' 'qscintilla-qt4<2.10' 'qt4' 'qwt' 'qwtpolar' 'spatialindex' 'sqlite'
+ 'python2' 'python2-httplib2' 'python2-future' 'python2-qscintilla-qt4<2.10' 'python2-sip' 'python2-six' 'python-qscintilla-qt4-common<2.10')
makedepends=('cmake' 'gsl' 'perl' 'txt2tags' 'sip<4.19.1' 'python2-sip<4.19.1')
optdepends=('gpsbabel: GPS Tool plugin'
'gsl: Georeferencer plugin'