diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index 897c6b55447..1e71b61bbe7 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.27 2021/02/14 14:24:20 sthen Exp $ +# $OpenBSD: Makefile,v 1.28 2021/03/17 08:21:55 sthen Exp $ COMMENT= Python bindings for Qt5 DPB_PROPERTIES= parallel -MODPY_EGG_VERSION= 5.15.2 +MODPY_EGG_VERSION= 5.15.4 DISTNAME= PyQt5-${MODPY_EGG_VERSION} PKGNAME= py-qt5-${MODPY_EGG_VERSION} -REVISION= 1 CATEGORIES= x11 devel diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo index 991d5c6808f..a1cff1fd999 100644 --- a/x11/py-qt5/distinfo +++ b/x11/py-qt5/distinfo @@ -1,2 +1,2 @@ -SHA256 (PyQt5-5.15.2.tar.gz) = NysI3JMh0SAeRpAYJpfF5/+y4HcOa0pFUZAlE0sS5Pw= -SIZE (PyQt5-5.15.2.tar.gz) = 3265445 +SHA256 (PyQt5-5.15.4.tar.gz) = KmlZfg3RHKq+dfrhM/7KZjh4GfybwFD1R+VVG86X5b4= +SIZE (PyQt5-5.15.4.tar.gz) = 3258085 diff --git a/x11/py-qt5/patches/patch-configure_py b/x11/py-qt5/patches/patch-configure_py index 43cec55a700..de7e0963647 100644 --- a/x11/py-qt5/patches/patch-configure_py +++ b/x11/py-qt5/patches/patch-configure_py @@ -1,8 +1,9 @@ -$OpenBSD: patch-configure_py,v 1.5 2021/01/19 06:26:49 rsadowski Exp $ +$OpenBSD: patch-configure_py,v 1.6 2021/03/17 08:21:55 sthen Exp $ + Index: configure.py --- configure.py.orig +++ configure.py -@@ -2176,7 +2176,18 @@ def run_command(cmd, verbose): +@@ -2157,7 +2157,18 @@ def run_command(cmd, verbose): """ Run a command and display the output if requested. cmd is the command to run. verbose is set if the output is to be displayed. """ @@ -21,7 +22,7 @@ Index: configure.py if verbose: sys.stdout.write(cmd + "\n") -@@ -2921,7 +2932,7 @@ Type 'no' to decline the terms of the license. +@@ -2902,7 +2913,7 @@ Type 'no' to decline the terms of the license. sys.stdout.flush() try: diff --git a/x11/py-qt5/pkg/PLIST b/x11/py-qt5/pkg/PLIST index 66934a4ad16..e595e58d4fe 100644 --- a/x11/py-qt5/pkg/PLIST +++ b/x11/py-qt5/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.9 2021/02/14 14:24:20 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.10 2021/03/17 08:21:55 sthen Exp $ +@conflict py-qt5-* @pkgpath x11/py-qt5,-main @pkgpath x11/py-qt5 -@conflict py-qt5-* bin/pylupdate5 bin/pyrcc5 bin/pyuic5 @@ -20,7 +20,6 @@ lib/python${MODPY_VERSION}/site-packages/PyQt5-${MODPY_EGG_VERSION}.dist-info/RE @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimedia${MODPY_ABI3SO}.so @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimediaWidgets${MODPY_ABI3SO}.so @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetwork${MODPY_ABI3SO}.so -@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetworkAuth${MODPY_ABI3SO}.so @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc${MODPY_ABI3SO}.so @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL${MODPY_ABI3SO}.so @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPositioning${MODPY_ABI3SO}.so @@ -540,17 +539,6 @@ lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetwork/qsslsocket.sip lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetwork/qtcpserver.sip lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetwork/qtcpsocket.sip lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetwork/qudpsocket.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/ -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/QtNetworkAuth.toml -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/QtNetworkAuthmod.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qabstractoauth.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qabstractoauth2.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qabstractoauthreplyhandler.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qoauth1.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qoauth1signature.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qoauth2authorizationcodeflow.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qoauthhttpserverreplyhandler.sip -lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNetworkAuth/qoauthoobreplyhandler.sip lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNfc/ lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNfc/QtNfc.toml lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtNfc/QtNfcmod.sip @@ -942,8 +930,20 @@ lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/driver.py lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/exceptions.py lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/icon_cache.py lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/objcreator.py +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v2/ +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v2/__init__.py +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v2/as_string.py +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v2/ascii_upper.py +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v2/proxy_base.py +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v2/string_io.py lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/ lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/__init__.py +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}as_string.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}ascii_upper.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}proxy_base.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}string_io.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/as_string.py lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/ascii_upper.py lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/proxy_base.py