CVS commit: pkgsrc/x11

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed May 31 19:06:28 UTC 2023

Modified Files:
        pkgsrc/x11/py-qt5-qscintilla: Makefile PLIST
        pkgsrc/x11/qt5-qscintilla: Makefile Makefile.common PLIST distinfo

Log Message:
qt5-qscintilla: updated to 2.14.0

QScintilla v2.14.0 has been released. This is a minor feature and bug-fix release.

Added the QsciLexerAsm, QsciLexerMASM and QsciLexerNASM classes.
Added the QsciLexerHex, QsciLexerIntelHex, QsciLexerSRec and QsciLexerTekHex classes.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/py-qt5-qscintilla/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/py-qt5-qscintilla/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/qt5-qscintilla/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/qt5-qscintilla/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qt5-qscintilla/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/qt5-qscintilla/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-qt5-qscintilla/Makefile
diff -u pkgsrc/x11/py-qt5-qscintilla/Makefile:1.22 pkgsrc/x11/py-qt5-qscintilla/Makefile:1.23
--- pkgsrc/x11/py-qt5-qscintilla/Makefile:1.22  Mon May 22 21:00:49 2023
+++ pkgsrc/x11/py-qt5-qscintilla/Makefile       Wed May 31 19:06:27 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.22 2023/05/22 21:00:49 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2023/05/31 19:06:27 adam Exp $
 
