diff options
author | adam <adam@pkgsrc.org> | 2018-02-01 21:09:29 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2018-02-01 21:09:29 +0000 |
commit | ba55f04770b28b7d94890f352d713a56b4716870 (patch) | |
tree | 03598ec7cfe328def29b4ed88ed2f623cf0e40e1 /x11 | |
parent | ba3f4c0633d82c5ba386542714deec8df4d81df5 (diff) | |
download | pkgsrc-ba55f04770b28b7d94890f352d713a56b4716870.tar.gz |
py-qt5: updated to 5.10
v5.10:
- Added support for Qt v5.10.0.
- Added the QtNetworkAuth module.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/py-qt5/Makefile | 34 | ||||
-rw-r--r-- | x11/py-qt5/PLIST | 24 | ||||
-rw-r--r-- | x11/py-qt5/distinfo | 12 | ||||
-rw-r--r-- | x11/py-qt5/patches/patch-configure.py | 35 |
4 files changed, 71 insertions, 34 deletions
diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index 2ef3f4c21f4..91040ba07c6 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2018/01/28 20:11:09 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2018/02/01 21:09:29 adam Exp $ -DISTNAME= PyQt5_gpl-${PYQT_VERSION} -PKGNAME= ${PYPKGPREFIX}-qt5-${PYQT_VERSION} -PKGREVISION= 1 -PYQT_VERSION= 5.9.1 +DISTNAME= PyQt5_gpl-5.10 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyQt5_gpl/qt5/} CATEGORIES= x11 python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/} @@ -11,10 +9,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Python binding for Qt5 HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro +USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config -USE_LANGUAGES= c c++ - CONFIGURE_ARGS+= -b ${PREFIX}/bin CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} CONFIGURE_ARGS+= -q ${QTDIR}/bin/qmake @@ -22,26 +19,27 @@ CONFIGURE_ARGS+= --confirm-license CONFIGURE_ARGS+= --qsci-api CONFIGURE_ARGS+= --sip ${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX} CONFIGURE_ARGS+= --verbose -#MAKEFLAGS+= LFLAGS=${LDFLAGS:Q} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} +PLIST_VARS+= webkit PY_PATCHPLIST= yes SUBST_CLASSES+= x11lib - -SUBST_STAGE.x11lib= post-patch -SUBST_SED.x11lib+= -e 's,@X11LIB@,${X11BASE}/lib,' -SUBST_SED.x11lib+= -e 's,@PREFIX@,${PREFIX},' -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_STAGE.x11lib= post-patch +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_SED.x11lib+= -e 's,@PREFIX@,${PREFIX},' do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${PYTHONBIN} configure.py ${CONFIGURE_ARGS} +.include "../../mk/bsd.prefs.mk" + .include "../../lang/python/extension.mk" .include "../../sysutils/dbus-python-common/buildlink3.mk" .include "../../sysutils/py-dbus/buildlink3.mk" @@ -54,7 +52,11 @@ BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.19.4 .include "../../x11/qt5-qtsensors/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" +.if ${OPSYS} != "Darwin" +# currently qt5-qtwebkit does not build on Darwin +PLIST.webkit= yes .include "../../x11/qt5-qtwebkit/buildlink3.mk" +.endif .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 2fabaa3a404..8a5f0be54ba 100644 --- a/x11/py-qt5/PLIST +++ b/x11/py-qt5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2018/01/23 19:35:07 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2018/02/01 21:09:29 adam Exp $ bin/pylupdate5 bin/pyrcc5 bin/pyuic5 @@ -43,10 +43,10 @@ ${PLIST.py3x}${PYSITELIB}/PyQt5/QtTest.pyi ${PYSITELIB}/PyQt5/QtTest.so ${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebChannel.pyi ${PYSITELIB}/PyQt5/QtWebChannel.so -${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKit.pyi -${PYSITELIB}/PyQt5/QtWebKit.so -${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi -${PYSITELIB}/PyQt5/QtWebKitWidgets.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 @@ -114,6 +114,9 @@ share/sip/PyQt5/QAxContainer/QAxContainermod.sip share/sip/PyQt5/QAxContainer/qaxbase.sip share/sip/PyQt5/QAxContainer/qaxobject.sip share/sip/PyQt5/QAxContainer/qaxwidget.sip +share/sip/PyQt5/QtAndroidExtras/QtAndroidExtrasmod.sip +share/sip/PyQt5/QtAndroidExtras/qandroidjniobject.sip +share/sip/PyQt5/QtAndroidExtras/qtandroid.sip share/sip/PyQt5/QtBluetooth/QtBluetoothmod.sip share/sip/PyQt5/QtBluetooth/qbluetooth.sip share/sip/PyQt5/QtBluetooth/qbluetoothaddress.sip @@ -219,6 +222,7 @@ share/sip/PyQt5/QtCore/qpycore_qpair.sip share/sip/PyQt5/QtCore/qpycore_qset.sip share/sip/PyQt5/QtCore/qpycore_qvector.sip share/sip/PyQt5/QtCore/qpycore_virtual_error_handler.sip +share/sip/PyQt5/QtCore/qrandom.sip share/sip/PyQt5/QtCore/qreadwritelock.sip share/sip/PyQt5/QtCore/qrect.sip share/sip/PyQt5/QtCore/qregexp.sip @@ -535,6 +539,15 @@ share/sip/PyQt5/QtNetwork/qsslsocket.sip share/sip/PyQt5/QtNetwork/qtcpserver.sip share/sip/PyQt5/QtNetwork/qtcpsocket.sip share/sip/PyQt5/QtNetwork/qudpsocket.sip +share/sip/PyQt5/QtNetworkAuth/QtNetworkAuthmod.sip +share/sip/PyQt5/QtNetworkAuth/qabstractoauth.sip +share/sip/PyQt5/QtNetworkAuth/qabstractoauth2.sip +share/sip/PyQt5/QtNetworkAuth/qabstractoauthreplyhandler.sip +share/sip/PyQt5/QtNetworkAuth/qoauth1.sip +share/sip/PyQt5/QtNetworkAuth/qoauth1signature.sip +share/sip/PyQt5/QtNetworkAuth/qoauth2authorizationcodeflow.sip +share/sip/PyQt5/QtNetworkAuth/qoauthhttpserverreplyhandler.sip +share/sip/PyQt5/QtNetworkAuth/qoauthoobreplyhandler.sip share/sip/PyQt5/QtNfc/QtNfcmod.sip share/sip/PyQt5/QtNfc/qndeffilter.sip share/sip/PyQt5/QtNfc/qndefmessage.sip @@ -557,6 +570,7 @@ share/sip/PyQt5/QtPositioning/qgeocircle.sip share/sip/PyQt5/QtPositioning/qgeocoordinate.sip share/sip/PyQt5/QtPositioning/qgeolocation.sip share/sip/PyQt5/QtPositioning/qgeopath.sip +share/sip/PyQt5/QtPositioning/qgeopolygon.sip share/sip/PyQt5/QtPositioning/qgeopositioninfo.sip share/sip/PyQt5/QtPositioning/qgeopositioninfosource.sip share/sip/PyQt5/QtPositioning/qgeorectangle.sip diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo index 253f1f98767..367232897ef 100644 --- a/x11/py-qt5/distinfo +++ b/x11/py-qt5/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2018/01/22 04:17:11 dbj Exp $ +$NetBSD: distinfo,v 1.7 2018/02/01 21:09:29 adam Exp $ -SHA1 (PyQt5_gpl-5.9.1.tar.gz) = b74f7410aefa21f077eca63fa11928f0bcadb99f -RMD160 (PyQt5_gpl-5.9.1.tar.gz) = 96f05042a3f09491652827afb542e99ffa6375a8 -SHA512 (PyQt5_gpl-5.9.1.tar.gz) = 1c7d00dac5329296dd205eddeeecfd29495c4746791730056d143438871eb64a5d9827dcb1e28a78e8746218908e0e72374bd686a21b631b9aa1aa1c67e61eac -Size (PyQt5_gpl-5.9.1.tar.gz) = 3101819 bytes -SHA1 (patch-configure.py) = ce938f19969073f7140489a6a47bc7e5adeef91b +SHA1 (PyQt5_gpl-5.10.tar.gz) = 14d68357685b6c9c0db9e747772ca3f80e0c8def +RMD160 (PyQt5_gpl-5.10.tar.gz) = f9db4a93c335126006827df7d39b1e35f17f9156 +SHA512 (PyQt5_gpl-5.10.tar.gz) = a86520870536618857ed3ee1601af45f5a0b456de192a5d6a3f8fa734e5cf49b8ce373928c0f4aeaae365d3fa95db03b5f59ae2903bc5eb2304b7edf22198033 +Size (PyQt5_gpl-5.10.tar.gz) = 3109934 bytes +SHA1 (patch-configure.py) = d04e6be9b505a039b934a613de09becf127e1c64 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 cd6c73aa3d9..09a68e2432b 100644 --- a/x11/py-qt5/patches/patch-configure.py +++ b/x11/py-qt5/patches/patch-configure.py @@ -1,15 +1,36 @@ -$NetBSD: patch-configure.py,v 1.6 2018/01/22 04:17:11 dbj Exp $ +$NetBSD: patch-configure.py,v 1.7 2018/02/01 21:09:29 adam Exp $ Do not expect an app bundle on Darwin. ---- configure.py.orig 2017-11-02 10:53:20.000000000 +0000 +--- configure.py.orig 2018-01-23 10:20:28.000000000 +0000 +++ configure.py -@@ -1968,7 +1968,7 @@ def run_make(target_config, verbose, exe +@@ -2009,10 +2009,7 @@ def run_make(target_config, verbose, exe make = 'make' makefile_target = '' - if target_config.py_platform == 'darwin': -+ if target_config.py_platform == 'darwin' and False: - platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe) - else: - platform_exe = os.path.join('.', exe) +- platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe) +- else: +- platform_exe = os.path.join('.', exe) ++ platform_exe = os.path.join('.', exe) + + remove_file(platform_exe) + +@@ -2568,7 +2565,7 @@ def generate_module_makefile(target_conf + + # Note some version of Qt5 (probably incorrectly) implements + # 'plugin_bundle' instead of 'plugin' so we specify both. +- pro_lines.append('CONFIG += warn_on exceptions_off %s' % ('staticlib hide_symbols' if target_config.static else 'plugin plugin_bundle')) ++ pro_lines.append('CONFIG += warn_on exceptions_off %s' % ('staticlib hide_symbols' if target_config.static else 'plugin')) + + pro_add_qt_dependencies(target_config, metadata, pro_lines) + +@@ -2614,7 +2611,7 @@ win32 { + PY_MODULE = %s.so + + macx { +- PY_MODULE_SRC = $(TARGET).plugin/Contents/MacOS/$(TARGET) ++ PY_MODULE_SRC = $(TARGET) + + QMAKE_LFLAGS += "-undefined dynamic_lookup" + |