[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Antonio Rojas
arojas at archlinux.org
Sat Nov 9 12:36:37 UTC 2019
Date: Saturday, November 9, 2019 @ 12:36:37
Author: arojas
Revision: 367239
Drop python2
Modified:
qscintilla/trunk/PKGBUILD
----------+
PKGBUILD | 52 +++++++++++-----------------------------------------
1 file changed, 11 insertions(+), 41 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-09 12:12:28 UTC (rev 367238)
+++ PKGBUILD 2019-11-09 12:36:37 UTC (rev 367239)
@@ -1,16 +1,16 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
# Contributor: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
pkgbase=qscintilla
-pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
- 'python-qscintilla-qt5-common')
+pkgname=('qscintilla-qt5' 'python-qscintilla-qt5')
pkgver=2.11.3
-pkgrel=3
+pkgrel=4
license=('GPL')
arch=('x86_64')
url="https://www.riverbankcomputing.com/software/qscintilla/intro"
-makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip')
+makedepends=('python-pyqt5' 'qt5-tools' 'sip')
options=('!buildflags') # Fix Qt Designer plugin
source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz")
sha256sums=('cfadbb7f32fb8a9404fbe5db0ad14ac02229ebdf30a519141236080236ae2dd6')
@@ -27,57 +27,27 @@
qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
make
- cd ../
- cp -rf Python Python2
- cd Python
+ cd ../Python
python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
make
-
- cd ../Python2
- python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
- make
}
package_qscintilla-qt5() {
pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
- depends=('qt5-base')
+ depends=(qt5-base)
cd QScintilla-${pkgver}/Qt4Qt5
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
cd ../designer-Qt4Qt5
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
}
-package_python-qscintilla-qt5-common() {
- pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5"
- depends=('qscintilla-qt5')
-
- cd QScintilla-${pkgver}/Python
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1
-
- # Provided by python-qscintilla
- rm -r "${pkgdir}"/usr/lib
-}
-
package_python-qscintilla-qt5() {
- pkgdesc="Python 3.x bindings for QScintilla2"
- depends=('python-qscintilla-qt5-common' 'python-pyqt5')
+ pkgdesc="Python bindings for QScintilla2"
+ depends=(qscintilla-qt5 python-pyqt5)
+ replaces=(python-qscintilla-qt5-common)
cd QScintilla-${pkgver}/Python
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1
-
- # Provided by python-qscintilla-common
- rm -r "${pkgdir}"/usr/share
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
}
-
-package_python2-qscintilla-qt5() {
- pkgdesc="Python 2.x bindings for QScintilla2"
- depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
-
- cd QScintilla-${pkgver}/Python2
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1
-
- # Provided by python-qscintilla
- rm -r "${pkgdir}"/usr/share
-}
More information about the arch-commits
mailing list