[arch-commits] Commit in qscintilla/trunk (PKGBUILD QScintilla-gpl-2.9.1-qt5.patch)
Felix Yan
fyan at archlinux.org
Thu Jan 14 08:56:53 UTC 2016
Date: Thursday, January 14, 2016 @ 09:56:53
Author: fyan
Revision: 258284
upgpkg: qscintilla 2.9.1-1
add qt5 counterpart and rename the qt4 one
Added:
qscintilla/trunk/QScintilla-gpl-2.9.1-qt5.patch
Modified:
qscintilla/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 125 +++++++++++++++++++++++++++++++--------
QScintilla-gpl-2.9.1-qt5.patch | 37 +++++++++++
2 files changed, 139 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-14 08:14:52 UTC (rev 258283)
+++ PKGBUILD 2016-01-14 08:56:53 UTC (rev 258284)
@@ -4,27 +4,52 @@
# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
- 'python-qscintilla-common')
-pkgver=2.9
-pkgrel=3
+pkgname=('qscintilla-qt4' 'python-qscintilla-qt4' 'python2-qscintilla-qt4'
+ 'python-qscintilla-qt4-common'
+ 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
+ 'python-qscintilla-qt5-common')
+pkgver=2.9.1
+pkgrel=1
license=('GPL')
arch=('i686' 'x86_64')
url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
+makedepends=('python-pyqt4' 'python2-pyqt4' 'python-pyqt5' 'python2-pyqt5' 'qt5-tools')
options=('!buildflags') # Fix Qt Designer plugin
source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
- 'configure.py-objdir-support.diff')
-md5sums=('24659879edf9786f41a9b9268ce3c817'
- '0a952497a52c85bf5c09dd2ee091e763')
+ 'configure.py-objdir-support.diff' 'QScintilla-gpl-2.9.1-qt5.patch')
+md5sums=('38e6248cb970adf6d05aea7d94f1288e'
+ '0a952497a52c85bf5c09dd2ee091e763'
+ '9a47f9f990a8a1a8752e144f3351af0a')
prepare() {
- cd QScintilla-gpl-${pkgver}
- patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
+ (cd QScintilla-gpl-${pkgver}; patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff)
+
+ cp -a QScintilla-gpl-${pkgver}{,-qt4}
+
+ # Patch from Fedora
+ (cd QScintilla-gpl-${pkgver}; patch -p1 -i "${srcdir}"/QScintilla-gpl-2.9.1-qt5.patch)
}
build() {
- cd QScintilla-gpl-${pkgver}/Qt4Qt5
+ cd "$srcdir"/QScintilla-gpl-${pkgver}/Qt4Qt5
+ qmake-qt5 qscintilla.pro
+ make
+
+ cd ../designer-Qt4Qt5
+ QMAKEFEATURES=../Qt4Qt5/features qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+ make
+
+ cd ../
+ cp -rf Python Python2
+ cd Python
+ QMAKEFEATURES=../Qt4Qt5/features python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+ make
+
+ cd ../Python2
+ QMAKEFEATURES=../Qt4Qt5/features python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5
+ make
+
+ cd "$srcdir"/QScintilla-gpl-${pkgver}-qt4/Qt4Qt5
qmake-qt4 qscintilla.pro
make
@@ -43,9 +68,9 @@
make
}
-package_qscintilla() {
- pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
- depends=('qt4')
+package_qscintilla-qt5() {
+ pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
+ depends=('qt5-base')
cd QScintilla-gpl-${pkgver}/Qt4Qt5
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
@@ -54,31 +79,85 @@
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
}
-package_python-qscintilla-common() {
- pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
- depends=('qscintilla')
+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-gpl-${pkgver}/Python
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
# Provided by python-qscintilla
- rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+ rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.so
+ rmdir "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5
}
-package_python-qscintilla() {
+package_python-qscintilla-qt5() {
pkgdesc="Python 3.x bindings for QScintilla2"
- depends=('python-qscintilla-common' 'python-pyqt4')
+ depends=('python-qscintilla-qt5-common' 'python-pyqt5')
cd QScintilla-gpl-${pkgver}/Python
install -Dm755 Qsci.so \
- "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+ "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.so
}
-package_python2-qscintilla() {
+package_python2-qscintilla-qt5() {
pkgdesc="Python 2.x bindings for QScintilla2"
- depends=('python-qscintilla-common' 'python2-pyqt4')
+ depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
cd QScintilla-gpl-${pkgver}/Python2
install -Dm755 Qsci.so \
+ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt5/Qsci.so
+}
+
+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=('qscintilla-common<2.9.1')
+ conflicts=('qscintilla-common<2.9.1')
+ provides=("qscintilla-common=$pkgver")
+
+ cd QScintilla-gpl-${pkgver}-qt4/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla
+ rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+ rmdir "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4
+}
+
+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
+ install -Dm755 Qsci.so \
+ "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+}
+
+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
+ install -Dm755 Qsci.so \
"${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
}
Added: QScintilla-gpl-2.9.1-qt5.patch
===================================================================
--- QScintilla-gpl-2.9.1-qt5.patch (rev 0)
+++ QScintilla-gpl-2.9.1-qt5.patch 2016-01-14 08:56:53 UTC (rev 258284)
@@ -0,0 +1,37 @@
+diff -up QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf
+--- QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf.qt5 2015-10-24 08:00:37.000000000 -0500
++++ QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf 2015-10-24 10:44:02.960900703 -0500
+@@ -17,9 +17,17 @@ CONFIG(debug, debug|release) {
+ win32: {
+ LIBS += -lqscintilla2d
+ } else {
++ greaterThan(QT_MAJOR_VERSION, 4) {
++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++ } else {
+ LIBS += -lqscintilla2
+ }
++ }
+ }
+ } else {
++greaterThan(QT_MAJOR_VERSION, 4) {
++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+ LIBS += -lqscintilla2
+ }
++}
+diff -up QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro
+--- QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro.qt5 2015-10-24 10:44:02.961900732 -0500
++++ QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro 2015-10-24 10:45:16.445068859 -0500
+@@ -23,7 +23,12 @@
+ !win32:VERSION = 12.0.1
+
+ TEMPLATE = lib
++greaterThan(QT_MAJOR_VERSION, 4) {
++TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+ TARGET = qscintilla2
++}
++
+ CONFIG += qt warn_off release thread exceptions
+ INCLUDEPATH += . ../include ../lexlib ../src
+
More information about the arch-commits
mailing list