qscintilla-qt5: update to 2.14.1.

srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch

@@ -1,42 +0,0 @@
-02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
-<scott@kitterman.com>
-patch the configure script for the Python bindings to support object dir
-builds
-Index: Python/configure.py
-===================================================================
---- a/Python/configure.py	2014-07-05 10:02:02.318834374 -0400
-+++ b/Python/configure.py	2014-07-05 10:02:02.306834375 -0400
-@@ -31,6 +31,8 @@
- import optparse
- import sys
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
- 
- ###############################################################################
- # You shouldn't need to modify anything above this line.
-@@ -210,6 +212,8 @@
-                     "The QScintilla version number could not be determined by "
-                     "reading %s." % sciglobal)
- 
-+        return # Debian: do not check for the installed version, we're good this way.
-+
-         lib_dir = target_configuration.qsci_lib_dir
-         if lib_dir is None:
-             lib_dir = target_configuration.qt_lib_dir
-@@ -264,7 +268,12 @@
-         the target configuration.
-         """
- 
--        return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-+        if target_configuration.pyqt_package == 'PyQt5':
-+            return os.path.join(src_dir, 'sip/qscimod5.sip')
-+        else:
-+            return os.path.join(src_dir, 'sip/qscimod4.sip')
-+
-+        #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
- 
-     def get_sip_installs(self, target_configuration):
-         """ Return a tuple of the installation directory of the module's .sip
-

srcpkgs/qscintilla-qt5/template

@@ -1,17 +1,58 @@
 # Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
 pkgname=qscintilla-qt5
-version=2.11.2
+version=2.14.1
 revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-devel"
 short_desc="Qt5 port of Neil Hodgson's Scintilla C++ editor class"
 maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
-distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
-checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
+checksum=dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d
+
+post_configure() {
+	local _qt_arch
+	local qmake_args
+	if [ "$CROSS_BUILD" ]; then
+		case $XBPS_TARGET_MACHINE in
+			i686*) _qt_arch=i386;;
+			x86_64*) _qt_arch=x86_64;;
+			aarch64*) _qt_arch=arm64;;
+			arm*) _qt_arch=arm;;
+			mips*) _qt_arch=mips;;
+			ppc64*) _qt_arch=power64;;
+			ppc*) _qt_arch=power;;
+		esac
+		qmake_args="-qtconf ${wrksrc}/qt.conf
+			PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+	fi
+	cd ../designer
+	/usr/lib/qt5/bin/qmake \
+		${qmake_args} \
+		PREFIX=/usr \
+		QT_INSTALL_PREFIX=/usr \
+		LIB=/usr/lib \
+		QMAKE_CC=$CC QMAKE_CXX=$CXX \
+		QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+		QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+		QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+		QMAKE_LFLAGS="${LDFLAGS}" \
+		${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+		CONFIG+=no_qt_rpath
+}
+
+post_build() {
+	make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+	make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+		INSTALL_ROOT=${DESTDIR} install
+}
 
 qscintilla-qt5-devel_package() {
 	short_desc+=" - development files"

srcpkgs/qscintilla-qt5/update

@@ -1,3 +1,2 @@
 site="https://www.riverbankcomputing.com/software/qscintilla/download"
-pkgname=QScintilla_gpl
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
-ignore="*dev*"