[arch-commits] Commit in qscintilla/trunk (3 files)
Felix Yan
fyan at archlinux.org
Thu Jun 9 03:52:37 UTC 2016
Date: Thursday, June 9, 2016 @ 05:52:37
Author: fyan
Revision: 269159
upgpkg: qscintilla 2.9.2-1
Added:
qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch
Modified:
qscintilla/trunk/PKGBUILD
Deleted:
qscintilla/trunk/QScintilla-gpl-2.9.1-qt5.patch
--------------------------------+
PKGBUILD | 50 ++++++++++++++++++++++-----------------
QScintilla-gpl-2.9.1-qt5.patch | 37 ----------------------------
QScintilla_gpl-2.9.2-qt5.patch | 36 ++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 58 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-06-08 20:43:05 UTC (rev 269158)
+++ PKGBUILD 2016-06-09 03:52:37 UTC (rev 269159)
@@ -8,30 +8,30 @@
'python-qscintilla-qt4-common'
'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
'python-qscintilla-qt5-common')
-pkgver=2.9.1
-pkgrel=3
+pkgver=2.9.2
+pkgrel=1
license=('GPL')
arch=('i686' 'x86_64')
url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
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' 'QScintilla-gpl-2.9.1-qt5.patch')
-md5sums=('38e6248cb970adf6d05aea7d94f1288e'
+source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz"
+ 'configure.py-objdir-support.diff' 'QScintilla_gpl-2.9.2-qt5.patch')
+md5sums=('db260651a5e086cc4eee6417172e27e8'
'0a952497a52c85bf5c09dd2ee091e763'
- '9a47f9f990a8a1a8752e144f3351af0a')
+ 'd7b1504fc0c61042a85e44792e462b37')
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}
+ cp -a QScintilla_gpl-${pkgver}{,-qt4}
# Patch from Fedora
- (cd QScintilla-gpl-${pkgver}; patch -p1 -i "${srcdir}"/QScintilla-gpl-2.9.1-qt5.patch)
+ (cd QScintilla_gpl-${pkgver}; patch -p1 -i "${srcdir}"/QScintilla_gpl-2.9.2-qt5.patch)
}
build() {
- cd "$srcdir"/QScintilla-gpl-${pkgver}/Qt4Qt5
+ cd "$srcdir"/QScintilla_gpl-${pkgver}/Qt4Qt5
qmake-qt5 qscintilla.pro
make
@@ -49,7 +49,7 @@
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
+ cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
qmake-qt4 qscintilla.pro
make
@@ -72,7 +72,7 @@
pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
depends=('qt5-base')
- cd QScintilla-gpl-${pkgver}/Qt4Qt5
+ cd QScintilla_gpl-${pkgver}/Qt4Qt5
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
cd ../designer-Qt4Qt5
@@ -83,11 +83,11 @@
pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5"
depends=('qscintilla-qt5')
- cd 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.5/site-packages/PyQt5/Qsci.so
+ rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci{.so,.pyi}
rmdir "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5
}
@@ -95,9 +95,11 @@
pkgdesc="Python 3.x bindings for QScintilla2"
depends=('python-qscintilla-qt5-common' 'python-pyqt5')
- cd QScintilla-gpl-${pkgver}/Python
+ cd QScintilla_gpl-${pkgver}/Python
install -Dm755 Qsci.so \
"${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.so
+ install -Dm755 Qsci.pyi \
+ "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt5/Qsci.pyi
}
package_python2-qscintilla-qt5() {
@@ -104,9 +106,11 @@
pkgdesc="Python 2.x bindings for QScintilla2"
depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
- cd QScintilla-gpl-${pkgver}/Python2
+ cd QScintilla_gpl-${pkgver}/Python2
install -Dm755 Qsci.so \
"${pkgdir}"/usr/lib/python2.7/site-packages/PyQt5/Qsci.so
+ install -Dm755 Qsci.pyi \
+ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt5/Qsci.pyi
}
package_qscintilla-qt4() {
@@ -116,7 +120,7 @@
conflicts=('qscintilla<2.9.1')
provides=("qscintilla=$pkgver")
- cd QScintilla-gpl-${pkgver}-qt4/Qt4Qt5
+ cd QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
cd ../designer-Qt4Qt5
@@ -130,11 +134,11 @@
conflicts=('python-qscintilla-common<2.9.1')
provides=("python-qscintilla-common=$pkgver")
- cd QScintilla-gpl-${pkgver}-qt4/Python
+ 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
+ rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci{.so,.pyi}
rmdir "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4
}
@@ -145,9 +149,11 @@
conflicts=('python-qscintilla<2.9.1')
provides=("python-qscintilla=$pkgver")
- cd QScintilla-gpl-${pkgver}-qt4/Python
+ cd QScintilla_gpl-${pkgver}-qt4/Python
install -Dm755 Qsci.so \
"${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+ install -Dm755 Qsci.pyi \
+ "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.pyi
}
package_python2-qscintilla-qt4() {
@@ -157,7 +163,9 @@
conflicts=('python2-qscintilla<2.9.1')
provides=("python2-qscintilla=$pkgver")
- cd QScintilla-gpl-${pkgver}-qt4/Python2
+ cd QScintilla_gpl-${pkgver}-qt4/Python2
install -Dm755 Qsci.so \
"${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+ install -Dm755 Qsci.pyi \
+ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.pyi
}
Deleted: QScintilla-gpl-2.9.1-qt5.patch
===================================================================
--- QScintilla-gpl-2.9.1-qt5.patch 2016-06-08 20:43:05 UTC (rev 269158)
+++ QScintilla-gpl-2.9.1-qt5.patch 2016-06-09 03:52:37 UTC (rev 269159)
@@ -1,37 +0,0 @@
-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
-
Added: QScintilla_gpl-2.9.2-qt5.patch
===================================================================
--- QScintilla_gpl-2.9.2-qt5.patch (rev 0)
+++ QScintilla_gpl-2.9.2-qt5.patch 2016-06-09 03:52:37 UTC (rev 269159)
@@ -0,0 +1,36 @@
+diff -up QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
+--- QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 2016-04-18 04:08:48.000000000 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf 2016-04-18 08:13:23.935665305 -0500
+@@ -19,9 +19,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.2/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
+--- QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 2016-04-18 08:13:23.951665381 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro 2016-04-18 08:14:20.807934597 -0500
+@@ -23,7 +23,11 @@
+ !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 hide_symbols
+ INCLUDEPATH += . ../include ../lexlib ../src
+
More information about the arch-commits
mailing list