[pkgsrc/trunk]: pkgsrc/x11/py-qt5 py-qt5: update to 5.15.7.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44c716b7363e
branches:  trunk
changeset: 389223:44c716b7363e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 15:31:37 2022 +0000

description:
py-qt5: update to 5.15.7.

v5.15.7 6th June 2022
  - Refactored the draw methods of QPainter to accept sip.array objects of
    appropriate types.  Such arrays, once initialised, can be used very
    efficiently as they do not require repeated conversion from the usual
    Python collection types.
  - Added the missing QBluetoothUuid constructors.
  - PyQt5-sip v12.11 is now required to enable support for sip.array.
  - Bug fixes.

v5.15.6 24th October 2021
  - Bug fixes.

diffstat:

 x11/py-qt5/Makefile                   |    62 +-
 x11/py-qt5/PLIST                      |  1758 ++++++++++++++++----------------
 x11/py-qt5/PLIST.Darwin               |     5 +-
 x11/py-qt5/distinfo                   |    10 +-
 x11/py-qt5/patches/patch-configure.py |    45 -
 x11/py-qt5/patches/patch-project.py   |    15 +
 6 files changed, 892 insertions(+), 1003 deletions(-)

diffs (truncated from 2006 to 300 lines):

diff -r 712c94464073 -r 44c716b7363e x11/py-qt5/Makefile
--- a/x11/py-qt5/Makefile       Fri Dec 02 15:30:25 2022 +0000
+++ b/x11/py-qt5/Makefile       Fri Dec 02 15:31:37 2022 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2022/11/25 13:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2022/12/02 15:31:37 wiz Exp $
 
-DISTNAME=      PyQt5-5.15.5
+DISTNAME=      PyQt5-5.15.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/}
-PKGREVISION=   7
 CATEGORIES=    x11 python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=P/PyQt5/}
 
@@ -11,46 +10,26 @@
 HOMEPAGE=      https://www.riverbankcomputing.com/software/pyqt/intro
 LICENSE=       gnu-gpl-v3
 
-PYTHON_VERSIONS_INCOMPATIBLE+= 311 # py-sip
-
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
-.endif
-DEPENDS+=      ${PYPKGPREFIX}-sip-qt5>=4.19.23:../../x11/py-sip-qt5
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sip6-[0-9]*:../../x11/py-sip6
+TOOL_DEPENDS+= ${PYPKGPREFIX}-qt-builder-[0-9]*:../../x11/py-qt-builder
+DEPENDS+=      ${PYPKGPREFIX}-sip-qt5>=12:../../x11/py-sip-qt5
 
 USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
