diff --git a/qscintilla/PKGBUILD b/qscintilla/PKGBUILD index 05c5ae604..e80a20c6f 100644 --- a/qscintilla/PKGBUILD +++ b/qscintilla/PKGBUILD @@ -1,24 +1,15 @@ -# Maintainer: H W Tovetjärn (totte) -# Contributors: A Boersma (abveritas) - pkgbase=qscintilla -pkgname=('qscintilla-qt4' 'python3-qscintilla-qt4' 'python2-qscintilla-qt4' - 'python-qscintilla-qt4-common' - 'qscintilla-qt5' 'python3-qscintilla-qt5' 'python2-qscintilla-qt5' +pkgname=('qscintilla-qt5' 'python3-qscintilla-qt5' 'python2-qscintilla-qt5' 'python-qscintilla-qt5-common') -pkgver=2.10.2 +pkgver=2.10.8 pkgrel=1 license=('GPL') arch=('x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=("python2-pyqt4" "python3-pyqt4" 'python3-pyqt5' 'python2-pyqt5' 'qt5-tools') +makedepends=('python3-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip') options=('!buildflags') # Fix Qt Designer plugin -source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz") -md5sums=('0d2b25ad607f93453c37478e83ec4640') - -prepare() { - cp -a QScintilla_gpl-${pkgver}{,-qt4} -} +source=("https://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz") +md5sums=('3f497c0f6bf7ead40b5821b86e1f5421') build() { cd "$srcdir"/QScintilla_gpl-${pkgver} @@ -41,24 +32,6 @@ build() { cd ../Python2 python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 make - - cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5 - qmake qscintilla.pro - make - - cd ../designer-Qt4Qt5 - qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 - make - - cd ../ - cp -rf Python Python2 - cd Python - python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake - make - - cd ../Python2 - python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake - make } package_qscintilla-qt5() { pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class" @@ -103,59 +76,3 @@ package_python2-qscintilla-qt5() { # Provided by python-qscintilla rm -r "${pkgdir}"/usr/share } - -package_qscintilla-qt4() { - pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" - depends=('qt4') - replaces=('qscintilla<2.8.3') - conflicts=('qscintilla<2.8.3') - provides=("qscintilla=$pkgver") - - cd QScintilla_gpl-${pkgver}-qt4/Qt4Qt5 - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - cd ../designer-Qt4Qt5 - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -} - -package_python-qscintilla-qt4-common() { - pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt4 and python2-qscintilla-qt4" - depends=('qscintilla-qt4') - replaces=('python-qscintilla-common<2.8.3') - conflicts=('python-qscintilla-common<2.8.3') - provides=("python-qscintilla-common=$pkgver") - - cd QScintilla_gpl-${pkgver}-qt4/Python - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Provided by python-qscintilla - rm -r "${pkgdir}"/usr/lib -} - -package_python3-qscintilla-qt4() { - pkgdesc="Python 3.x bindings for QScintilla2" - depends=('python-qscintilla-qt4-common' 'python3-pyqt4') - replaces=('python3-qscintilla<2.8.3') - conflicts=('python3-qscintilla<2.8.3') - provides=("python3-qscintilla=$pkgver") - - cd QScintilla_gpl-${pkgver}-qt4/Python - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Provided by python2-qscintilla-common - rm -r "${pkgdir}"/usr/share -} - -package_python2-qscintilla-qt4() { - pkgdesc="Python 2.x bindings for QScintilla2" - depends=('python-qscintilla-qt4-common' 'python2-pyqt4') - replaces=('python2-qscintilla<2.8.3') - conflicts=('python2-qscintilla<2.8.3') - provides=("python2-qscintilla=$pkgver") - - cd QScintilla_gpl-${pkgver}-qt4/Python2 - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Provided by python2-qscintilla-common - rm -r "${pkgdir}"/usr/share -}