Date: Saturday, November 9, 2013 @ 08:16:19 Author: andrea Revision: 199275
upgpkg: qscintilla 2.8-1 Upstream release Modified: qscintilla/trunk/PKGBUILD ----------+ PKGBUILD | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-09 05:21:55 UTC (rev 199274) +++ PKGBUILD 2013-11-09 07:16:19 UTC (rev 199275) @@ -5,8 +5,8 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7.2 -pkgrel=3 +pkgver=2.8 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -13,17 +13,19 @@ makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('0fbfb06078f206a241a62c94861cce21' +md5sums=('02c406d8cd5db661f127303e91775c0b' 'eae1bd23117c5f1f7f172a1c1e11f600') -build() { - cd "${srcdir}/QScintilla-gpl-${pkgver}" +prepare() { + cd QScintilla-gpl-${pkgver} patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" +} - cd Qt4Qt5 +build() { + cd QScintilla-gpl-${pkgver}/Qt4Qt5 qmake-qt4 qscintilla.pro make - + cd ../designer-Qt4Qt5 qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make @@ -36,7 +38,7 @@ cd ../Python2 python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 - make + make } package_qscintilla() { @@ -43,10 +45,10 @@ pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" depends=('qt4') - cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5" + cd QScintilla-gpl-${pkgver}/Qt4Qt5 make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5" + cd ../designer-Qt4Qt5 make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install } @@ -54,11 +56,11 @@ pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" depends=('qscintilla') - cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python + cd QScintilla-gpl-${pkgver}/Python make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - + # Provided by python-qscintilla - rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" + rm "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python-qscintilla() { @@ -65,9 +67,9 @@ pkgdesc="Python 3.x bindings for QScintilla2" depends=('python-qscintilla-common' 'python-pyqt4') - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" + cd QScintilla-gpl-${pkgver}/Python install -Dm755 Qsci.so \ - "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" + "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -74,7 +76,7 @@ pkgdesc="Python 2.x bindings for QScintilla2" depends=('python-qscintilla-common' 'python2-pyqt4') - cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" + cd QScintilla-gpl-${pkgver}/Python2 install -Dm755 Qsci.so \ - "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so" + "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so }