qt5-qscintilla py-qt5-qscintilla: updated to 2.14.1 v2.14.1 - Bug fixes.diff -r1.27 -r1.28 pkgsrc/x11/py-qt5-qscintilla/Makefile
(adam)
@@ -1,28 +1,34 @@ | @@ -1,28 +1,34 @@ | |||
1 | # $NetBSD: Makefile,v 1.27 2023/11/12 13:24:22 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.28 2023/12/12 21:58:59 adam Exp $ | |
2 | 2 | |||
3 | PKGREVISION= 4 | |||
4 | .include "../../x11/qt5-qscintilla/Makefile.common" | 3 | .include "../../x11/qt5-qscintilla/Makefile.common" | |
5 | 4 | |||
6 | PKGNAME= ${PYPKGPREFIX}-qt5-${DISTNAME:S/_src//:tl} | 5 | PKGNAME= ${PYPKGPREFIX}-qt5-${DISTNAME:S/_src//:tl} | |
7 | COMMENT= QScintilla -- Python bindings | 6 | COMMENT= QScintilla -- Python bindings | |
8 | 7 | |||
9 | TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6 | 8 | TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6>=6.0.2:../../x11/py-sip6 | |
10 | TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder | 9 | TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder>=1.6:../../x11/py-qt-builder | |
11 | DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5 | 10 | DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5 | |
12 | 11 | |||
13 | WRKSRC= ${WRKDIR}/${DISTNAME}/Python | 12 | WRKSRC= ${WRKDIR}/${DISTNAME}/Python | |
14 | 13 | |||
15 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | 14 | PYTHON_VERSIONS_INCOMPATIBLE= 27 | |
16 | 15 | |||
17 | WHEEL_NAME= ${DISTNAME:S/_src//} | 16 | WHEEL_NAME= ${DISTNAME:S/_src//} | |
18 | 17 | |||
19 | post-extract: | 18 | post-extract: | |
20 | cd ${WRKSRC} && ${CP} pyproject-qt5.toml pyproject.toml | 19 | cd ${WRKSRC} && ${CP} pyproject-qt5.toml pyproject.toml | |
21 | 20 | |||
22 | pre-configure: | 21 | pre-configure: | |
23 | ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ | 22 | ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ | |
24 | 23 | |||
24 | .include "../../mk/bsd.prefs.mk" | |||
25 | .if ${OPSYS} == "Darwin" | |||
26 | post-install: | |||
27 | install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qsci.abi3.so \ | |||
28 | ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qsci.abi3.so | |||
29 | .endif | |||
30 | ||||
25 | .include "../../lang/python/wheel.mk" | 31 | .include "../../lang/python/wheel.mk" | |
26 | BUILDLINK_API_DEPENDS.qt5-qscintilla+= qt5-qscintilla>=${PKGVERSION_NOREV} | 32 | BUILDLINK_API_DEPENDS.qt5-qscintilla+= qt5-qscintilla>=${PKGVERSION_NOREV} | |
27 | .include "../../x11/qt5-qscintilla/buildlink3.mk" | 33 | .include "../../x11/qt5-qscintilla/buildlink3.mk" | |
28 | .include "../../mk/bsd.pkg.mk" | 34 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,17 @@ | @@ -1,14 +1,17 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.6 2023/10/28 19:57:26 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.7 2023/12/12 21:58:59 adam Exp $ | |
2 | ${PYSITELIB}/${WHEEL_INFODIR}/METADATA | |||
3 | ${PYSITELIB}/${WHEEL_INFODIR}/RECORD | |||
4 | ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL | |||
2 | ${PYSITELIB}/PyQt5/Qsci.abi3.so | 5 | ${PYSITELIB}/PyQt5/Qsci.abi3.so | |
3 | ${PYSITELIB}/PyQt5/bindings/Qsci/Qsci.toml | 6 | ${PYSITELIB}/PyQt5/bindings/Qsci/Qsci.toml | |
4 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciabstractapis.sip | 7 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciabstractapis.sip | |
5 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciapis.sip | 8 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciapis.sip | |
6 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscicommand.sip | 9 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscicommand.sip | |
7 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscicommandset.sip | 10 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscicommandset.sip | |
8 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscidocument.sip | 11 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscidocument.sip | |
9 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexer.sip | 12 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexer.sip | |
10 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerasm.sip | 13 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerasm.sip | |
11 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeravs.sip | 14 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeravs.sip | |
12 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbash.sip | 15 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbash.sip | |
13 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbatch.sip | 16 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerbatch.sip | |
14 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercmake.sip | 17 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexercmake.sip | |
@@ -51,16 +54,13 @@ ${PYSITELIB}/PyQt5/bindings/Qsci/qscilex | @@ -51,16 +54,13 @@ ${PYSITELIB}/PyQt5/bindings/Qsci/qscilex | |||
51 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertex.sip | 54 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexertex.sip | |
52 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerverilog.sip | 55 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerverilog.sip | |
53 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexervhdl.sip | 56 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexervhdl.sip | |
54 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerxml.sip | 57 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexerxml.sip | |
55 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeryaml.sip | 58 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscilexeryaml.sip | |
56 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscimacro.sip | 59 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscimacro.sip | |
57 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscimod5.sip | 60 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscimod5.sip | |
58 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscimodcommon.sip | 61 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscimodcommon.sip | |
59 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciprinter.sip | 62 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciprinter.sip | |
60 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintilla.sip | 63 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintilla.sip | |
61 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintillabase.sip | 64 | ${PYSITELIB}/PyQt5/bindings/Qsci/qsciscintillabase.sip | |
62 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscistyle.sip | 65 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscistyle.sip | |
63 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscistyledtext.sip | 66 | ${PYSITELIB}/PyQt5/bindings/Qsci/qscistyledtext.sip | |
64 | ${PYSITELIB}/${WHEEL_INFODIR}/METADATA | |||
65 | ${PYSITELIB}/${WHEEL_INFODIR}/RECORD | |||
66 | ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL |
@@ -1,26 +1,25 @@ | @@ -1,26 +1,25 @@ | |||
1 | # $NetBSD: Makefile,v 1.24 2023/11/12 13:24:24 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.25 2023/12/12 21:58:59 adam Exp $ | |
2 | 2 | |||
3 | PKGREVISION= 3 | |||
4 | .include "../../x11/qt5-qscintilla/Makefile.common" | 3 | .include "../../x11/qt5-qscintilla/Makefile.common" | |
5 | 4 | |||
6 | PKGNAME= qt5-${DISTNAME:S/_src//:tl} | 5 | PKGNAME= qt5-${DISTNAME:S/_src//:tl} | |
7 | COMMENT= Scintilla C++ editor class for Qt5 | 6 | COMMENT= Scintilla C++ editor class for Qt5 | |
8 | 7 | |||
9 | BUILD_DIRS= src | 8 | BUILD_DIRS= src | |
10 | 9 | |||
11 | USE_TOOLS+= gmake | 10 | USE_TOOLS+= gmake | |
12 | 11 | |||
13 | MAKE_ENV+= QTPREFIX=${QTDIR} | 12 | MAKE_ENV+= QTPREFIX=${QTDIR} | |
14 | INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} | 13 | INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} | |
15 | 14 | |||
16 | do-configure: | 15 | do-configure: | |
17 | cd ${WRKSRC}/src && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro | 16 | cd ${WRKSRC}/src && ${QTDIR}/bin/qmake -o Makefile qscintilla.pro | |
18 | 17 | |||
19 | .include "../../mk/bsd.prefs.mk" | 18 | .include "../../mk/bsd.prefs.mk" | |
20 | .if ${OPSYS} == "Darwin" | 19 | .if ${OPSYS} == "Darwin" | |
21 | post-install: | 20 | post-install: | |
22 | install_name_tool -id ${QTDIR}/lib/libqscintilla2_qt5.15.2.0.dylib \ | 21 | install_name_tool -id ${QTDIR}/lib/libqscintilla2_qt5.15.2.1.dylib \ | |
23 | ${DESTDIR}${QTDIR}/lib/libqscintilla2_qt5.15.2.0.dylib | 22 | ${DESTDIR}${QTDIR}/lib/libqscintilla2_qt5.15.2.1.dylib | |
24 | .endif | 23 | .endif | |
25 | 24 | |||
26 | .include "../../mk/bsd.pkg.mk" | 25 | .include "../../mk/bsd.pkg.mk" |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.4 2023/05/31 19:06:27 adam Exp $ | 1 | # $NetBSD: Makefile.common,v 1.5 2023/12/12 21:58:59 adam Exp $ | |
2 | # | 2 | # | |
3 | # used by x11/qt5-qscintilla/Makefile | 3 | # used by x11/qt5-qscintilla/Makefile | |
4 | # used by x11/py-qt5-qscintilla/Makefile | 4 | # used by x11/py-qt5-qscintilla/Makefile | |
5 | 5 | |||
6 | DISTNAME= QScintilla_src-2.14.0 | 6 | DISTNAME= QScintilla_src-2.14.1 | |
7 | CATEGORIES= x11 | 7 | CATEGORIES= x11 | |
8 | MASTER_SITES= https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/ | 8 | MASTER_SITES= https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION_NOREV}/ | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://riverbankcomputing.com/software/qscintilla/intro | 11 | HOMEPAGE= https://riverbankcomputing.com/software/qscintilla/intro | |
12 | LICENSE= gnu-gpl-v3 | 12 | LICENSE= gnu-gpl-v3 | |
13 | 13 | |||
14 | USE_LANGUAGES= c++ | 14 | USE_LANGUAGES= c++ | |
15 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
16 | 16 | |||
17 | DISTINFO_FILE= ${.CURDIR}/../../x11/qt5-qscintilla/distinfo | 17 | DISTINFO_FILE= ${.CURDIR}/../../x11/qt5-qscintilla/distinfo | |
18 | PATCHDIR= ${.CURDIR}/../../x11/qt5-qscintilla/patches | 18 | PATCHDIR= ${.CURDIR}/../../x11/qt5-qscintilla/patches | |
19 | 19 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2023/05/31 19:06:27 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2023/12/12 21:58:59 adam Exp $ | |
2 | qt5/include/Qsci/qsciabstractapis.h | 2 | qt5/include/Qsci/qsciabstractapis.h | |
3 | qt5/include/Qsci/qsciapis.h | 3 | qt5/include/Qsci/qsciapis.h | |
4 | qt5/include/Qsci/qscicommand.h | 4 | qt5/include/Qsci/qscicommand.h | |
5 | qt5/include/Qsci/qscicommandset.h | 5 | qt5/include/Qsci/qscicommandset.h | |
6 | qt5/include/Qsci/qscidocument.h | 6 | qt5/include/Qsci/qscidocument.h | |
7 | qt5/include/Qsci/qsciglobal.h | 7 | qt5/include/Qsci/qsciglobal.h | |
8 | qt5/include/Qsci/qscilexer.h | 8 | qt5/include/Qsci/qscilexer.h | |
9 | qt5/include/Qsci/qscilexerasm.h | 9 | qt5/include/Qsci/qscilexerasm.h | |
10 | qt5/include/Qsci/qscilexeravs.h | 10 | qt5/include/Qsci/qscilexeravs.h | |
11 | qt5/include/Qsci/qscilexerbash.h | 11 | qt5/include/Qsci/qscilexerbash.h | |
12 | qt5/include/Qsci/qscilexerbatch.h | 12 | qt5/include/Qsci/qscilexerbatch.h | |
13 | qt5/include/Qsci/qscilexercmake.h | 13 | qt5/include/Qsci/qscilexercmake.h | |
14 | qt5/include/Qsci/qscilexercoffeescript.h | 14 | qt5/include/Qsci/qscilexercoffeescript.h | |
@@ -52,27 +52,27 @@ qt5/include/Qsci/qscilexertex.h | @@ -52,27 +52,27 @@ qt5/include/Qsci/qscilexertex.h | |||
52 | qt5/include/Qsci/qscilexerverilog.h | 52 | qt5/include/Qsci/qscilexerverilog.h | |
53 | qt5/include/Qsci/qscilexervhdl.h | 53 | qt5/include/Qsci/qscilexervhdl.h | |
54 | qt5/include/Qsci/qscilexerxml.h | 54 | qt5/include/Qsci/qscilexerxml.h | |
55 | qt5/include/Qsci/qscilexeryaml.h | 55 | qt5/include/Qsci/qscilexeryaml.h | |
56 | qt5/include/Qsci/qscimacro.h | 56 | qt5/include/Qsci/qscimacro.h | |
57 | qt5/include/Qsci/qsciprinter.h | 57 | qt5/include/Qsci/qsciprinter.h | |
58 | qt5/include/Qsci/qsciscintilla.h | 58 | qt5/include/Qsci/qsciscintilla.h | |
59 | qt5/include/Qsci/qsciscintillabase.h | 59 | qt5/include/Qsci/qsciscintillabase.h | |
60 | qt5/include/Qsci/qscistyle.h | 60 | qt5/include/Qsci/qscistyle.h | |
61 | qt5/include/Qsci/qscistyledtext.h | 61 | qt5/include/Qsci/qscistyledtext.h | |
62 | qt5/lib/libqscintilla2_qt5.so | 62 | qt5/lib/libqscintilla2_qt5.so | |
63 | qt5/lib/libqscintilla2_qt5.so.15 | 63 | qt5/lib/libqscintilla2_qt5.so.15 | |
64 | qt5/lib/libqscintilla2_qt5.so.15.2 | 64 | qt5/lib/libqscintilla2_qt5.so.15.2 | |
65 | qt5/lib/libqscintilla2_qt5.so.15.2.0 | 65 | qt5/lib/libqscintilla2_qt5.so.15.2.1 | |
66 | qt5/mkspecs/features/qscintilla2.prf | 66 | qt5/mkspecs/features/qscintilla2.prf | |
67 | qt5/qsci/api/python/Python-2.4.api | 67 | qt5/qsci/api/python/Python-2.4.api | |
68 | qt5/qsci/api/python/Python-2.5.api | 68 | qt5/qsci/api/python/Python-2.5.api | |
69 | qt5/qsci/api/python/Python-2.6.api | 69 | qt5/qsci/api/python/Python-2.6.api | |
70 | qt5/qsci/api/python/Python-2.7.api | 70 | qt5/qsci/api/python/Python-2.7.api | |
71 | qt5/qsci/api/python/Python-3.1.api | 71 | qt5/qsci/api/python/Python-3.1.api | |
72 | qt5/qsci/api/python/Python-3.10.api | 72 | qt5/qsci/api/python/Python-3.10.api | |
73 | qt5/qsci/api/python/Python-3.11.api | 73 | qt5/qsci/api/python/Python-3.11.api | |
74 | qt5/qsci/api/python/Python-3.2.api | 74 | qt5/qsci/api/python/Python-3.2.api | |
75 | qt5/qsci/api/python/Python-3.3.api | 75 | qt5/qsci/api/python/Python-3.3.api | |
76 | qt5/qsci/api/python/Python-3.4.api | 76 | qt5/qsci/api/python/Python-3.4.api | |
77 | qt5/qsci/api/python/Python-3.5.api | 77 | qt5/qsci/api/python/Python-3.5.api | |
78 | qt5/qsci/api/python/Python-3.6.api | 78 | qt5/qsci/api/python/Python-3.6.api |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2023/05/31 19:06:27 adam Exp $ | 1 | $NetBSD: distinfo,v 1.10 2023/12/12 21:58:59 adam Exp $ | |
2 | 2 | |||
3 | BLAKE2s (QScintilla_src-2.14.0.tar.gz) = b9358db2dd8fdc72acad908e4c39b59a59a8e16495a308da9b3cd7b406d6aa44 | 3 | BLAKE2s (QScintilla_src-2.14.1.tar.gz) = 356f4eb5d49f0a81eb10a28da6353ff2ba61a770cba6c190ed6993f7576c1081 | |
4 | SHA512 (QScintilla_src-2.14.0.tar.gz) = 28a38fa9a5ea80f846ad940870ad6201cb6ff91bd10ebeb2c353aa6c2ce727f92beb62bdd9fb20715f92b1f8753088a6e1b2ca7f92c6b81a9f1c242e9974f0fd | 4 | SHA512 (QScintilla_src-2.14.1.tar.gz) = 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a | |
5 | Size (QScintilla_src-2.14.0.tar.gz) = 3234541 bytes | 5 | Size (QScintilla_src-2.14.1.tar.gz) = 3233610 bytes |