From c52e1ee7a3cc65a5f8811169337ace54b5a89669 Mon Sep 17 00:00:00 2001 From: aydemir Date: Fri, 30 Oct 2015 16:41:36 +0200 Subject: [PATCH] qscintilla2 --- desktop/toolkit/qscintilla2/actions.py | 6 +++--- desktop/toolkit/qscintilla2/pspec.xml | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/desktop/toolkit/qscintilla2/actions.py b/desktop/toolkit/qscintilla2/actions.py index 3e1560169f..63c8a803b6 100644 --- a/desktop/toolkit/qscintilla2/actions.py +++ b/desktop/toolkit/qscintilla2/actions.py @@ -34,17 +34,17 @@ def build(): shelltools.system("cp -rf Python Python3") shelltools.cd("Qt4Qt5") qt5.make() - + shelltools.cd("../designer-Qt4Qt5/") qt5.make() - + # Get Makefile of qscintilla-python via sip shelltools.cd("../Python") pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/Py2Qt5 --qsci-sipdir=/usr/share/sip/Py2Qt5 --sip-incdir=/usr/lib/python2.7/site-packages --qmake /usr/bin/qmake-qt5") pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport") pisitools.dosed("Makefile", "/usr/include/qt/QtWidgets", "/usr/include/qt5/QtWidgets") autotools.make() - + shelltools.cd("../Python3") pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --qmake /usr/bin/qmake-qt5", pyVer = "3") pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport") diff --git a/desktop/toolkit/qscintilla2/pspec.xml b/desktop/toolkit/qscintilla2/pspec.xml index d77d935b02..793f910987 100644 --- a/desktop/toolkit/qscintilla2/pspec.xml +++ b/desktop/toolkit/qscintilla2/pspec.xml @@ -25,7 +25,7 @@ qt5-script-devel qt5-xmlpatterns-devel mesa-devel - + configure.py.patch libname.patch @@ -138,5 +138,3 @@ - -