rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bsp/buildroot/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch Normal file
View File

@@ -0,0 +1,32 @@
Drop waitForEvents() method from qtestmouse
This method was dropped in Qt 5.11:
https://github.com/qt/qtbase/commit/75e583b3fcbdbbb999633eb5f2267720dd695cfa
However, Python PyQt5 still generates a wrapper for it, causing a
build failure. The upstream PyQt5 maintainers have not kept
waitForEvents() support for older Qt versions, and instead entirely
dropped it unconditionally. This can be verified by diffing PyQt 5.10
and PyQt 5.11. We take the same approach, and drop waitForEvents()
unconditionally, even when PyQt5 is built against the older Qt 5.6.
Fedora is using a similar solution:
https://src.fedoraproject.org/rpms/python-qt5/c/47fb7fdc5d16582772f9c3fc8a6a674a41a7f605?branch=master.
This patch can be dropped when PyQt5 is bumped to its 5.11 version.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Index: b/sip/QtTest/qtestmouse.sip
===================================================================
--- a/sip/QtTest/qtestmouse.sip
+++ b/sip/QtTest/qtestmouse.sip
@@ -41,7 +41,6 @@
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);

2
bsp/buildroot/package/python-pyqt5/python-pyqt5.mk
View File

@@ -25,9 +25,9 @@ PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source
PYTHON_PYQT5_QTDETAIL_TYPE = shared
# Turn off features that aren't available in current qt configuration
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL)
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL)
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL)
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),,PyQt_SSL)
define PYTHON_PYQT5_QTDETAIL
echo $(1) >> $(2)/qtdetail.out