[arch-commits] Commit in qscintilla/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Friday, August 24, 2018 @ 07:36:01
  Author: arojas
Revision: 332927

Drop Qt4 support

Modified:
  qscintilla/trunk/PKGBUILD

----------+
 PKGBUILD |   86 ++-----------------------------------------------------------
 1 file changed, 3 insertions(+), 83 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-24 07:22:04 UTC (rev 332926)
+++ PKGBUILD	2018-08-24 07:36:01 UTC (rev 332927)
@@ -4,24 +4,18 @@
 # Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
 
 pkgbase=qscintilla
-pkgname=('qscintilla-qt4' 'python-qscintilla-qt4' 'python2-qscintilla-qt4'
-         'python-qscintilla-qt4-common'
-         'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
+pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
          'python-qscintilla-qt5-common')
 pkgver=2.10.7
-pkgrel=2
+pkgrel=3
 license=('GPL')
 arch=('x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python-pyqt4' 'python2-pyqt4' 'python-pyqt5' 'python2-pyqt5' 'qt5-tools')
+makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip')
 options=('!buildflags') # Fix Qt Designer plugin
 source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz")
 sha256sums=('670458de71dd4205e92d8f3b7bad9f667afece925703cde9df6d04bc23331a1a')
 
-prepare() {
-  cp -a QScintilla_gpl-${pkgver}{,-qt4}
-}
-
 build() {
     cd "$srcdir"/QScintilla_gpl-${pkgver}
     export QMAKEFEATURES=$PWD/Qt4Qt5/features/
@@ -43,24 +37,6 @@
     cd ../Python2
     python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5  --no-dist-info
     make
-
-    cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
-    qmake-qt4
-    make
-
-    cd ../designer-Qt4Qt5
-    qmake-qt4 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-    make
-
-    cd ../
-    cp -rf Python Python2
-    cd Python
-    python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 --no-dist-info
-    make
-
-    cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 --no-dist-info
-    make
 }
 
 package_qscintilla-qt5() {
@@ -106,59 +82,3 @@
     # 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.9.1')
-    conflicts=('qscintilla<2.9.1')
-    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.9.1')
-    conflicts=('python-qscintilla-common<2.9.1')
-    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_python-qscintilla-qt4() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-qt4-common' 'python-pyqt4')
-    replaces=('python-qscintilla<2.9.1')
-    conflicts=('python-qscintilla<2.9.1')
-    provides=("python-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.9.1')
-    conflicts=('python2-qscintilla<2.9.1')
-    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
-}