qt5-qscintilla py-qt5-qscintilla: updated to 2.11.5

QScintilla v2.11.5 has been released. This is a minor bug-fix release.

9 files changed, 97 insertions, 58 deletions

diff --git a/x11/py-qt5-qscintilla/Makefile b/x11/py-qt5-qscintilla/Makefile
index 56602114c2c..24cd728dbd4 100644
--- a/x11/py-qt5-qscintilla/Makefile
+++ b/x11/py-qt5-qscintilla/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2020/06/02 08:23:07 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/06/29 13:25:57 adam Exp $
 
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
-
-PKGNAME=	${PYPKGPREFIX}-qt5-${DISTNAME:tl:S/_gpl-/-/}
+PKGNAME=	${PYPKGPREFIX}-qt5-${DISTNAME:tl}
 COMMENT=	QScintilla -- Python bindings
-PKGREVISION=	7
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 
-PY_PATCHPLIST=		yes
+BUILD_DIRS=	Python
+PY_PATCHPLIST=	yes
 
 MAKE_FLAGS+=		TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
@@ -17,13 +14,14 @@ LIBS+=			-lqscintilla2
 MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}\ ${LIBS:Q}
 
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
-	    --pyqt PyQt5 \
-	    --qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
-	    --pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
-	    --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
-	    --qsci-libdir=${QTDIR}/lib \
-	    --apidir=${QTDIR}/qsci${PYVERSSUFFIX}
+	cd ${WRKSRC}/Python && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
+		--pyqt PyQt5 \
+		--qmake=${QTDIR}/bin/qmake \
+		--sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
+		--pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
+		--qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5 \
+		--qsci-libdir=${QTDIR}/lib \
+		--apidir=${QTDIR}/qsci${PYVERSSUFFIX}
 
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-sip/buildlink3.mk"
diff --git a/x11/qt5-qscintilla/Makefile b/x11/qt5-qscintilla/Makefile
index 029a62e9e02..ead9376060e 100644
--- a/x11/qt5-qscintilla/Makefile
+++ b/x11/qt5-qscintilla/Makefile
@@ -1,26 +1,18 @@
-# $NetBSD: Makefile,v 1.9 2020/04/12 08:28:14 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/06/29 13:25:57 adam Exp $
 
-PKGREVISION=	5
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
-PKGNAME=	qt5-${DISTNAME:tl:S/_gpl-/-/}
+PKGNAME=	qt5-${DISTNAME:tl}
 COMMENT=	Scintilla C++ editor class for Qt5
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Qt4Qt5
+BUILD_DIRS=	Qt4Qt5
 
 USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c++
 
 MAKE_ENV+=	QTPREFIX=${QTDIR}
 INSTALL_ENV+=	INSTALL_ROOT=${DESTDIR}
 
 do-configure:
-	(cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro)
+	cd ${WRKSRC}/Qt4Qt5 && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-.include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qscintilla/Makefile.common b/x11/qt5-qscintilla/Makefile.common
index 58bd8d478ad..1f55005c18d 100644
--- a/x11/qt5-qscintilla/Makefile.common
+++ b/x11/qt5-qscintilla/Makefile.common
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile.common,v 1.1 2019/10/29 17:45:24 kamil Exp $
+# $NetBSD: Makefile.common,v 1.2 2020/06/29 13:25:57 adam Exp $
 #
 # used by x11/qt5-qscintilla/Makefile
 # used by x11/py-qt5-qscintilla/Makefile
 
-DISTNAME=	QScintilla_gpl-2.11.2
+DISTNAME=	QScintilla-2.11.5
 CATEGORIES=	x11
 MASTER_SITES=	https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+HOMEPAGE=	https://riverbankcomputing.com/software/qscintilla/intro
 LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	c++
 USE_LIBTOOL=	yes
 
 DISTINFO_FILE=	${.CURDIR}/../../x11/qt5-qscintilla/distinfo
