diff --git a/desktop/toolkit/qscintilla2/actions.py b/desktop/toolkit/qscintilla2/actions.py
index b9b577b366..fd02ca6354 100644
--- a/desktop/toolkit/qscintilla2/actions.py
+++ b/desktop/toolkit/qscintilla2/actions.py
@@ -11,11 +11,11 @@ from pisi.actionsapi import pythonmodules
from pisi.actionsapi import get
from pisi.actionsapi import qt5
-#WorkDir = "QScintilla_gpl-%s" % get.srcVERSION()
+WorkDir = "QScintilla_src-%s" % get.srcVERSION()
NoStrip = ["/usr/share/doc"]
def setup():
- shelltools.cd("Qt4Qt5")
+ shelltools.cd("src")
shelltools.system("qmake qscintilla.pro")
# Change C/XXFLAGS
@@ -23,8 +23,8 @@ def setup():
pisitools.dosed("Makefile", "^CXXFLAGS.*\\$\\(DEFINES\\)", "CXXFLAGS = %s -fPIC $(DEFINES)" % get.CXXFLAGS())
# Get designer plugin's Makefile
- shelltools.cd("../designer-Qt4Qt5/")
- shelltools.system("qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5")
+ shelltools.cd("../designer/")
+ shelltools.system("qmake designer.pro INCLUDEPATH+=../src QMAKE_LIBDIR+=../src")
# Change C/XXFLAGS of designer plugin's makefile
pisitools.dosed("Makefile", "^CFLAGS.*\\$\\(DEFINES\\)", "CFLAGS = %s -fPIC $(DEFINES)" % get.CFLAGS())
@@ -32,44 +32,55 @@ def setup():
def build():
shelltools.system("cp -rf Python Python3")
- shelltools.cd("Qt4Qt5")
+ shelltools.cd("src")
qt5.make()
- shelltools.cd("../designer-Qt4Qt5/")
+ shelltools.cd("../designer/")
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")
- 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("../Python")
+ # pythonmodules.run("configure.py -n ../src -o ../src -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 --sip=/usr/bin/py2sip")
+ # 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", pyVer = "3")
+ shelltools.sym("pyproject-qt5.toml", "pyproject.toml")
+ shelltools.system("sip-build \
+ --no-make \
+ --qsci-features-dir ../src/features \
+ --qsci-include-dir ../src \
+ --qsci-library-dir ../src \
+ --api-dir /usr/share/qt5/qsci/api/python")
+ # pythonmodules.run("configure.py -n ../src -o ../src -c --pyqt=PyQt5 --qmake /usr/bin/qmake", pyVer = "3")
+
+ shelltools.cd("../Python3/build")
pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport")
pisitools.dosed("Makefile", "/usr/include/qt/QtWidgets", "/usr/include/qt5/QtWidgets")
autotools.make()
def install():
- shelltools.cd("Qt4Qt5")
+ shelltools.cd("src")
qt5.install("INSTALL_ROOT=%s" % get.installDIR())
- shelltools.cd("../designer-Qt4Qt5/")
+ shelltools.cd("../designer/")
qt5.install("INSTALL_ROOT=%s" % get.installDIR())
#build and install qscintilla-python
- shelltools.cd("../Python3")
+ shelltools.cd("../Python3/build")
#autotools.rawInstall("DESTDIR=%s" % get.installDIR())
qt5.install("INSTALL_ROOT=%s" % get.installDIR())
#pisitools.insinto("/usr/lib/python3.6/site-packages/PyQt5", "Qsci.so")
- shelltools.cd("../Python")
+ # shelltools.cd("../Python")
#autotools.rawInstall("DESTDIR=%s" % get.installDIR())
- qt5.install("INSTALL_ROOT=%s" % get.installDIR())
+ # qt5.install("INSTALL_ROOT=%s" % get.installDIR())
#pisitools.insinto("/usr/lib/python2.7/site-packages/PyQt5", "Qsci.so")
- shelltools.cd("..")
- pisitools.dohtml("doc/html-Qt4Qt5/")
+ # shelltools.cd("..")
+ pisitools.dohtml("../../doc/html/")
+
+ shelltools.cd("../..")
pisitools.insinto("/usr/share/doc/%s/Scintilla" % get.srcNAME(), "doc/Scintilla/*")
pisitools.dodoc("LICENSE*", "NEWS")
diff --git a/desktop/toolkit/qscintilla2/pspec.xml b/desktop/toolkit/qscintilla2/pspec.xml
index 867c0f2148..b3f44e0aa5 100644
--- a/desktop/toolkit/qscintilla2/pspec.xml
+++ b/desktop/toolkit/qscintilla2/pspec.xml
@@ -13,13 +13,15 @@
library
Qt port of Scintilla
QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class.
- https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.6/QScintilla-2.11.6.tar.gz
+ https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.4/QScintilla_src-2.13.4.tar.gz
chrpath
python-sip
python3-sip
python-devel
+ pyqt-builder
python3-devel
+ python3-setuptools
qscintilla2-python-common
mesa-devel
qt5-base-devel
@@ -113,7 +115,7 @@
2023-04-11
- 2.11.6
+ 2.13.4
Version bump.
Mustafa Cinasal
muscnsl@gmail.com