-CONFIGURE_ARGS+=       -b ${PREFIX}/bin
-CONFIGURE_ARGS+=       -d ${PREFIX}/${PYSITELIB}
-CONFIGURE_ARGS+=       --sipdir ${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5
-CONFIGURE_ARGS+=       --qml-plugindir ${PREFIX}/qt5/plugins/PyQt5-${PYVERSSUFFIX}/
-CONFIGURE_ARGS+=       --designer-plugindir ${PREFIX}/qt5/plugins/designer${PYVERSSUFFIX}/
-CONFIGURE_ARGS+=       -q ${QTDIR}/bin/qmake
-CONFIGURE_ARGS+=       --confirm-license
-CONFIGURE_ARGS+=       --qsci-api
-CONFIGURE_ARGS+=       --qsci-api-destdir ${PREFIX}/qt5/qsci${PYVERSSUFFIX}
-CONFIGURE_ARGS+=       --sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
-CONFIGURE_ARGS+=       --verbose
 
-INSTALL_ENV+=          INSTALL_ROOT=${DESTDIR}
+PLIST_VARS+=           x11
 
-PLIST_VARS+=           webkit x11
-PY_PATCHPLIST=         yes
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 SUBST_CLASSES+=                x11lib
 SUBST_STAGE.x11lib=    pre-configure
 SUBST_MESSAGE.x11lib=  Fixing rpath for X11 and pulseaudio libraries.
-SUBST_FILES.x11lib+=   configure.py
 SUBST_FILES.x11lib+=   designer/designer.pro-in
 SUBST_FILES.x11lib+=   qmlscene/qmlscene.pro-in
 SUBST_SED.x11lib+=     -e 's,@X11LIB@,${X11BASE}/lib,'
-SUBST_VARS.x11lib=     PREFIX PYVERSSUFFIX
 
-do-configure:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-               ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
+pre-configure:
+       ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -74,24 +53,9 @@
        ${MV} pyrcc5 pyrcc5-${PYVERSSUFFIX} && \
        ${MV} pyuic5 pyuic5-${PYVERSSUFFIX} || ${TRUE}
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.py-qt5
-PKG_SUPPORTED_OPTIONS+=        dbus
-PKG_SUGGESTED_OPTIONS+=        dbus
-
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
 
-PLIST_VARS+=           dbus
-.if !empty(PKG_OPTIONS:Mdbus)
-PLIST.dbus=            yes
-.include "../../sysutils/dbus-python-common/buildlink3.mk"
-.include "../../sysutils/py-dbus/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --no-python-dbus
-.endif
-
-.include "../../lang/python/extension.mk"
-BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.19.23
-.include "../../x11/py-sip/buildlink3.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtcharts/buildlink3.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
@@ -104,12 +68,10 @@
 .if ${OPSYS} == "Darwin"
 .  include "../../x11/qt5-qtmacextras/buildlink3.mk"
 .else
-# currently qt5-qtwebkit does not build on Darwin
-PLIST.webkit=  yes
-.  include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .  include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .endif
 .include "../../x11/qt5-qtwebchannel/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../x11/qt5-qtwebsockets/buildlink3.mk"
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 712c94464073 -r 44c716b7363e x11/py-qt5/PLIST
--- a/x11/py-qt5/PLIST  Fri Dec 02 15:30:25 2022 +0000
+++ b/x11/py-qt5/PLIST  Fri Dec 02 15:31:37 2022 +0000
@@ -1,941 +1,899 @@
-@comment $NetBSD: PLIST,v 1.20 2021/10/19 18:59:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2022/12/02 15:31:37 wiz Exp $
 bin/pylupdate5-${PYVERSSUFFIX}
 bin/pyrcc5-${PYVERSSUFFIX}
 bin/pyuic5-${PYVERSSUFFIX}
-${PYSITELIB}/PyQt5-${PKGVERSION}.dist-info/INSTALLER
-${PYSITELIB}/PyQt5-${PKGVERSION}.dist-info/METADATA
-${PYSITELIB}/PyQt5-${PKGVERSION}.dist-info/RECORD
-${PYSITELIB}/PyQt5/Qt.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtCore.pyi
-${PYSITELIB}/PyQt5/QtCore.so
-${PLIST.dbus}${PLIST.py3x}${PYSITELIB}/PyQt5/QtDBus.pyi
-${PLIST.dbus}${PYSITELIB}/PyQt5/QtDBus.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtDesigner.pyi
-${PYSITELIB}/PyQt5/QtDesigner.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtGui.pyi
-${PYSITELIB}/PyQt5/QtGui.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtHelp.pyi
-${PYSITELIB}/PyQt5/QtHelp.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtLocation.pyi
-${PYSITELIB}/PyQt5/QtLocation.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtMultimedia.pyi
-${PYSITELIB}/PyQt5/QtMultimedia.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtMultimediaWidgets.pyi
-${PYSITELIB}/PyQt5/QtMultimediaWidgets.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtNetwork.pyi
-${PYSITELIB}/PyQt5/QtNetwork.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtOpenGL.pyi
-${PYSITELIB}/PyQt5/QtOpenGL.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtPositioning.pyi
-${PYSITELIB}/PyQt5/QtPositioning.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtPrintSupport.pyi
-${PYSITELIB}/PyQt5/QtPrintSupport.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtQml.pyi
-${PYSITELIB}/PyQt5/QtQml.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtQuick.pyi
-${PYSITELIB}/PyQt5/QtQuick.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtQuickWidgets.pyi
-${PYSITELIB}/PyQt5/QtQuickWidgets.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtSensors.pyi
-${PYSITELIB}/PyQt5/QtSensors.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtSerialPort.pyi
-${PYSITELIB}/PyQt5/QtSerialPort.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtSql.pyi
-${PYSITELIB}/PyQt5/QtSql.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtSvg.pyi
-${PYSITELIB}/PyQt5/QtSvg.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtTest.pyi
-${PYSITELIB}/PyQt5/QtTest.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebChannel.pyi
-${PYSITELIB}/PyQt5/QtWebChannel.so
-${PLIST.webkit}${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKit.pyi
-${PLIST.webkit}${PYSITELIB}/PyQt5/QtWebKit.so
-${PLIST.webkit}${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi
-${PLIST.webkit}${PYSITELIB}/PyQt5/QtWebKitWidgets.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebSockets.pyi
-${PYSITELIB}/PyQt5/QtWebSockets.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtWidgets.pyi
-${PYSITELIB}/PyQt5/QtWidgets.so
-${PLIST.x11}${PLIST.py3x}${PYSITELIB}/PyQt5/QtX11Extras.pyi
-${PLIST.x11}${PYSITELIB}/PyQt5/QtX11Extras.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtXml.pyi
-${PYSITELIB}/PyQt5/QtXml.so
-${PLIST.py3x}${PYSITELIB}/PyQt5/QtXmlPatterns.pyi
-${PYSITELIB}/PyQt5/QtXmlPatterns.so
-${PYSITELIB}/PyQt5/_QOpenGLFunctions_2_0.so
-${PYSITELIB}/PyQt5/_QOpenGLFunctions_2_1.so
-${PYSITELIB}/PyQt5/_QOpenGLFunctions_4_1_Core.so
+${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}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/PyQt5/Qt.abi3.so
+${PYSITELIB}/PyQt5/QtCore.abi3.so
+${PLIST.dbus}${PYSITELIB}/PyQt5/QtDBus.abi3.so
+${PYSITELIB}/PyQt5/QtDesigner.abi3.so
+${PYSITELIB}/PyQt5/QtGui.abi3.so
+${PYSITELIB}/PyQt5/QtHelp.abi3.so
+${PYSITELIB}/PyQt5/QtLocation.abi3.so
+${PYSITELIB}/PyQt5/QtMultimedia.abi3.so
+${PYSITELIB}/PyQt5/QtMultimediaWidgets.abi3.so
+${PYSITELIB}/PyQt5/QtNetwork.abi3.so
+${PYSITELIB}/PyQt5/QtOpenGL.abi3.so
+${PYSITELIB}/PyQt5/QtPositioning.abi3.so
+${PYSITELIB}/PyQt5/QtPrintSupport.abi3.so
+${PYSITELIB}/PyQt5/QtQml.abi3.so
+${PYSITELIB}/PyQt5/QtQuick.abi3.so
+${PYSITELIB}/PyQt5/QtQuickWidgets.abi3.so
+${PYSITELIB}/PyQt5/QtSensors.abi3.so
+${PYSITELIB}/PyQt5/QtSerialPort.abi3.so
+${PYSITELIB}/PyQt5/QtSql.abi3.so
+${PYSITELIB}/PyQt5/QtSvg.abi3.so
+${PYSITELIB}/PyQt5/QtTest.abi3.so
+${PYSITELIB}/PyQt5/QtWebChannel.abi3.so
+${PYSITELIB}/PyQt5/QtWebKit.abi3.so
+${PYSITELIB}/PyQt5/QtWebKitWidgets.abi3.so
+${PYSITELIB}/PyQt5/QtWebSockets.abi3.so
+${PYSITELIB}/PyQt5/QtWidgets.abi3.so
+${PLIST.x11}${PYSITELIB}/PyQt5/QtX11Extras.abi3.so
+${PYSITELIB}/PyQt5/QtXml.abi3.so
+${PYSITELIB}/PyQt5/QtXmlPatterns.abi3.so
+${PYSITELIB}/PyQt5/_QOpenGLFunctions_2_0.abi3.so
+${PYSITELIB}/PyQt5/_QOpenGLFunctions_2_1.abi3.so
+${PYSITELIB}/PyQt5/_QOpenGLFunctions_4_1_Core.abi3.so
 ${PYSITELIB}/PyQt5/__init__.py
-${PYSITELIB}/PyQt5/pylupdate.so
+${PYSITELIB}/PyQt5/__init__.pyc
+${PYSITELIB}/PyQt5/bindings/QtCore/QtCore.toml
+${PYSITELIB}/PyQt5/bindings/QtCore/QtCoremod.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/pyqt-gpl.sip5
+${PYSITELIB}/PyQt5/bindings/QtCore/qabstractanimation.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qabstracteventdispatcher.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qabstractitemmodel.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qabstractnativeeventfilter.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qabstractproxymodel.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qabstractstate.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qabstracttransition.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qanimationgroup.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qbasictimer.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qbitarray.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qbuffer.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qbytearray.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qbytearraymatcher.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcalendar.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcborcommon.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcborstream.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qchar.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcollator.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcommandlineoption.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcommandlineparser.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qconcatenatetablesproxymodel.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcoreapplication.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcoreevent.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qcryptographichash.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qdatastream.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qdatetime.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qdeadlinetimer.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qdir.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qdiriterator.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qeasingcurve.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qelapsedtimer.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qeventloop.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qeventtransition.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qfile.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qfiledevice.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qfileinfo.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qfileselector.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qfilesystemwatcher.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qfinalstate.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qglobal.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qhistorystate.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qidentityproxymodel.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qiodevice.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qitemselectionmodel.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qjsonarray.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qjsondocument.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qjsonobject.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qjsonvalue.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qlibrary.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qlibraryinfo.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qline.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qlocale.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qlockfile.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qlogging.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qloggingcategory.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmargins.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmessageauthenticationcode.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmetaobject.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmetatype.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmimedata.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmimedatabase.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmimetype.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qmutex.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qnamespace.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qnumeric.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qobject.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qobjectcleanuphandler.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qobjectdefs.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qoperatingsystemversion.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qparallelanimationgroup.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qpauseanimation.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qpluginloader.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qpoint.sip
+${PYSITELIB}/PyQt5/bindings/QtCore/qprocess.sip