Date: Monday, December 7, 2015 @ 09:27:02 Author: arojas Revision: 149758
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: qscintilla-qt5/repos/community-staging-i686/ qscintilla-qt5/repos/community-staging-i686/ChangeLog (from rev 149757, qscintilla-qt5/trunk/ChangeLog) qscintilla-qt5/repos/community-staging-i686/PKGBUILD (from rev 149757, qscintilla-qt5/trunk/PKGBUILD) qscintilla-qt5/repos/community-staging-i686/configure.py.patch (from rev 149757, qscintilla-qt5/trunk/configure.py.patch) qscintilla-qt5/repos/community-staging-i686/libname.patch (from rev 149757, qscintilla-qt5/trunk/libname.patch) qscintilla-qt5/repos/community-staging-i686/qtdesigner-include.patch (from rev 149757, qscintilla-qt5/trunk/qtdesigner-include.patch) qscintilla-qt5/repos/community-staging-x86_64/ qscintilla-qt5/repos/community-staging-x86_64/ChangeLog (from rev 149757, qscintilla-qt5/trunk/ChangeLog) qscintilla-qt5/repos/community-staging-x86_64/PKGBUILD (from rev 149757, qscintilla-qt5/trunk/PKGBUILD) qscintilla-qt5/repos/community-staging-x86_64/configure.py.patch (from rev 149757, qscintilla-qt5/trunk/configure.py.patch) qscintilla-qt5/repos/community-staging-x86_64/libname.patch (from rev 149757, qscintilla-qt5/trunk/libname.patch) qscintilla-qt5/repos/community-staging-x86_64/qtdesigner-include.patch (from rev 149757, qscintilla-qt5/trunk/qtdesigner-include.patch) ---------------------------------------------------+ community-staging-i686/ChangeLog | 14 +++ community-staging-i686/PKGBUILD | 91 ++++++++++++++++++++ community-staging-i686/configure.py.patch | 48 ++++++++++ community-staging-i686/libname.patch | 50 ++++++++++ community-staging-i686/qtdesigner-include.patch | 12 ++ community-staging-x86_64/ChangeLog | 14 +++ community-staging-x86_64/PKGBUILD | 91 ++++++++++++++++++++ community-staging-x86_64/configure.py.patch | 48 ++++++++++ community-staging-x86_64/libname.patch | 50 ++++++++++ community-staging-x86_64/qtdesigner-include.patch | 12 ++ 10 files changed, 430 insertions(+) Copied: qscintilla-qt5/repos/community-staging-i686/ChangeLog (from rev 149757, qscintilla-qt5/trunk/ChangeLog) =================================================================== --- community-staging-i686/ChangeLog (rev 0) +++ community-staging-i686/ChangeLog 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,14 @@ +2.9-3: +python3.5 rebuild + +2.9-2: +rebuild againist qt-5.5 + +2.9-1: +upstream update + +2.8.4-2: +remov conflict with qsctintilla + +2.8.4-1: +move to [community] Copied: qscintilla-qt5/repos/community-staging-i686/PKGBUILD (from rev 149757, qscintilla-qt5/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,91 @@ +# $Id$ +# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org> +# Maintainer: Ilya87 <yast4ik at yahoo dot com> + +pkgbase=qscintilla-qt5 +pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' + 'python-qscintilla-qt5-common') +pkgver=2.9 +pkgrel=4 +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" +makedepends=('python2-pyqt5' 'python-pyqt5' 'qt5-tools' 'chrpath') +options=('!buildflags') +source=("http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-${pkgver}/QScintilla-gpl-${pkgver}.tar.gz" + 'configure.py.patch' + 'libname.patch' + 'qtdesigner-include.patch') +changelog=ChangeLog +md5sums=('24659879edf9786f41a9b9268ce3c817' + '196ba01efe8bf18f3f2e10826c577a11' + '1ac0fea53f72b0146e0820912ae8c48c' + 'd4591875037808b87acff66bae47f7eb') + +prepare() { + cd "QScintilla-gpl-${pkgver}" + + patch -Np1 -i "${srcdir}/configure.py.patch" + patch -Np1 -i "${srcdir}/libname.patch" + patch -Np1 -i "${srcdir}/qtdesigner-include.patch" + + cp -r Python{,2} + find "Python2" -name '*.py' -type f -exec \ + sed -i 's|env python|env python2|' {} \; +} + +build() { + cd "QScintilla-gpl-${pkgver}/Qt4Qt5" + qmake qscintilla.pro + make + + cd "../designer-Qt4Qt5" + qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + make + + cd "../Python" + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/PyQt5 --qsci-sipdir=/usr/share/sip/PyQt5 --qmake /usr/bin/qmake + make + + cd "../Python2" + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/PyQt5 --qsci-sipdir=/usr/share/sip/PyQt5 --qmake /usr/bin/qmake + make +} + +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 + + 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-gpl-${pkgver}/Python" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # provided by python-qscintilla + rm -r "${pkgdir}/usr/lib/python3.5/site-packages/PyQt5/" +} + +package_python-qscintilla-qt5() { + pkgdesc="Python 3.x bindings for QScintilla2" + depends=('python-qscintilla-qt5-common' 'python-pyqt5') + + cd "QScintilla-gpl-${pkgver}/Python" + install -Dm755 Qsci.so "${pkgdir}/usr/lib/python3.5/site-packages/PyQt5/Qsci.so" +} + +package_python2-qscintilla-qt5() { + pkgdesc="Python 2.x bindings for QScintilla2" + 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" +} Copied: qscintilla-qt5/repos/community-staging-i686/configure.py.patch (from rev 149757, qscintilla-qt5/trunk/configure.py.patch) =================================================================== --- community-staging-i686/configure.py.patch (rev 0) +++ community-staging-i686/configure.py.patch 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,48 @@ +--- QScintilla-gpl-2.9/Python/configure.py.orig 2015-04-20 17:38:24.000000000 +0300 ++++ QScintilla-gpl-2.9/Python/configure.py 2015-04-26 21:54:18.000000000 +0300 +@@ -31,6 +31,7 @@ + import os + import optparse + import sys ++src_dir = os.path.dirname(os.path.abspath(__file__)) + + + ############################################################################### +@@ -206,6 +207,8 @@ + "The QScintilla version number could not be determined by " + "reading %s." % sciglobal) + ++ return # Debian: do not check for the installed version, we're good this way. ++ + lib_dir = target_configuration.qsci_lib_dir + if lib_dir is None: + lib_dir = target_configuration.qt_lib_dir +@@ -260,7 +263,7 @@ + the target configuration. + """ + +- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip' ++ return os.path.join(src_dir, 'sip/qscimod5.sip') if target_configuration.pyqt_package == 'PyQt5' else os.path.join(src_dir, 'sip/qscimod4.sip') + + def get_sip_installs(self, target_configuration): + """ Return a tuple of the installation directory of the module's .sip +@@ -1411,6 +1414,7 @@ + includepath = qmake_config.get('INCLUDEPATH') + if includepath: + pro.write('INCLUDEPATH += %s\n' % includepath) ++ pro.write('INCLUDEPATH += %s\n' % '/usr/include/qt/QtWidgets /usr/include/qt/QtPrintSupport') + + # Make sure the SIP include directory is searched before the Python include + # directory if they are different. +@@ -1420,7 +1424,10 @@ + + libs = qmake_config.get('LIBS') + if libs: +- pro.write('LIBS += %s\n' % libs) ++ if target_config.pyqt_package == 'PyQt5': ++ pro.write('LIBS += %s -lqt5scintilla2\n' % libs) ++ else: ++ pro.write('LIBS += %s -lqscintilla2\n' % libs) + + if not opts.static: + pro.write(''' Copied: qscintilla-qt5/repos/community-staging-i686/libname.patch (from rev 149757, qscintilla-qt5/trunk/libname.patch) =================================================================== --- community-staging-i686/libname.patch (rev 0) +++ community-staging-i686/libname.patch 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,50 @@ +--- QScintilla-gpl-2.8.3/Qt4Qt5/features/qscintilla2.prf~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/Qt4Qt5/features/qscintilla2.prf 2014-08-11 18:04:44.371414609 +0400 +@@ -17,9 +17,18 @@ + win32: { + LIBS += -lqscintilla2d + } else { +- LIBS += -lqscintilla2 ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqt5scintilla2 ++ } else { ++ LIBS += -lqscintilla2 ++ } + } + } + } else { ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqt5scintilla2 ++ } ++ else { + LIBS += -lqscintilla2 ++ } + } +--- QScintilla-gpl-2.8.3/Qt4Qt5/qscintilla.pro~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/Qt4Qt5/qscintilla.pro 2014-08-11 18:00:05.598079386 +0400 +@@ -41,6 +41,7 @@ + + greaterThan(QT_MAJOR_VERSION, 4) { + QT += widgets printsupport ++ TARGET = qt5scintilla2 + + greaterThan(QT_MINOR_VERSION, 1) { + macx:QT += macextras +--- QScintilla-gpl-2.8.3/Qt4Qt5/designer-Qt4Qt5/designer.pro~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/designer-Qt4Qt5/designer.pro 2014-08-11 18:00:05.598079386 +0400 +@@ -8,11 +8,14 @@ + + greaterThan(QT_MAJOR_VERSION, 4) { + QT += designer ++ TARGET = qt5scintillaplugin ++ LIBS += -lqt5scintilla2 + + # Work around QTBUG-39300. + CONFIG -= android_install + } else { + CONFIG += designer ++ LIBS += -lqscintilla2 + } + + macx { + \ No newline at end of file Copied: qscintilla-qt5/repos/community-staging-i686/qtdesigner-include.patch (from rev 149757, qscintilla-qt5/trunk/qtdesigner-include.patch) =================================================================== --- community-staging-i686/qtdesigner-include.patch (rev 0) +++ community-staging-i686/qtdesigner-include.patch 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,12 @@ +diff -ruN QScintilla-gpl-2.9.orig/designer-Qt4Qt5/qscintillaplugin.h QScintilla-gpl-2.9/designer-Qt4Qt5/qscintillaplugin.h +--- QScintilla-gpl-2.9.orig/designer-Qt4Qt5/qscintillaplugin.h 2015-09-19 14:41:37.557741350 +0300 ++++ QScintilla-gpl-2.9/designer-Qt4Qt5/qscintillaplugin.h 2015-09-19 14:41:58.393662846 +0300 +@@ -4,7 +4,7 @@ + #ifndef _QSCINTILLAPLUGIN_H + #define _QSCINTILLAPLUGIN_H + +-#include <QDesignerCustomWidgetInterface> ++#include <QtUiPlugin/QDesignerCustomWidgetInterface> + + + class QScintillaPlugin : public QObject, public QDesignerCustomWidgetInterface Copied: qscintilla-qt5/repos/community-staging-x86_64/ChangeLog (from rev 149757, qscintilla-qt5/trunk/ChangeLog) =================================================================== --- community-staging-x86_64/ChangeLog (rev 0) +++ community-staging-x86_64/ChangeLog 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,14 @@ +2.9-3: +python3.5 rebuild + +2.9-2: +rebuild againist qt-5.5 + +2.9-1: +upstream update + +2.8.4-2: +remov conflict with qsctintilla + +2.8.4-1: +move to [community] Copied: qscintilla-qt5/repos/community-staging-x86_64/PKGBUILD (from rev 149757, qscintilla-qt5/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,91 @@ +# $Id$ +# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org> +# Maintainer: Ilya87 <yast4ik at yahoo dot com> + +pkgbase=qscintilla-qt5 +pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5' + 'python-qscintilla-qt5-common') +pkgver=2.9 +pkgrel=4 +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" +makedepends=('python2-pyqt5' 'python-pyqt5' 'qt5-tools' 'chrpath') +options=('!buildflags') +source=("http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-${pkgver}/QScintilla-gpl-${pkgver}.tar.gz" + 'configure.py.patch' + 'libname.patch' + 'qtdesigner-include.patch') +changelog=ChangeLog +md5sums=('24659879edf9786f41a9b9268ce3c817' + '196ba01efe8bf18f3f2e10826c577a11' + '1ac0fea53f72b0146e0820912ae8c48c' + 'd4591875037808b87acff66bae47f7eb') + +prepare() { + cd "QScintilla-gpl-${pkgver}" + + patch -Np1 -i "${srcdir}/configure.py.patch" + patch -Np1 -i "${srcdir}/libname.patch" + patch -Np1 -i "${srcdir}/qtdesigner-include.patch" + + cp -r Python{,2} + find "Python2" -name '*.py' -type f -exec \ + sed -i 's|env python|env python2|' {} \; +} + +build() { + cd "QScintilla-gpl-${pkgver}/Qt4Qt5" + qmake qscintilla.pro + make + + cd "../designer-Qt4Qt5" + qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + make + + cd "../Python" + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/PyQt5 --qsci-sipdir=/usr/share/sip/PyQt5 --qmake /usr/bin/qmake + make + + cd "../Python2" + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/PyQt5 --qsci-sipdir=/usr/share/sip/PyQt5 --qmake /usr/bin/qmake + make +} + +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 + + 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-gpl-${pkgver}/Python" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # provided by python-qscintilla + rm -r "${pkgdir}/usr/lib/python3.5/site-packages/PyQt5/" +} + +package_python-qscintilla-qt5() { + pkgdesc="Python 3.x bindings for QScintilla2" + depends=('python-qscintilla-qt5-common' 'python-pyqt5') + + cd "QScintilla-gpl-${pkgver}/Python" + install -Dm755 Qsci.so "${pkgdir}/usr/lib/python3.5/site-packages/PyQt5/Qsci.so" +} + +package_python2-qscintilla-qt5() { + pkgdesc="Python 2.x bindings for QScintilla2" + 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" +} Copied: qscintilla-qt5/repos/community-staging-x86_64/configure.py.patch (from rev 149757, qscintilla-qt5/trunk/configure.py.patch) =================================================================== --- community-staging-x86_64/configure.py.patch (rev 0) +++ community-staging-x86_64/configure.py.patch 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,48 @@ +--- QScintilla-gpl-2.9/Python/configure.py.orig 2015-04-20 17:38:24.000000000 +0300 ++++ QScintilla-gpl-2.9/Python/configure.py 2015-04-26 21:54:18.000000000 +0300 +@@ -31,6 +31,7 @@ + import os + import optparse + import sys ++src_dir = os.path.dirname(os.path.abspath(__file__)) + + + ############################################################################### +@@ -206,6 +207,8 @@ + "The QScintilla version number could not be determined by " + "reading %s." % sciglobal) + ++ return # Debian: do not check for the installed version, we're good this way. ++ + lib_dir = target_configuration.qsci_lib_dir + if lib_dir is None: + lib_dir = target_configuration.qt_lib_dir +@@ -260,7 +263,7 @@ + the target configuration. + """ + +- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip' ++ return os.path.join(src_dir, 'sip/qscimod5.sip') if target_configuration.pyqt_package == 'PyQt5' else os.path.join(src_dir, 'sip/qscimod4.sip') + + def get_sip_installs(self, target_configuration): + """ Return a tuple of the installation directory of the module's .sip +@@ -1411,6 +1414,7 @@ + includepath = qmake_config.get('INCLUDEPATH') + if includepath: + pro.write('INCLUDEPATH += %s\n' % includepath) ++ pro.write('INCLUDEPATH += %s\n' % '/usr/include/qt/QtWidgets /usr/include/qt/QtPrintSupport') + + # Make sure the SIP include directory is searched before the Python include + # directory if they are different. +@@ -1420,7 +1424,10 @@ + + libs = qmake_config.get('LIBS') + if libs: +- pro.write('LIBS += %s\n' % libs) ++ if target_config.pyqt_package == 'PyQt5': ++ pro.write('LIBS += %s -lqt5scintilla2\n' % libs) ++ else: ++ pro.write('LIBS += %s -lqscintilla2\n' % libs) + + if not opts.static: + pro.write(''' Copied: qscintilla-qt5/repos/community-staging-x86_64/libname.patch (from rev 149757, qscintilla-qt5/trunk/libname.patch) =================================================================== --- community-staging-x86_64/libname.patch (rev 0) +++ community-staging-x86_64/libname.patch 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,50 @@ +--- QScintilla-gpl-2.8.3/Qt4Qt5/features/qscintilla2.prf~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/Qt4Qt5/features/qscintilla2.prf 2014-08-11 18:04:44.371414609 +0400 +@@ -17,9 +17,18 @@ + win32: { + LIBS += -lqscintilla2d + } else { +- LIBS += -lqscintilla2 ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqt5scintilla2 ++ } else { ++ LIBS += -lqscintilla2 ++ } + } + } + } else { ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqt5scintilla2 ++ } ++ else { + LIBS += -lqscintilla2 ++ } + } +--- QScintilla-gpl-2.8.3/Qt4Qt5/qscintilla.pro~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/Qt4Qt5/qscintilla.pro 2014-08-11 18:00:05.598079386 +0400 +@@ -41,6 +41,7 @@ + + greaterThan(QT_MAJOR_VERSION, 4) { + QT += widgets printsupport ++ TARGET = qt5scintilla2 + + greaterThan(QT_MINOR_VERSION, 1) { + macx:QT += macextras +--- QScintilla-gpl-2.8.3/Qt4Qt5/designer-Qt4Qt5/designer.pro~ 2014-07-03 14:15:46.000000000 +0400 ++++ QScintilla-gpl-2.8.3/designer-Qt4Qt5/designer.pro 2014-08-11 18:00:05.598079386 +0400 +@@ -8,11 +8,14 @@ + + greaterThan(QT_MAJOR_VERSION, 4) { + QT += designer ++ TARGET = qt5scintillaplugin ++ LIBS += -lqt5scintilla2 + + # Work around QTBUG-39300. + CONFIG -= android_install + } else { + CONFIG += designer ++ LIBS += -lqscintilla2 + } + + macx { + \ No newline at end of file Copied: qscintilla-qt5/repos/community-staging-x86_64/qtdesigner-include.patch (from rev 149757, qscintilla-qt5/trunk/qtdesigner-include.patch) =================================================================== --- community-staging-x86_64/qtdesigner-include.patch (rev 0) +++ community-staging-x86_64/qtdesigner-include.patch 2015-12-07 08:27:02 UTC (rev 149758) @@ -0,0 +1,12 @@ +diff -ruN QScintilla-gpl-2.9.orig/designer-Qt4Qt5/qscintillaplugin.h QScintilla-gpl-2.9/designer-Qt4Qt5/qscintillaplugin.h +--- QScintilla-gpl-2.9.orig/designer-Qt4Qt5/qscintillaplugin.h 2015-09-19 14:41:37.557741350 +0300 ++++ QScintilla-gpl-2.9/designer-Qt4Qt5/qscintillaplugin.h 2015-09-19 14:41:58.393662846 +0300 +@@ -4,7 +4,7 @@ + #ifndef _QSCINTILLAPLUGIN_H + #define _QSCINTILLAPLUGIN_H + +-#include <QDesignerCustomWidgetInterface> ++#include <QtUiPlugin/QDesignerCustomWidgetInterface> + + + class QScintillaPlugin : public QObject, public QDesignerCustomWidgetInterface