-#PATCHDIR=	${.CURDIR}/../../x11/qt5-qscintilla/patches
+PATCHDIR=	${.CURDIR}/../../x11/qt5-qscintilla/patches
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.endif
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/x11/qt5-qscintilla/buildlink3.mk b/x11/qt5-qscintilla/buildlink3.mk
index 7bf800f1ed4..1075993d17c 100644
--- a/x11/qt5-qscintilla/buildlink3.mk
+++ b/x11/qt5-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/04/12 08:28:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2020/06/29 13:25:57 adam Exp $
 
 BUILDLINK_TREE+=	qt5-qscintilla
 
@@ -9,6 +9,11 @@ BUILDLINK_API_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=2.11.2
 BUILDLINK_ABI_DEPENDS.qt5-qscintilla+=	qt5-qscintilla>=2.11.2nb5
 BUILDLINK_PKGSRCDIR.qt5-qscintilla?=	../../x11/qt5-qscintilla
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.endif
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# QT5_QSCINTILLA_BUILDLINK3_MK
 
diff --git a/x11/qt5-qscintilla/distinfo b/x11/qt5-qscintilla/distinfo
index fbc46c68f11..b1ad1728c73 100644
--- a/x11/qt5-qscintilla/distinfo
+++ b/x11/qt5-qscintilla/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2020/03/19 14:00:14 brook Exp $
+$NetBSD: distinfo,v 1.4 2020/06/29 13:25:57 adam Exp $
 
