CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec 12 21:58:59 UTC 2023

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

Log Message:
qt5-qscintilla py-qt5-qscintilla: updated to 2.14.1

v2.14.1
- Bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/py-qt5-qscintilla/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/py-qt5-qscintilla/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/qt5-qscintilla/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt5-qscintilla/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/qt5-qscintilla/PLIST
cvs rdiff -u -r1.9 -r1.10 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.27 pkgsrc/x11/py-qt5-qscintilla/Makefile:1.28
--- pkgsrc/x11/py-qt5-qscintilla/Makefile:1.27  Sun Nov 12 13:24:22 2023
+++ pkgsrc/x11/py-qt5-qscintilla/Makefile       Tue Dec 12 21:58:59 2023
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.27 2023/11/12 13:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2023/12/12 21:58:59 adam Exp $
 
-PKGREVISION= 4
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-qt5-${DISTNAME:S/_src//:tl}
 COMMENT=       QScintilla -- Python bindings
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
-TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6>=6.0.2:../../x11/py-sip6
+TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder>=1.6:../../x11/py-qt-builder
 DEPENDS+=      ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/Python
@@ -22,6 +21,13 @@ post-extract:
 pre-configure:
        ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+post-install:
+       install_name_tool -id ${PREFIX}/${PYSITELIB}/PyQt5/Qsci.abi3.so \
+       ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt5/Qsci.abi3.so
+.endif
+
 .include "../../lang/python/wheel.mk"
 BUILDLINK_API_DEPENDS.qt5-qscintilla+= qt5-qscintilla>=${PKGVERSION_NOREV}
 .include "../../x11/qt5-qscintilla/buildlink3.mk"

Index: pkgsrc/x11/py-qt5-qscintilla/PLIST
diff -u pkgsrc/x11/py-qt5-qscintilla/PLIST:1.6 pkgsrc/x11/py-qt5-qscintilla/PLIST:1.7
--- pkgsrc/x11/py-qt5-qscintilla/PLIST:1.6      Sat Oct 28 19:57:26 2023
+++ pkgsrc/x11/py-qt5-qscintilla/PLIST  Tue Dec 12 21:58:59 2023
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2023/10/28 19:57:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2023/12/12 21:58:59 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
 ${PYSITELIB}/PyQt5/Qsci.abi3.so
 ${PYSITELIB}/PyQt5/bindings/Qsci/Qsci.toml
 ${PYSITELIB}/PyQt5/bindings/Qsci/qsciabstractapis.sip
@@ -61,6 +64,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}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL

Index: pkgsrc/x11/qt5-qscintilla/Makefile
diff -u pkgsrc/x11/qt5-qscintilla/Makefile:1.24 pkgsrc/x11/qt5-qscintilla/Makefile:1.25
--- pkgsrc/x11/qt5-qscintilla/Makefile:1.24     Sun Nov 12 13:24:24 2023
+++ pkgsrc/x11/qt5-qscintilla/Makefile  Tue Dec 12 21:58:59 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.24 2023/11/12 13:24:24 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/12/12 21:58:59 adam Exp $
 
-PKGREVISION= 3
 .include "../../x11/qt5-qscintilla/Makefile.common"
 
 PKGNAME=       qt5-${DISTNAME:S/_src//:tl}
@@ -19,8 +18,8 @@ do-configure:
 .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
+       install_name_tool -id ${QTDIR}/lib/libqscintilla2_qt5.15.2.1.dylib \
+       ${DESTDIR}${QTDIR}/lib/libqscintilla2_qt5.15.2.1.dylib
 .endif
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/qt5-qscintilla/Makefile.common
diff -u pkgsrc/x11/qt5-qscintilla/Makefile.common:1.4 pkgsrc/x11/qt5-qscintilla/Makefile.common:1.5
--- pkgsrc/x11/qt5-qscintilla/Makefile.common:1.4       Wed May 31 19:06:27 2023
+++ pkgsrc/x11/qt5-qscintilla/Makefile.common   Tue Dec 12 21:58:59 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2023/05/31 19:06:27 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/12/12 21:58:59 adam Exp $
 #
 # used by x11/qt5-qscintilla/Makefile
 # used by x11/py-qt5-qscintilla/Makefile
 
-DISTNAME=      QScintilla_src-2.14.0
+DISTNAME=      QScintilla_src-2.14.1
 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.3 pkgsrc/x11/qt5-qscintilla/PLIST:1.4
--- pkgsrc/x11/qt5-qscintilla/PLIST:1.3 Wed May 31 19:06:27 2023
+++ pkgsrc/x11/qt5-qscintilla/PLIST     Tue Dec 12 21:58:59 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/05/31 19:06:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/12/12 21:58:59 adam Exp $
 qt5/include/Qsci/qsciabstractapis.h
 qt5/include/Qsci/qsciapis.h
 qt5/include/Qsci/qscicommand.h
@@ -62,7 +62,7 @@ qt5/include/Qsci/qscistyledtext.h
 qt5/lib/libqscintilla2_qt5.so
 qt5/lib/libqscintilla2_qt5.so.15
 qt5/lib/libqscintilla2_qt5.so.15.2
-qt5/lib/libqscintilla2_qt5.so.15.2.0
+qt5/lib/libqscintilla2_qt5.so.15.2.1
 qt5/mkspecs/features/qscintilla2.prf
 qt5/qsci/api/python/Python-2.4.api
 qt5/qsci/api/python/Python-2.5.api

Index: pkgsrc/x11/qt5-qscintilla/distinfo
diff -u pkgsrc/x11/qt5-qscintilla/distinfo:1.9 pkgsrc/x11/qt5-qscintilla/distinfo:1.10
--- pkgsrc/x11/qt5-qscintilla/distinfo:1.9      Wed May 31 19:06:27 2023
+++ pkgsrc/x11/qt5-qscintilla/distinfo  Tue Dec 12 21:58:59 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2023/05/31 19:06:27 adam Exp $
+$NetBSD: distinfo,v 1.10 2023/12/12 21:58:59 adam Exp $
 
-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
+BLAKE2s (QScintilla_src-2.14.1.tar.gz) = 356f4eb5d49f0a81eb10a28da6353ff2ba61a770cba6c190ed6993f7576c1081
+SHA512 (QScintilla_src-2.14.1.tar.gz) = 19e2f9e0a14947501c575018df368d24eb7f8c74e74faa5246db36415bf28dc0beee507ed0e73107c02b36a99bbaf55f0ef3349f479d2332e1b92b2c4a32788a
+Size (QScintilla_src-2.14.1.tar.gz) = 3233610 bytes