diff options
author | adam <adam@pkgsrc.org> | 2020-04-12 06:24:30 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2020-04-12 06:24:30 +0000 |
commit | 6175695b4bf38b2610f60af543aaaec3bca91855 (patch) | |
tree | 1794aab3d93b638bbcb80d7b07e17ca8899ac324 /x11 | |
parent | 899431342f325865a757a1519d526d70296d6e28 (diff) | |
download | pkgsrc-6175695b4bf38b2610f60af543aaaec3bca91855.tar.gz |
py-qt5: updated to 5.14.2
v5.14.2
- Added the missing QTextCodec.convertFromUnicode().
- Added the OpenGL ES bindings.
- Added QFlags.__index__().
v5.14.1
- This is a bug fix release.
v5.14.0
- Added support for Qt v5.14.0.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/py-qt5/Makefile | 14 | ||||
-rw-r--r-- | x11/py-qt5/PLIST | 10 | ||||
-rw-r--r-- | x11/py-qt5/distinfo | 12 | ||||
-rw-r--r-- | x11/py-qt5/patches/patch-configure.py | 19 |
4 files changed, 35 insertions, 20 deletions
diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index b1c2285f78d..12f0608ef40 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.55 2020/03/10 22:11:19 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2020/04/12 06:24:30 adam Exp $ -DISTNAME= PyQt5-5.13.2 +DISTNAME= PyQt5-5.14.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/} -PKGREVISION= 4 CATEGORIES= x11 python -MASTER_SITES= https://www.riverbankcomputing.com/static/Downloads/PyQt5/${PKGVERSION_NOREV}/ +MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyQt5/} MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Python binding for Qt5 @@ -44,7 +43,7 @@ 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 +SUBST_VARS.x11lib= PREFIX PYVERSSUFFIX do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ @@ -65,9 +64,8 @@ fix-darwin-install-name: .else PLIST.x11= yes .endif -post-install: fix-alternatives -fix-alternatives: +post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} pylupdate5 pylupdate5-${PYVERSSUFFIX} && \ ${MV} pyrcc5 pyrcc5-${PYVERSSUFFIX} && \ @@ -85,6 +83,7 @@ BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.19.14 .include "../../x11/qt5-qtmultimedia/buildlink3.mk" .include "../../x11/qt5-qtnetworkauth/buildlink3.mk" .include "../../x11/qt5-qtsensors/buildlink3.mk" +.include "../../x11/qt5-qtserialport/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" .if ${OPSYS} == "Darwin" @@ -95,6 +94,7 @@ 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-qtwebsockets/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt5/PLIST b/x11/py-qt5/PLIST index d48e33a9ea0..702640f2866 100644 --- a/x11/py-qt5/PLIST +++ b/x11/py-qt5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2020/01/26 12:53:34 rhialto Exp $ +@comment $NetBSD: PLIST,v 1.15 2020/04/12 06:24:30 adam Exp $ bin/pylupdate5-${PYVERSSUFFIX} bin/pyrcc5-${PYVERSSUFFIX} bin/pyuic5-${PYVERSSUFFIX} @@ -40,6 +40,8 @@ ${PLIST.py3x}${PYSITELIB}/PyQt5/QtQuickWidgets.pyi ${PYSITELIB}/PyQt5/QtQuickWidgets.so ${PLIST.py3x}${PYSITELIB}/PyQt5/QtSensors.pyi ${PYSITELIB}/PyQt5/QtSensors.so +${PYSITELIB}/PyQt5/QtSerialPort.pyi +${PYSITELIB}/PyQt5/QtSerialPort.so ${PLIST.py3x}${PYSITELIB}/PyQt5/QtSql.pyi ${PYSITELIB}/PyQt5/QtSql.so ${PLIST.py3x}${PYSITELIB}/PyQt5/QtSvg.pyi @@ -165,6 +167,7 @@ share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qbitarray.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qbuffer.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qbytearray.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qbytearraymatcher.sip +share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qcalendar.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qcborcommon.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qcborstream.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qchar.sip @@ -226,7 +229,6 @@ share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qpluginloader.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qpoint.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qprocess.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qpropertyanimation.sip -share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qpycore_onexit.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qpycore_qhash.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qpycore_qlist.sip share/sip${PYVERSSUFFIX}/PyQt5/QtCore/qpycore_qmap.sip @@ -330,6 +332,8 @@ share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qbitmap.sip share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qbrush.sip share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qclipboard.sip share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qcolor.sip +share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qcolorspace.sip +share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qcolortransform.sip share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qcursor.sip share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qdesktopservices.sip share/sip${PYVERSSUFFIX}/PyQt5/QtGui/qdrag.sip @@ -525,6 +529,7 @@ share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qdnslookup.sip share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qhostaddress.sip share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qhostinfo.sip share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qhstspolicy.sip +share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qhttp2configuration.sip share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qhttpmultipart.sip share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qlocalserver.sip share/sip${PYVERSSUFFIX}/PyQt5/QtNetwork/qlocalsocket.sip @@ -648,6 +653,7 @@ share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsgflatcolormaterial.sip share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsggeometry.sip share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsgimagenode.sip share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsgmaterial.sip +share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsgmaterialrhishader.sip share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsgnode.sip share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsgrectanglenode.sip share/sip${PYVERSSUFFIX}/PyQt5/QtQuick/qsgrendererinterface.sip diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo index 3acd57be182..8bb4752b853 100644 --- a/x11/py-qt5/distinfo +++ b/x11/py-qt5/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.14 2019/11/18 19:44:51 adam Exp $ +$NetBSD: distinfo,v 1.15 2020/04/12 06:24:30 adam Exp $ -SHA1 (PyQt5-5.13.2.tar.gz) = 90951813d3186fb2b76d134d90541e373889ccfc -RMD160 (PyQt5-5.13.2.tar.gz) = 9ba0ea50973d6f5507c496e4a610e9b44adb1a62 -SHA512 (PyQt5-5.13.2.tar.gz) = 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55 -Size (PyQt5-5.13.2.tar.gz) = 3162810 bytes -SHA1 (patch-configure.py) = d04e6be9b505a039b934a613de09becf127e1c64 +SHA1 (PyQt5-5.14.2.tar.gz) = 3cce5c033b243c2cb5a6b457313168eeea9114c3 +RMD160 (PyQt5-5.14.2.tar.gz) = 9f4672ff0a2165a7557216ac3a14fadbb9db9375 +SHA512 (PyQt5-5.14.2.tar.gz) = 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec +Size (PyQt5-5.14.2.tar.gz) = 3246557 bytes +SHA1 (patch-configure.py) = 72d5e418b3eb81225ab8f6338874ce8d6bacff82 SHA1 (patch-designer_designer.pro-in) = 8b7d885c4a5c5336dbdbead2bd88a4da02026ee2 SHA1 (patch-qmlscene_qmlscene.pro-in) = 055ad9670d9d67dd8fca2f293a0b8b8c71512a4d diff --git a/x11/py-qt5/patches/patch-configure.py b/x11/py-qt5/patches/patch-configure.py index 09a68e2432b..98b32dcec65 100644 --- a/x11/py-qt5/patches/patch-configure.py +++ b/x11/py-qt5/patches/patch-configure.py @@ -1,10 +1,10 @@ -$NetBSD: patch-configure.py,v 1.7 2018/02/01 21:09:29 adam Exp $ +$NetBSD: patch-configure.py,v 1.8 2020/04/12 06:24:31 adam Exp $ Do not expect an app bundle on Darwin. ---- configure.py.orig 2018-01-23 10:20:28.000000000 +0000 +--- configure.py.orig 2020-04-02 14:58:06.000000000 +0000 +++ configure.py -@@ -2009,10 +2009,7 @@ def run_make(target_config, verbose, exe +@@ -2137,10 +2137,7 @@ def run_make(target_config, verbose, exe make = 'make' makefile_target = '' @@ -16,7 +16,7 @@ Do not expect an app bundle on Darwin. remove_file(platform_exe) -@@ -2568,7 +2565,7 @@ def generate_module_makefile(target_conf +@@ -2702,7 +2699,7 @@ def generate_module_makefile(target_conf # Note some version of Qt5 (probably incorrectly) implements # 'plugin_bundle' instead of 'plugin' so we specify both. @@ -25,7 +25,7 @@ Do not expect an app bundle on Darwin. pro_add_qt_dependencies(target_config, metadata, pro_lines) -@@ -2614,7 +2611,7 @@ win32 { +@@ -2748,7 +2745,7 @@ win32 { PY_MODULE = %s.so macx { @@ -34,3 +34,12 @@ Do not expect an app bundle on Darwin. QMAKE_LFLAGS += "-undefined dynamic_lookup" +@@ -3008,7 +3005,7 @@ def check_sip(target_config, verbose): + + os.makedirs(target_config.sip_inc_dir, exist_ok=True) + +- argv = ['sip-module', '--sip-h'] ++ argv = ['sip-module-@PYVERSSUFFIX@', '--sip-h'] + + if target_config.abi_version: + argv.append('--abi-version') |