Date: Wednesday, November 19, 2014 @ 13:37:34 Author: fyan Revision: 226387
upgpkg: qscintilla 2.8.4-3 use QMAKEFEATURES as suggested Modified: qscintilla/trunk/PKGBUILD Deleted: qscintilla/trunk/qsci_link.patch -----------------+ PKGBUILD | 15 ++++++--------- qsci_link.patch | 16 ---------------- 2 files changed, 6 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-19 10:16:35 UTC (rev 226386) +++ PKGBUILD 2014-11-19 12:37:34 UTC (rev 226387) @@ -6,7 +6,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.8.4 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -13,16 +13,13 @@ makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath') options=('!buildflags') # Fix Qt Designer plugin source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" - 'configure.py-objdir-support.diff' - 'qsci_link.patch') + 'configure.py-objdir-support.diff') md5sums=('28aec903ff48ae541295a4fb9c96f8ea' - 'e304f8cd5e3e7ded61eda15bf56613a8' - '3bb99cf0ebbf9bea6a1d0f9067dc7124') + 'e304f8cd5e3e7ded61eda15bf56613a8') prepare() { cd QScintilla-gpl-${pkgver} patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff - patch -p1 -i "${srcdir}"/qsci_link.patch } build() { @@ -31,17 +28,17 @@ make cd ../designer-Qt4Qt5 - qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + QMAKEFEATURES=../Qt4Qt5/features qmake-qt4 designer.pro 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 + QMAKEFEATURES=../Qt4Qt5/features python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make cd ../Python2 - python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 + QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make } Deleted: qsci_link.patch =================================================================== --- qsci_link.patch 2014-11-19 10:16:35 UTC (rev 226386) +++ qsci_link.patch 2014-11-19 12:37:34 UTC (rev 226387) @@ -1,16 +0,0 @@ -Index: qscintilla2-2.8.3+dfsg/Python/configure.py -=================================================================== ---- qscintilla2-2.8.3+dfsg.orig/Python/configure.py 2014-07-05 10:05:48.614827688 -0400 -+++ qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-05 10:05:48.610827688 -0400 -@@ -1434,7 +1434,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('''