qscintilla 2.5.1-1 màj port

5 files changed, 158 insertions, 23 deletions

diff --git a/kde/qscintilla/.footprint.i686 b/kde/qscintilla/.footprint.i686
index 5fb16c26f..72e9bc52b 100644
--- a/kde/qscintilla/.footprint.i686
+++ b/kde/qscintilla/.footprint.i686
@@ -25,6 +25,8 @@ drwxr-xr-x	root/root	usr/include/Qsci/
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerjavascript.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerlua.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexermakefile.h
+-rw-r--r--	root/root	usr/include/Qsci/qscilexermatlab.h
+-rw-r--r--	root/root	usr/include/Qsci/qscilexeroctave.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerpascal.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerperl.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerpostscript.h
@@ -47,11 +49,18 @@ drwxr-xr-x	root/root	usr/include/Qsci/
 -rw-r--r--	root/root	usr/include/Qsci/qscistyle.h
 -rw-r--r--	root/root	usr/include/Qsci/qscistyledtext.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so -> libqscintilla2.so.5.5.0
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.2 -> libqscintilla2.so.2.2
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.5 -> libqscintilla2.so.5.5.0
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.5.5 -> libqscintilla2.so.5.5.0
--rwxr-xr-x	root/root	usr/lib/libqscintilla2.so.5.5.0
+lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so -> libqscintilla2.so.6.1.0
+lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.6 -> libqscintilla2.so.6.1.0
+lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.6.1 -> libqscintilla2.so.6.1.0
+-rwxr-xr-x	root/root	usr/lib/libqscintilla2.so.6.1.0
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+drwxr-xr-x	root/root	usr/lib/qt/
+drwxr-xr-x	root/root	usr/lib/qt/plugins/
+drwxr-xr-x	root/root	usr/lib/qt/plugins/designer/
+-rwxr-xr-x	root/root	usr/lib/qt/plugins/designer/libqscintillaplugin.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/qt/
 drwxr-xr-x	root/root	usr/share/qt/qsci/
@@ -62,6 +71,8 @@ drwxr-xr-x	root/root	usr/share/qt/qsci/api/python/
 -rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-2.6.api
 -rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-2.7.api
 -rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-3.1.api
+-rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-3.2.api
+-rw-r--r--	root/root	usr/share/qt/qsci/api/python/QScintilla2.api
 drwxr-xr-x	root/root	usr/share/qt/translations/
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_cs.qm
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_de.qm
@@ -69,3 +80,55 @@ drwxr-xr-x	root/root	usr/share/qt/translations/
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_fr.qm
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_pt_br.qm
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_ru.qm
+drwxr-xr-x	root/root	usr/share/sip/
+drwxr-xr-x	root/root	usr/share/sip/Qsci/
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciabstractapis.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciapis.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscicommand.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscicommandset.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscidocument.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexer.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerbash.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerbatch.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercmake.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercpp.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercsharp.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercss.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercustom.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerd.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerdiff.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerfortran.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerfortran77.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerhtml.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeridl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerjava.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerjavascript.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerlua.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexermakefile.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexermatlab.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeroctave.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpascal.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerperl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpostscript.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpov.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerproperties.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpython.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerruby.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerspice.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexersql.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexertcl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexertex.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerverilog.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexervhdl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerxml.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeryaml.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimacro.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimod3.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimod4.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimodcommon.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciprinter.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintilla.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintillabase3.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintillabase4.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscistyle.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscistyledtext.sip
diff --git a/kde/qscintilla/.footprint.x86_64 b/kde/qscintilla/.footprint.x86_64
index 5fb16c26f..72e9bc52b 100644
--- a/kde/qscintilla/.footprint.x86_64
+++ b/kde/qscintilla/.footprint.x86_64
@@ -25,6 +25,8 @@ drwxr-xr-x	root/root	usr/include/Qsci/
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerjavascript.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerlua.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexermakefile.h
+-rw-r--r--	root/root	usr/include/Qsci/qscilexermatlab.h
+-rw-r--r--	root/root	usr/include/Qsci/qscilexeroctave.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerpascal.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerperl.h
 -rw-r--r--	root/root	usr/include/Qsci/qscilexerpostscript.h
@@ -47,11 +49,18 @@ drwxr-xr-x	root/root	usr/include/Qsci/
 -rw-r--r--	root/root	usr/include/Qsci/qscistyle.h
 -rw-r--r--	root/root	usr/include/Qsci/qscistyledtext.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so -> libqscintilla2.so.5.5.0
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.2 -> libqscintilla2.so.2.2
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.5 -> libqscintilla2.so.5.5.0
-lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.5.5 -> libqscintilla2.so.5.5.0
--rwxr-xr-x	root/root	usr/lib/libqscintilla2.so.5.5.0
+lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so -> libqscintilla2.so.6.1.0
+lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.6 -> libqscintilla2.so.6.1.0
+lrwxrwxrwx	root/root	usr/lib/libqscintilla2.so.6.1 -> libqscintilla2.so.6.1.0
+-rwxr-xr-x	root/root	usr/lib/libqscintilla2.so.6.1.0
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+drwxr-xr-x	root/root	usr/lib/qt/
+drwxr-xr-x	root/root	usr/lib/qt/plugins/
+drwxr-xr-x	root/root	usr/lib/qt/plugins/designer/
+-rwxr-xr-x	root/root	usr/lib/qt/plugins/designer/libqscintillaplugin.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/qt/
 drwxr-xr-x	root/root	usr/share/qt/qsci/