-PKGREVISION= 4
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-qt5-${DISTNAME:S/_src//:tl}

Index: pkgsrc/x11/py-qt5-qscintilla/PLIST
diff -u pkgsrc/x11/py-qt5-qscintilla/PLIST:1.4 pkgsrc/x11/py-qt5-qscintilla/PLIST:1.5
--- pkgsrc/x11/py-qt5-qscintilla/PLIST:1.4      Fri Dec  2 15:40:15 2022
+++ pkgsrc/x11/py-qt5-qscintilla/PLIST  Wed May 31 19:06:27 2023
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2022/12/02 15:40:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/05/31 19:06:27 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
 ${PYSITELIB}/PyQt5/Qsci.abi3.so
 ${PYSITELIB}/PyQt5/bindings/Qsci/Qsci.toml
 ${PYSITELIB}/PyQt5/bindings/Qsci/qsciabstractapis.sip
@@ -7,6 +13,7 @@ ${PYSITELIB}/PyQt5/bindings/Qsci/qscicom
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscicommandset.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscidocument.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexer.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerasm.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeravs.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbash.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbatch.sip
@@ -20,15 +27,19 @@ ${PYSITELIB}/PyQt5/bindings/Qsci/qscilex
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerdiff.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerfortran.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerfortran77.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerhex.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerhtml.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeridl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerintelhex.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjava.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjavascript.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerjson.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerlua.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermakefile.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermarkdown.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermasm.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexermatlab.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexernasm.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeroctave.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerpascal.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerperl.sip
@@ -40,7 +51,9 @@ ${PYSITELIB}/PyQt5/bindings/Qsci/qscilex
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerruby.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerspice.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexersql.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexersrec.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertcl.sip
+${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertekhex.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertex.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerverilog.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexervhdl.sip
@@ -54,9 +67,3 @@ ${PYSITELIB}/PyQt5/bindings/Qsci/qscisci
 ${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintillabase.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscistyle.sip
 ${PYSITELIB}/PyQt5/bindings/Qsci/qscistyledtext.sip
-${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json

Index: pkgsrc/x11/qt5-qscintilla/Makefile
diff -u pkgsrc/x11/qt5-qscintilla/Makefile:1.20 pkgsrc/x11/qt5-qscintilla/Makefile:1.21
--- pkgsrc/x11/qt5-qscintilla/Makefile:1.20     Mon May 22 21:00:12 2023
+++ pkgsrc/x11/qt5-qscintilla/Makefile  Wed May 31 19:06:27 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.20 2023/05/22 21:00:12 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2023/05/31 19:06:27 adam Exp $
 
-PKGREVISION= 4
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
 PKGNAME=       qt5-${DISTNAME:S/_src//:tl}
@@ -16,4 +15,11 @@ INSTALL_ENV+=        INSTALL_ROOT=${DESTDIR}
 do-configure:
        cd ${WRKSRC}/src && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+post-install:
+       install_name_tool -id ${QTDIR}/lib/libqscintilla2_qt5.15.2.0.dylib \
+       ${DESTDIR}${QTDIR}/lib/libqscintilla2_qt5.15.2.0.dylib
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/qt5-qscintilla/Makefile.common
diff -u pkgsrc/x11/qt5-qscintilla/Makefile.common:1.3 pkgsrc/x11/qt5-qscintilla/Makefile.common:1.4
--- pkgsrc/x11/qt5-qscintilla/Makefile.common:1.3       Fri Dec  2 15:39:01 2022
+++ pkgsrc/x11/qt5-qscintilla/Makefile.common   Wed May 31 19:06:27 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2022/12/02 15:39:01 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2023/05/31 19:06:27 adam Exp $
 #
 # used by x11/qt5-qscintilla/Makefile
 # used by x11/py-qt5-qscintilla/Makefile
 
-DISTNAME=      QScintilla_src-2.13.3
+DISTNAME=      QScintilla_src-2.14.0
 CATEGORIES=    x11
 MASTER_SITES=  https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/
 

Index: pkgsrc/x11/qt5-qscintilla/PLIST
diff -u pkgsrc/x11/qt5-qscintilla/PLIST:1.2 pkgsrc/x11/qt5-qscintilla/PLIST:1.3
--- pkgsrc/x11/qt5-qscintilla/PLIST:1.2 Fri Dec  2 15:39:01 2022
+++ pkgsrc/x11/qt5-qscintilla/PLIST     Wed May 31 19:06:27 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/12/02 15:39:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/05/31 19:06:27 adam Exp $
 qt5/include/Qsci/qsciabstractapis.h
 qt5/include/Qsci/qsciapis.h
 qt5/include/Qsci/qscicommand.h
@@ -6,6 +6,7 @@ qt5/include/Qsci/qscicommandset.h
 qt5/include/Qsci/qscidocument.h
 qt5/include/Qsci/qsciglobal.h
 qt5/include/Qsci/qscilexer.h
+qt5/include/Qsci/qscilexerasm.h
 qt5/include/Qsci/qscilexeravs.h
 qt5/include/Qsci/qscilexerbash.h
 qt5/include/Qsci/qscilexerbatch.h
@@ -20,15 +21,19 @@ qt5/include/Qsci/qscilexerdiff.h
 qt5/include/Qsci/qscilexeredifact.h
 qt5/include/Qsci/qscilexerfortran.h
 qt5/include/Qsci/qscilexerfortran77.h
+qt5/include/Qsci/qscilexerhex.h
 qt5/include/Qsci/qscilexerhtml.h
 qt5/include/Qsci/qscilexeridl.h
+qt5/include/Qsci/qscilexerintelhex.h
 qt5/include/Qsci/qscilexerjava.h
 qt5/include/Qsci/qscilexerjavascript.h
 qt5/include/Qsci/qscilexerjson.h
 qt5/include/Qsci/qscilexerlua.h
 qt5/include/Qsci/qscilexermakefile.h
 qt5/include/Qsci/qscilexermarkdown.h
+qt5/include/Qsci/qscilexermasm.h
 qt5/include/Qsci/qscilexermatlab.h
+qt5/include/Qsci/qscilexernasm.h
 qt5/include/Qsci/qscilexeroctave.h
 qt5/include/Qsci/qscilexerpascal.h
 qt5/include/Qsci/qscilexerperl.h
@@ -40,7 +45,9 @@ qt5/include/Qsci/qscilexerpython.h
 qt5/include/Qsci/qscilexerruby.h
 qt5/include/Qsci/qscilexerspice.h
 qt5/include/Qsci/qscilexersql.h
+qt5/include/Qsci/qscilexersrec.h
 qt5/include/Qsci/qscilexertcl.h
+qt5/include/Qsci/qscilexertekhex.h
 qt5/include/Qsci/qscilexertex.h
 qt5/include/Qsci/qscilexerverilog.h
 qt5/include/Qsci/qscilexervhdl.h
@@ -54,14 +61,16 @@ qt5/include/Qsci/qscistyle.h
 qt5/include/Qsci/qscistyledtext.h
 qt5/lib/libqscintilla2_qt5.so
 qt5/lib/libqscintilla2_qt5.so.15
-qt5/lib/libqscintilla2_qt5.so.15.1
-qt5/lib/libqscintilla2_qt5.so.15.1.1
+qt5/lib/libqscintilla2_qt5.so.15.2
+qt5/lib/libqscintilla2_qt5.so.15.2.0
 qt5/mkspecs/features/qscintilla2.prf
 qt5/qsci/api/python/Python-2.4.api
 qt5/qsci/api/python/Python-2.5.api
 qt5/qsci/api/python/Python-2.6.api
 qt5/qsci/api/python/Python-2.7.api
 qt5/qsci/api/python/Python-3.1.api
+qt5/qsci/api/python/Python-3.10.api
+qt5/qsci/api/python/Python-3.11.api
 qt5/qsci/api/python/Python-3.2.api
 qt5/qsci/api/python/Python-3.3.api
 qt5/qsci/api/python/Python-3.4.api

Index: pkgsrc/x11/qt5-qscintilla/distinfo
diff -u pkgsrc/x11/qt5-qscintilla/distinfo:1.8 pkgsrc/x11/qt5-qscintilla/distinfo:1.9
--- pkgsrc/x11/qt5-qscintilla/distinfo:1.8      Fri Dec  2 15:39:01 2022
+++ pkgsrc/x11/qt5-qscintilla/distinfo  Wed May 31 19:06:27 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2022/12/02 15:39:01 wiz Exp $
+$NetBSD: distinfo,v 1.9 2023/05/31 19:06:27 adam Exp $
 
-BLAKE2s (QScintilla_src-2.13.3.tar.gz) = 64583b21ca4d836189c91f79e26e7e91ed954075b6f4fde57d4e613bf40577b7
-SHA512 (QScintilla_src-2.13.3.tar.gz) = be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
-Size (QScintilla_src-2.13.3.tar.gz) = 3060031 bytes
+BLAKE2s (QScintilla_src-2.14.0.tar.gz) = b9358db2dd8fdc72acad908e4c39b59a59a8e16495a308da9b3cd7b406d6aa44
+SHA512 (QScintilla_src-2.14.0.tar.gz) = 28a38fa9a5ea80f846ad940870ad6201cb6ff91bd10ebeb2c353aa6c2ce727f92beb62bdd9fb20715f92b1f8753088a6e1b2ca7f92c6b81a9f1c242e9974f0fd
+Size (QScintilla_src-2.14.0.tar.gz) = 3234541 bytes