diff --git a/desktop/toolkit/qscintilla2/actions.py b/desktop/toolkit/qscintilla2/actions.py
index 3e3dea6335..8fb6b159b1 100644
--- a/desktop/toolkit/qscintilla2/actions.py
+++ b/desktop/toolkit/qscintilla2/actions.py
@@ -40,11 +40,14 @@ def build():
# Get Makefile of qscintilla-python via sip
shelltools.cd("../Python")
- pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5")
+ 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", pyVer = "3")
- pisitools.dosed("Makefile", "-lpython3.4", "-lpython3")
+ 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")
+ pisitools.dosed("Makefile", "/usr/include/qt/QtWidgets", "/usr/include/qt5/QtWidgets")
autotools.make()
def install():
@@ -56,16 +59,16 @@ def install():
#build and install qscintilla-python
shelltools.cd("../Python3")
- autotools.install("DESTDIR=%s" % get.installDIR())
+ autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ pisitools.insinto("/usr/lib/python3.4/site-packages/PyQt5", "Qsci.so")
shelltools.cd("../Python")
- autotools.install("DESTDIR=%s" % get.installDIR())
+ autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ pisitools.insinto("/usr/lib/python2.7/site-packages/PyQt5", "Qsci.so")
shelltools.cd("..")
pisitools.dohtml("doc/html-Qt4Qt5/")
pisitools.insinto("/usr/share/doc/%s/Scintilla" % get.srcNAME(), "doc/Scintilla/*")
- pisitools.removeDir("/usr/share/qt4")
+ #pisitools.removeDir("/usr/share/qt4")
pisitools.dodoc("LICENSE*", "NEWS", "README")
-
-# By PiSiDo 2.3.1
diff --git a/desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch b/desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch
deleted file mode 100644
index 050aba5c2a..0000000000
--- a/desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Python/configure.py~ 2009-06-05 11:00:42.000000000 +0200
-+++ Python/configure.py 2009-06-06 11:41:12.000000000 +0200
-@@ -294,6 +294,7 @@
- makefile.extra_include_dirs.append(opts.qsciincdir)
- makefile.extra_lib_dirs.append(opts.qscilibdir)
- makefile.extra_libs.append("qscintilla2")
-+ makefile.extra_libs.append("python" + sys.version[0:3])
-
- makefile.generate()
-
diff --git a/desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch b/desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch
deleted file mode 100644
index 43a7e6e6c8..0000000000
--- a/desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/designer-Qt4/designer.pro 2011-06-13 14:16:23.000000000 +0200
-+++ b/designer-Qt4/designer.pro 2012-10-28 18:05:40.000000000 +0100
-@@ -4,6 +4,8 @@
- TEMPLATE = lib
- TARGET = qscintillaplugin
-
-+INCLUDEPATH = ../Qt4Qt5
-+
- CONFIG += designer release plugin
-
- HEADERS = qscintillaplugin.h
-@@ -12,4 +14,4 @@
- target.path = $$[QT_INSTALL_PLUGINS]/designer
- INSTALLS += target
-
--LIBS += -lqscintilla2
-+LIBS += -L../Qt4Qt5 -lqscintilla2
diff --git a/desktop/toolkit/qscintilla2/pspec.xml b/desktop/toolkit/qscintilla2/pspec.xml
index 1937b4a580..d77d935b02 100644
--- a/desktop/toolkit/qscintilla2/pspec.xml
+++ b/desktop/toolkit/qscintilla2/pspec.xml
@@ -11,15 +11,21 @@
library
Qt port of Scintilla
QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class.
+ mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9.1/QScintilla-gpl-2.9.1.tar.gz
- python3-qt5
+ python-qt5-devel
+ python3-qt5-devel
+ python-devel
python3-devel
python3-sip
- qt5-base-devel
+ python-sip
+ qt5-base-devel
qt5-designer-devel
- sip-devel
-
- mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9/QScintilla-gpl-2.9.tar.gz
+ chrpath
+ qt5-script-devel
+ qt5-xmlpatterns-devel
+ mesa-devel
+
configure.py.patch
libname.patch
@@ -29,6 +35,7 @@
qscintilla2
qt5-base
+ libgcc
/usr/lib
@@ -69,6 +76,7 @@
qscintilla2
qscintilla2-python-common
qt5-base
+ libgcc
/usr/lib/python3*
@@ -89,13 +97,13 @@
qscintilla2
- /usr/include
+ /usr/include/qt5/Qsci
- 2015-09-04
- 2.9
+ 2015-10-24
+ 2.9.1
version bump
Ayhan Yalçınsoy
ayhanyalcinsoy@pisilinux.org