@@ -62,6 +71,8 @@ drwxr-xr-x	root/root	usr/share/qt/qsci/api/python/
 -rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-2.6.api
 -rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-2.7.api
 -rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-3.1.api
+-rw-r--r--	root/root	usr/share/qt/qsci/api/python/Python-3.2.api
+-rw-r--r--	root/root	usr/share/qt/qsci/api/python/QScintilla2.api
 drwxr-xr-x	root/root	usr/share/qt/translations/
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_cs.qm
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_de.qm
@@ -69,3 +80,55 @@ drwxr-xr-x	root/root	usr/share/qt/translations/
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_fr.qm
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_pt_br.qm
 -rw-r--r--	root/root	usr/share/qt/translations/qscintilla_ru.qm
+drwxr-xr-x	root/root	usr/share/sip/
+drwxr-xr-x	root/root	usr/share/sip/Qsci/
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciabstractapis.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciapis.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscicommand.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscicommandset.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscidocument.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexer.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerbash.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerbatch.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercmake.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercpp.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercsharp.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercss.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercustom.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerd.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerdiff.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerfortran.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerfortran77.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerhtml.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeridl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerjava.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerjavascript.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerlua.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexermakefile.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexermatlab.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeroctave.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpascal.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerperl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpostscript.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpov.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerproperties.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpython.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerruby.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerspice.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexersql.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexertcl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexertex.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerverilog.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexervhdl.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerxml.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeryaml.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimacro.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimod3.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimod4.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscimodcommon.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciprinter.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintilla.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintillabase3.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintillabase4.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscistyle.sip
+-rw-r--r--	root/root	usr/share/sip/Qsci/qscistyledtext.sip
diff --git a/kde/qscintilla/.md5sum.i686 b/kde/qscintilla/.md5sum.i686
index d26a391b1..95e66702e 100644
--- a/kde/qscintilla/.md5sum.i686
+++ b/kde/qscintilla/.md5sum.i686
@@ -1 +1 @@
-424a89736b900e6ca5bc6d929cdafaf8  QScintilla-gpl-2.4.6.tar.gz
+dd7edef5ff674d307057a3c12dbd8fce  QScintilla-gpl-2.5.1.tar.gz
diff --git a/kde/qscintilla/.md5sum.x86_64 b/kde/qscintilla/.md5sum.x86_64
index d26a391b1..95e66702e 100644
--- a/kde/qscintilla/.md5sum.x86_64
+++ b/kde/qscintilla/.md5sum.x86_64
@@ -1 +1 @@
-424a89736b900e6ca5bc6d929cdafaf8  QScintilla-gpl-2.4.6.tar.gz
+dd7edef5ff674d307057a3c12dbd8fce  QScintilla-gpl-2.5.1.tar.gz
diff --git a/kde/qscintilla/Pkgfile b/kde/qscintilla/Pkgfile
index 1b2916ac0..099ed1a1d 100755
--- a/kde/qscintilla/Pkgfile
+++ b/kde/qscintilla/Pkgfile
@@ -2,22 +2,31 @@
 # URL:  http://www.riverbankcomputing.co.uk/qscintilla/index.php
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: qt
-# Run on: qt
+# Depends on: qt, pyqt, sip
+# Run on: qt,pyqt,sip
 
 name=qscintilla
-version=2.4.6
+version=2.5.1
 release=1
 source=(http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$version.tar.gz)
+
 build() {
 	cd QScintilla-gpl-$version/Qt4
-	qmake qscintilla.pro
-	make QT_INSTALL_LIBS=$PKG/$QTDIR/lib
-	make DESTDIR=$PKG INSTALL_ROOT=$PKG install
-	rm -rf $PKG/usr/lib/libqscintilla2.so.2
-	pushd $PKG/usr/lib/
-	ln -s libqscintilla2.so.2.2 libqscintilla2.so.2
-	popd
-	
+		qmake qscintilla.pro
+		make QT_INSTALL_LIBS=$PKG/$QTDIR/lib
+		make DESTDIR=$PKG INSTALL_ROOT=$PKG install
+
+	cd ../designer-Qt4
+		echo "INCLUDEPATH += ../Qt4" >> designer.pro
+		echo "LIBS += -L$PKG/usr/lib" >> designer.pro
+		qmake designer.pro
+		make
+		make DESTDIR=$PKG INSTALL_ROOT=$PKG install
 
+	cd ../Python
+		python configure.py \
+			-n ../Qt4 \
+			-o $PKG/usr/lib
+		make
+		make DESTDIR=$PKG install
 }