py-qt5: updated to 5.11.3

PyQt v5.11.3 has been released. This is a minor functional release adding support for Qt v5.11.2. There are corresponding releases of PyQt3D, PyQtChart, PyQtDataVisualization and PyQtPurchasing.

PyQt v5.11.2 has been released. This is a major functional release. There are corresponding releases of PyQt3D, PyQtChart, PyQtDataVisualization and PyQtPurchasing.

4 files changed, 46 insertions, 27 deletions

diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index 2c9849d7d1e..848e94d8aa2 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2018/07/20 03:34:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2018/10/07 09:01:22 adam Exp $
 
-DISTNAME=	PyQt5_gpl-5.10.1
+DISTNAME=	PyQt5_gpl-5.11.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/PyQt5_gpl/qt5/}
-PKGREVISION=	3
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
@@ -10,6 +9,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Python binding for Qt5
 HOMEPAGE=	http://www.riverbankcomputing.com/software/pyqt/intro
 
+.include "../../lang/python/pyversion.mk"
+.if ${_PYTHON_VERSION} == 27
+DEPENDS+=	${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
+.endif
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
@@ -23,7 +27,7 @@ CONFIGURE_ARGS+=	--verbose
 
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
-PLIST_VARS+=		webkit
+PLIST_VARS+=		webkit x11
 PY_PATCHPLIST=		yes
 
 SUBST_CLASSES+=		x11lib
@@ -41,22 +45,41 @@ do-configure:
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "Darwin"
+.PHONY: fix-darwin-install-name
+post-install: fix-darwin-install-name
+fix-darwin-install-name:
+	${FIND} ${DESTDIR}${PREFIX} -name '*.so' -or -name '*.dylib' |	\
+		while read lib; do					\
+		libname=`basename $${lib}`;				\
+		libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`;	\
+		install_name_tool -id $${libdir}/$${libname} $${lib};	\
+	done
+.else
+PLIST.x11=	yes
+.endif
+
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/dbus-python-common/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-sip+=	${PYPKGPREFIX}-sip>=4.19.4
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtcharts/buildlink3.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qtnetworkauth/buildlink3.mk"
 .include "../../x11/qt5-qtsensors/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
-.if ${OPSYS} != "Darwin"
+.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-qtwebkit/buildlink3.mk"
+.  include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .endif
 .include "../../x11/qt5-qtwebsockets/buildlink3.mk"
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
diff --git a/x11/py-qt5/PLIST b/x11/py-qt5/PLIST
index 1d12d66580c..4f19c042687 100644
--- a/x11/py-qt5/PLIST
+++ b/x11/py-qt5/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2018/04/14 20:08:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/10/07 09:01:22 adam Exp $
 bin/pylupdate5
 bin/pyrcc5
 bin/pyuic5
+${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
@@ -21,6 +24,8 @@ ${PLIST.py3x}${PYSITELIB}/PyQt5/QtMultimediaWidgets.pyi
 ${PYSITELIB}/PyQt5/QtMultimediaWidgets.so
 ${PLIST.py3x}${PYSITELIB}/PyQt5/QtNetwork.pyi
 ${PYSITELIB}/PyQt5/QtNetwork.so
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtNetworkAuth.pyi
+${PYSITELIB}/PyQt5/QtNetworkAuth.so
 ${PLIST.py3x}${PYSITELIB}/PyQt5/QtOpenGL.pyi
 ${PYSITELIB}/PyQt5/QtOpenGL.so
 ${PLIST.py3x}${PYSITELIB}/PyQt5/QtPositioning.pyi
@@ -51,6 +56,8 @@ ${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
@@ -220,6 +227,7 @@ share/sip/PyQt5/QtCore/qpycore_qlist.sip
 share/sip/PyQt5/QtCore/qpycore_qmap.sip
 share/sip/PyQt5/QtCore/qpycore_qpair.sip
 share/sip/PyQt5/QtCore/qpycore_qset.sip
+share/sip/PyQt5/QtCore/qpycore_qvariantmap.sip
 share/sip/PyQt5/QtCore/qpycore_qvector.sip
 share/sip/PyQt5/QtCore/qpycore_virtual_error_handler.sip
 share/sip/PyQt5/QtCore/qrandom.sip
@@ -686,6 +694,7 @@ share/sip/PyQt5/QtSvg/qsvggenerator.sip
 share/sip/PyQt5/QtSvg/qsvgrenderer.sip
 share/sip/PyQt5/QtSvg/qsvgwidget.sip
 share/sip/PyQt5/QtTest/QtTestmod.sip
+share/sip/PyQt5/QtTest/qabstractitemmodeltester.sip
 share/sip/PyQt5/QtTest/qsignalspy.sip
 share/sip/PyQt5/QtTest/qtestcase.sip
 share/sip/PyQt5/QtTest/qtestkeyboard.sip
@@ -702,6 +711,8 @@ share/sip/PyQt5/QtWebEngine/qtwebengineglobal.sip
 share/sip/PyQt5/QtWebEngineCore/QtWebEngineCoremod.sip
 share/sip/PyQt5/QtWebEngineCore/qwebenginecookiestore.sip
 share/sip/PyQt5/QtWebEngineCore/qwebenginehttprequest.sip
+share/sip/PyQt5/QtWebEngineCore/qwebenginequotarequest.sip
+share/sip/PyQt5/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
 share/sip/PyQt5/QtWebEngineCore/qwebengineurlrequestinfo.sip
 share/sip/PyQt5/QtWebEngineCore/qwebengineurlrequestinterceptor.sip
 share/sip/PyQt5/QtWebEngineCore/qwebengineurlrequestjob.sip
diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo
index 03073c0d1d8..2a9e6d41849 100644
--- a/x11/py-qt5/distinfo
+++ b/x11/py-qt5/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2018/06/23 17:49:36 wiz Exp $
+$NetBSD: distinfo,v 1.11 2018/10/07 09:01:22 adam Exp $
 
-SHA1 (PyQt5_gpl-5.10.1.tar.gz) = 638a80519f3250e813ebd5a669651f43f416f14b
-RMD160 (PyQt5_gpl-5.10.1.tar.gz) = 4e0d454172288d26d40ebf2c15a70e0e271da57e
-SHA512 (PyQt5_gpl-5.10.1.tar.gz) = 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
-Size (PyQt5_gpl-5.10.1.tar.gz) = 3110469 bytes
+SHA1 (PyQt5_gpl-5.11.3.tar.gz) = 497c25e36ad982034d2a18075f34a67eb113fba8
+RMD160 (PyQt5_gpl-5.11.3.tar.gz) = 01f76afac6ddc9267dda3a0510795b8d2df57247
+SHA512 (PyQt5_gpl-5.11.3.tar.gz) = 6f4abb1866ce357263c208121607072e127c8853e9c6bf039b034fefdda4c40e38f917c3b313375f0d692d764ecf26ff3a6b12cda2a2eeb5237db8b5e9443548
+Size (PyQt5_gpl-5.11.3.tar.gz) = 3121036 bytes
 SHA1 (patch-configure.py) = d04e6be9b505a039b934a613de09becf127e1c64
 SHA1 (patch-designer_designer.pro-in) = 8b7d885c4a5c5336dbdbead2bd88a4da02026ee2
 SHA1 (patch-qmlscene_qmlscene.pro-in) = 055ad9670d9d67dd8fca2f293a0b8b8c71512a4d
-SHA1 (patch-sip_QtTest_qtestmouse.sip) = ed279d265dea44d43093cae0c501d512f588f2e5
diff --git a/x11/py-qt5/patches/patch-sip_QtTest_qtestmouse.sip b/x11/py-qt5/patches/patch-sip_QtTest_qtestmouse.sip
deleted file mode 100644
index 1b4d8247330..00000000000
--- a/x11/py-qt5/patches/patch-sip_QtTest_qtestmouse.sip
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-sip_QtTest_qtestmouse.sip,v 1.1 2018/06/23 17:49:36 wiz Exp $
-
-Fix build with Qt 5.11, which removed this symbol.
-
---- sip/QtTest/qtestmouse.sip.orig	2018-02-27 10:43:53.000000000 +0000
-+++ sip/QtTest/qtestmouse.sip
-@@ -41,7 +41,6 @@ namespace QTest
-     void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
-     void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
-     void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
--    void waitForEvents() /ReleaseGIL/;
-     void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
-     void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
-     void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);