From 4f682e8849021a4a376f0c7f7f7970793eb71ec9 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 6 Sep 2015 19:23:55 +0300 Subject: [PATCH] qscintilla2:moved into main for pisi 2.0 --- desktop/toolkit/qscintilla2/actions.py | 71 +++++++++ .../QScintilla-gpl-2.4-fix-linkage.patch | 10 ++ .../files/qscintilla-2.6.2-qt4.patch | 17 +++ desktop/toolkit/qscintilla2/pspec.xml | 135 ++++++++++++++++++ desktop/toolkit/qscintilla2/translations.xml | 30 ++++ 5 files changed, 263 insertions(+) create mode 100644 desktop/toolkit/qscintilla2/actions.py create mode 100644 desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch create mode 100644 desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch create mode 100644 desktop/toolkit/qscintilla2/pspec.xml create mode 100644 desktop/toolkit/qscintilla2/translations.xml diff --git a/desktop/toolkit/qscintilla2/actions.py b/desktop/toolkit/qscintilla2/actions.py new file mode 100644 index 0000000000..3e3dea6335 --- /dev/null +++ b/desktop/toolkit/qscintilla2/actions.py @@ -0,0 +1,71 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import pythonmodules +from pisi.actionsapi import get +from pisi.actionsapi import qt5 + +WorkDir = "QScintilla-gpl-%s" % get.srcVERSION() +NoStrip = ["/usr/share/doc"] + +def setup(): + shelltools.cd("Qt4Qt5") + qt5.configure() + + # Change C/XXFLAGS + pisitools.dosed("Makefile", "^CFLAGS.*\\$\\(DEFINES\\)", "CFLAGS = %s -fPIC $(DEFINES)" % get.CFLAGS()) + pisitools.dosed("Makefile", "^CXXFLAGS.*\\$\\(DEFINES\\)", "CXXFLAGS = %s -fPIC $(DEFINES)" % get.CXXFLAGS()) + + # Get designer plugin's Makefile + shelltools.cd("../designer-Qt4Qt5/") + qt5.configure() + + # Change C/XXFLAGS of designer plugin's makefile + pisitools.dosed("Makefile", "^CFLAGS.*\\$\\(DEFINES\\)", "CFLAGS = %s -fPIC $(DEFINES)" % get.CFLAGS()) + pisitools.dosed("Makefile", "^CXXFLAGS.*\\$\\(DEFINES\\)", "CXXFLAGS = %s -fPIC $(DEFINES)" % get.CXXFLAGS()) + +def build(): + shelltools.system("cp -rf Python Python3") + shelltools.cd("Qt4Qt5") + autotools.make("all staticlib CC=\"%s\" CXX=\"%s\" LINK=\"%s\"" % (get.CC(), get.CXX(), get.CXX())) + + shelltools.cd("../designer-Qt4Qt5/") + autotools.make("DESTDIR=\"%s/%s/designer\"" % (get.installDIR(), qt5.plugindir)) + + # Get Makefile of qscintilla-python via sip + shelltools.cd("../Python") + pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5") + autotools.make() + shelltools.cd("../Python3") + pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5", pyVer = "3") + pisitools.dosed("Makefile", "-lpython3.4", "-lpython3") + autotools.make() + +def install(): + shelltools.cd("Qt4Qt5") + qt5.install() + + shelltools.cd("../designer-Qt4Qt5/") + qt5.install() + + #build and install qscintilla-python + shelltools.cd("../Python3") + autotools.install("DESTDIR=%s" % get.installDIR()) + shelltools.cd("../Python") + autotools.install("DESTDIR=%s" % get.installDIR()) + + shelltools.cd("..") + pisitools.dohtml("doc/html-Qt4Qt5/") + pisitools.insinto("/usr/share/doc/%s/Scintilla" % get.srcNAME(), "doc/Scintilla/*") + + 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 new file mode 100644 index 0000000000..050aba5c2a --- /dev/null +++ b/desktop/toolkit/qscintilla2/files/QScintilla-gpl-2.4-fix-linkage.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 0000000000..43a7e6e6c8 --- /dev/null +++ b/desktop/toolkit/qscintilla2/files/qscintilla-2.6.2-qt4.patch @@ -0,0 +1,17 @@ +--- 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 new file mode 100644 index 0000000000..6833d1ffad --- /dev/null +++ b/desktop/toolkit/qscintilla2/pspec.xml @@ -0,0 +1,135 @@ + + + qscintilla2 + http://www.riverbankcomputing.co.uk/qscintilla/ + + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + GPLv2 + GPLv3 + library + Qt4 port of Scintilla + QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class. + + python-qt5 + python3-devel + python3-sip3 + qt5-base-devel + qt5-designer-devel + sip-devel + + mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9/QScintilla-gpl-2.9.tar.gz + + QScintilla-gpl-2.4-fix-linkage.patch + qscintilla-2.6.2-qt4.patch + + + + qscintilla2 + A pisi packager from GUI + + qt5-base + + + /usr/lib + /usr/lib/qt5/plugins + /usr/share/doc + /usr/share/qt5/mkspecs + /usr/share/qt5/translations + + + + qscintilla2-python-common + Common python qscintilla bindings files shared between qscintilla2-python and qscintilla2-python3 + + qscintilla2 + + + /usr/share/qt5/qsci + /usr/share/sip + + + + qscintilla2-python + Python 2.x bindings for qscintilla2 + + qscintilla2 + qscintilla2-python-common + qt5-base + + + /usr/lib/python2* + + + + qscintilla2-python3 + Python 3.x bindings for qscintilla2 + + python3 + qscintilla2 + qscintilla2-python-common + qt-base + + + /usr/lib/python3* + + + + qscintilla2-doc + HTML documentation for qscintilla2 + + /usr/share/doc/qscintilla2/Scintilla + /usr/share/doc/qscintilla2/html + + + + qscintilla2-devel + Development files for qscintilla2 + + qscintilla2 + + + /usr/include + + + + + 2015-09-04 + 2.9 + version bump + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-05-27 + 2.6.2 + Rebuild for gcc + Osman Erkan + osman.erkan@pisilinux.org + + + 2013-12-21 + 2.6.2 + Fix runtime deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-17 + 2.6.2 + Release bump + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-11 + 2.6.2 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + diff --git a/desktop/toolkit/qscintilla2/translations.xml b/desktop/toolkit/qscintilla2/translations.xml new file mode 100644 index 0000000000..76552aa517 --- /dev/null +++ b/desktop/toolkit/qscintilla2/translations.xml @@ -0,0 +1,30 @@ + + + qscintilla2 + QScintilla2, Neil Hodgson'un Scintilla C++ editör sınıfının bir Qt4 uyarlamasıdır. + Port do Qt klas C++ edytora Scintilla autorstwa Neila Hodgsona. + QScintilla2, Neil Hodgson'un Scintilla C++ editör sınıfının bir Qt4 uyarlamasıdır. + QScintilla jest portem do Qt klas C++ edytora Scintilla autorstwa Neila Hodgsona. + + + qscintilla2-python-common + + + qscintilla2-python + qscintilla2 için Python bağlayıcıları + + + qscintilla2-python3 + + + qscintilla2-doc + qscintilla2 için HTML belgeleri + + + qscintilla2-devel + qscintilla2 için geliştirme dosyaları + Pliki nagłówkowe dla QScintilla + + + +