diff options
author | wiz <wiz@pkgsrc.org> | 2018-06-23 11:23:46 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2018-06-23 11:23:46 +0000 |
commit | 8061acfc6d421a13d18c51aedf72e34783578153 (patch) | |
tree | 48d69f68ab3f98aaf8fb1c0a575d3728c917ce71 /x11 | |
parent | a753cea5bd5e1d634d7732233c057b7218195850 (diff) | |
download | pkgsrc-8061acfc6d421a13d18c51aedf72e34783578153.tar.gz |
py-qt5: update to 5.10.1nb1.
Fix build with Qt 5.11.
QTest::waitForEvents was removed, remove references to it.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/py-qt5/Makefile | 3 | ||||
-rw-r--r-- | x11/py-qt5/distinfo | 3 | ||||
-rw-r--r-- | x11/py-qt5/patches/patch-QtTest_sipQtTestQTest.cpp | 46 |
3 files changed, 50 insertions, 2 deletions
diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index 450b6f2968d..32637c7a743 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2018/04/14 20:08:26 adam Exp $ +# $NetBSD: Makefile,v 1.35 2018/06/23 11:23:46 wiz Exp $ DISTNAME= PyQt5_gpl-5.10.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyQt5_gpl/qt5/} +PKGREVISION= 1 CATEGORIES= x11 python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyqt/} diff --git a/x11/py-qt5/distinfo b/x11/py-qt5/distinfo index 92dad54027b..49c16d68652 100644 --- a/x11/py-qt5/distinfo +++ b/x11/py-qt5/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.8 2018/04/14 20:08:26 adam Exp $ +$NetBSD: distinfo,v 1.9 2018/06/23 11:23:46 wiz 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 (patch-QtTest_sipQtTestQTest.cpp) = 040ac6327bb2b8d84170859ad7e6e931b22e54ab 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-QtTest_sipQtTestQTest.cpp b/x11/py-qt5/patches/patch-QtTest_sipQtTestQTest.cpp new file mode 100644 index 00000000000..20a8cdd1d9a --- /dev/null +++ b/x11/py-qt5/patches/patch-QtTest_sipQtTestQTest.cpp @@ -0,0 +1,46 @@ +$NetBSD: patch-QtTest_sipQtTestQTest.cpp,v 1.1 2018/06/23 11:23:46 wiz Exp $ + +Fix build with Qt 5.11, where QTest::waitForEvents was removed. + +--- QtTest/sipQtTestQTest.cpp.orig 2018-06-23 09:55:45.858337471 +0000 ++++ QtTest/sipQtTestQTest.cpp +@@ -265,31 +265,6 @@ static PyObject *meth_QTest_qWait(PyObje + } + + +-PyDoc_STRVAR(doc_QTest_waitForEvents, "waitForEvents()"); +- +-extern "C" {static PyObject *meth_QTest_waitForEvents(PyObject *, PyObject *);} +-static PyObject *meth_QTest_waitForEvents(PyObject *, PyObject *sipArgs) +-{ +- PyObject *sipParseErr = NULL; +- +- { +- if (sipParseArgs(&sipParseErr, sipArgs, "")) +- { +- Py_BEGIN_ALLOW_THREADS +- ::QTest::waitForEvents(); +- Py_END_ALLOW_THREADS +- +- Py_INCREF(Py_None); +- return Py_None; +- } +- } +- +- /* Raise an exception if the arguments couldn't be parsed. */ +- sipNoFunction(sipParseErr, sipName_waitForEvents, doc_QTest_waitForEvents); +- +- return NULL; +-} +- + + PyDoc_STRVAR(doc_QTest_mouseEvent, "mouseEvent(QTest.MouseAction, QWidget, Qt.MouseButton, Union[Qt.KeyboardModifiers, Qt.KeyboardModifier], QPoint, delay: int = -1)\n" + "mouseEvent(QTest.MouseAction, QWindow, Qt.MouseButton, Union[Qt.KeyboardModifiers, Qt.KeyboardModifier], QPoint, delay: int = -1)"); +@@ -1311,7 +1286,6 @@ static PyMethodDef methods_QTest[] = { + {SIP_MLNAME_CAST(sipName_qWaitForWindowActive), (PyCFunction)meth_QTest_qWaitForWindowActive, METH_VARARGS|METH_KEYWORDS, SIP_MLDOC_CAST(doc_QTest_qWaitForWindowActive)}, + {SIP_MLNAME_CAST(sipName_qWaitForWindowExposed), (PyCFunction)meth_QTest_qWaitForWindowExposed, METH_VARARGS|METH_KEYWORDS, SIP_MLDOC_CAST(doc_QTest_qWaitForWindowExposed)}, + {SIP_MLNAME_CAST(sipName_touchEvent), meth_QTest_touchEvent, METH_VARARGS, SIP_MLDOC_CAST(doc_QTest_touchEvent)}, +- {SIP_MLNAME_CAST(sipName_waitForEvents), meth_QTest_waitForEvents, METH_VARARGS, SIP_MLDOC_CAST(doc_QTest_waitForEvents)} + }; + + static sipEnumMemberDef enummembers_QTest[] = { |