Merge pull request #5909 from lyzech/qscintilla_update

qscintilla-qt5: update to 2.10.

common/shlibs

@@ -2773,7 +2773,7 @@ libopencsg.so.1 opencsg-1.4.2_1
 libCGAL.so.12 cgal-4.9_1
 libCGAL_Core.so.12 cgal-4.9_1
 libCGAL_ImageIO.so.12 cgal-4.9_1
-libqscintilla2-qt5.so.12 qscintilla-qt5-2.9.4_1
+libqscintilla2_qt5.so.13 qscintilla-qt5-2.10_1
 liblxpanel.so.0 lxpanel-0.9.3_1
 libuim.so.8 uim-1.8.6_1
 libuim-scm.so.0 uim-1.8.6_1

srcpkgs/openscad/template

@@ -2,7 +2,7 @@
 
 pkgname="openscad"
 version="2015.03.2"
-revision=1
+revision=2
 _distver="${version%.*}-${version##*.}"
 build_style=qmake
 short_desc="The programmers solid 3D CAD modeller"

srcpkgs/qscintilla-qt5/patches/qt5.patch

@@ -1,35 +0,0 @@
-diff -up Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
---- Qt4Qt5/features/qscintilla2.prf.qt5	2016-04-18 04:08:48.000000000 -0500
-+++ Qt4Qt5/features/qscintilla2.prf	2016-04-18 08:13:23.935665305 -0500
-@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) {
-         win32: {
-             LIBS += -lqscintilla2d
-         } else {
-+        greaterThan(QT_MAJOR_VERSION, 4) {
-+            LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+        } else {
-             LIBS += -lqscintilla2
-         }
-+        }
-     }
- } else {
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+    LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
-+} else {
-     LIBS += -lqscintilla2
- }
-+}
-diff -up Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
---- Qt4Qt5/qscintilla.pro.qt5	2016-04-18 08:13:23.951665381 -0500
-+++ Qt4Qt5/qscintilla.pro	2016-04-18 08:14:20.807934597 -0500
-@@ -23,7 +23,11 @@
- !win32:VERSION = 12.0.1
- 
- TEMPLATE = lib
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
-+} else {
- TARGET = qscintilla2
-+}
- CONFIG += qt warn_off release thread exceptions hide_symbols
- INCLUDEPATH += . ../include ../lexlib ../src

srcpkgs/qscintilla-qt5/template

@@ -1,6 +1,6 @@
 # Template file for 'qscintilla-qt5'
 pkgname=qscintilla-qt5
-version=2.9.4
+version=2.10
 revision=1
 wrksrc="QScintilla_gpl-${version}"
 build_wrksrc="Qt4Qt5"
@@ -11,7 +11,7 @@ maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
 homepage="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 license="GPL-3"
 distfiles="${SOURCEFORGE_SITE}/pyqt/${wrksrc}.tar.gz"
-checksum=8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6
+checksum=16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec
 nocross=yes
 
 qscintilla-qt5-devel_package() {