-SHA1 (QScintilla_gpl-2.11.2.tar.gz) = 1815040576bfb62bedb0dd48a39e36a13bd0f5e9
-RMD160 (QScintilla_gpl-2.11.2.tar.gz) = fb0631db0fa228eb2d4c35db69f085a67d7d8036
-SHA512 (QScintilla_gpl-2.11.2.tar.gz) = de4eb9fb8d13c1a8f1acb6e941a8e751e0f0df02b59eb1a32bcdbedc1cc62ad3a1b778d45541ea048710349db827323a07aaede415712d6c9ac6acc07f0c160f
-Size (QScintilla_gpl-2.11.2.tar.gz) = 2986600 bytes
-SHA1 (patch-qsciapis.cpp) = bd595be57ea39acba021ba0dd662c872005bc407
-SHA1 (patch-qscintilla.pro) = c15b8604994b204f60041076584441188b4fd887
+SHA1 (QScintilla-2.11.5.tar.gz) = 1719d557f21375e04c11bd4ecf09a4d2ef87d2d0
+RMD160 (QScintilla-2.11.5.tar.gz) = bf0596f336fe888fd3d08d9ce816231533233bdb
+SHA512 (QScintilla-2.11.5.tar.gz) = 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
+Size (QScintilla-2.11.5.tar.gz) = 3007564 bytes
+SHA1 (patch-Python_configure.py) = c447d37537924272a632a76a32ab3b2afc690bb4
+SHA1 (patch-Qt4Qt5_qsciapis.cpp) = 00466d4b0fe635c55566aa4b07a3de52e63274bd
+SHA1 (patch-Qt4Qt5_qscintilla.pro) = b798a34cdde64789db0e1cf2b9c28c5698027f95
diff --git a/x11/qt5-qscintilla/patches/patch-Python_configure.py b/x11/qt5-qscintilla/patches/patch-Python_configure.py
new file mode 100644
index 00000000000..392a93c246c
--- /dev/null
+++ b/x11/qt5-qscintilla/patches/patch-Python_configure.py
@@ -0,0 +1,40 @@
+$NetBSD: patch-Python_configure.py,v 1.1 2020/06/29 13:25:57 adam Exp $
+
+Avoid app bundles and use proper dylib id on Darwin.
+
+--- Python/configure.py.orig	2020-06-09 14:28:23.000000000 +0000
++++ Python/configure.py
+@@ -1470,7 +1470,7 @@ def _generate_pro(target_config, opts, m
+         pro.write('QT += %s\n' % qt)
+ 
+     pro.write('CONFIG += %s\n' % ('debug' if target_config.debug else 'release'))
+-    pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin plugin_bundle'))
++    pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
+ 
+     config = qmake_config.get('CONFIG')
+     if config:
+@@ -1511,7 +1511,7 @@ win32 {
+     PY_MODULE = %s.so
+ 
+     macx {
+-        PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET)
++        PY_MODULE_SRC = $(TARGET)
+ 
+         QMAKE_LFLAGS += "-undefined dynamic_lookup"
+ 
+@@ -1621,12 +1621,11 @@ INSTALLS += sip
+     if not opts.static:
+         dylib = module_config.get_mac_wrapped_library_file(target_config)
+ 
+-        if dylib:
+-            pro.write('''
++        pro.write('''
+ macx {
+-    QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change %s %s $$PY_MODULE)
++    QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -id $$target.path/$$PY_MODULE $$PY_MODULE)
+ }
+-''' % (os.path.basename(dylib), dylib))
++''')
+ 
+     pro.write('\n')
+     pro.write('HEADERS = sipAPI%s.h\n' % mname)
diff --git a/x11/qt5-qscintilla/patches/patch-qsciapis.cpp b/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp
index 3a164d06164..0ebcf190227 100644
--- a/x11/qt5-qscintilla/patches/patch-qsciapis.cpp
+++ b/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qsciapis.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-qsciapis.cpp,v 1.1 2020/01/26 12:54:15 rhialto Exp $
+$NetBSD: patch-Qt4Qt5_qsciapis.cpp,v 1.1 2020/06/29 13:25:57 adam Exp $
 
 Search in qt5/qsci*/api/.../*.api.
 
---- qsciapis.cpp.orig	2019-06-25 12:49:27.000000000 +0000
-+++ qsciapis.cpp
+--- Qt4Qt5/qsciapis.cpp.orig	2019-06-25 12:49:27.000000000 +0000
++++ Qt4Qt5/qsciapis.cpp
 @@ -982,6 +982,7 @@ QString QsciAPIs::prepName(const QString
  // Return installed API files.
  QStringList QsciAPIs::installedAPIFiles() const
diff --git a/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro b/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
new file mode 100644
index 00000000000..e0645dfc740
--- /dev/null
+++ b/x11/qt5-qscintilla/patches/patch-Qt4Qt5_qscintilla.pro
@@ -0,0 +1,15 @@
+$NetBSD: patch-Qt4Qt5_qscintilla.pro,v 1.1 2020/06/29 13:25:57 adam Exp $
+
+Add full path to installed library names on Darwin.
+
+--- Qt4Qt5/qscintilla.pro.orig	2020-06-09 14:28:23.000000000 +0000
++++ Qt4Qt5/qscintilla.pro
+@@ -38,7 +38,7 @@ CONFIG(debug, debug|release) {
+ }
+ 
+ macx:!CONFIG(staticlib) {
+-    QMAKE_POST_LINK += install_name_tool -id @rpath/$(TARGET1) $(TARGET)
++    QMAKE_POST_LINK += install_name_tool -id $$target.path/$(TARGET1) $(TARGET)
+ }
+ 
+ INCLUDEPATH += . ../include ../lexlib ../src
diff --git a/x11/qt5-qscintilla/patches/patch-qscintilla.pro b/x11/qt5-qscintilla/patches/patch-qscintilla.pro
deleted file mode 100644
index b32a8c57640..00000000000
--- a/x11/qt5-qscintilla/patches/patch-qscintilla.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-qscintilla.pro,v 1.1 2020/03/08 20:55:17 brook Exp $
-
-Add full path to installed library names on Darwin.
-
---- qscintilla.pro.orig	2019-06-25 12:49:27.000000000 +0000
-+++ qscintilla.pro
-@@ -95,6 +95,10 @@ CONFIG(staticlib) {
- }
- INSTALLS += features
- 
-+mac {
-+    QMAKE_SONAME_PREFIX=$$target.path
-+}
-+
- HEADERS = \
- 	./Qsci/qsciglobal.h \
- 	./Qsci/qsciscintilla.h \