mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
create rootf's & SDK from 2018.02.9 buildroot (#10)
--------- Co-authored-by: tiopex <tiopxyz@gmail.com> Co-authored-by: tiopex <67048640+tiopex@users.noreply.github.com>
This commit is contained in:
Apaczer
@@ -1,32 +0,0 @@
|
||||
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);
|
||||
@@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYQT5
|
||||
bool "python-pyqt5"
|
||||
depends on BR2_PACKAGE_QT5
|
||||
select BR2_PACKAGE_PYTHON_SIP
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
help
|
||||
Python bindings for Qt 5
|
||||
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
# md5 from http://http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7, sha256 locally computed
|
||||
md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz
|
||||
sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz
|
||||
|
||||
# Hash for license file
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE
|
||||
md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz
|
||||
sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz
|
||||
|
||||
@@ -11,113 +11,13 @@ PYTHON_PYQT5_LICENSE = GPL-3.0
|
||||
PYTHON_PYQT5_LICENSE_FILES = LICENSE
|
||||
|
||||
PYTHON_PYQT5_DEPENDENCIES = python-sip host-python-sip qt5base
|
||||
PYTHON_PYQT5_MODULES = \
|
||||
QtCore QtGui \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_DBUS),QtDBus) \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_NETWORK),QtNetwork) \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_OPENGL_LIB),QtOpenGL) \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_XML),QtXml)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
|
||||
PYTHON_PYQT5_MODULES += QtWidgets
|
||||
|
||||
# QtSql needs QtWidgets
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
|
||||
PYTHON_PYQT5_MODULES += QtSql
|
||||
endif
|
||||
|
||||
# QtTest needs QtWidgets
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_TEST),y)
|
||||
PYTHON_PYQT5_MODULES += QtTest
|
||||
endif
|
||||
|
||||
# QtSvg needs QtWidgets
|
||||
ifeq ($(BR2_PACKAGE_QT5SVG),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5svg
|
||||
PYTHON_PYQT5_MODULES += QtSvg
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5CONNECTIVITY),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5connectivity
|
||||
PYTHON_PYQT5_MODULES += QtBluetooth QtNfc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5declarative
|
||||
PYTHON_PYQT5_MODULES += QtQml
|
||||
|
||||
# QtQuick module needs opengl
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_OPENGL_LIB),yy)
|
||||
PYTHON_PYQT5_MODULES += \
|
||||
QtQuick \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtQuickWidgets)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5ENGINIO),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5enginio
|
||||
PYTHON_PYQT5_MODULES += Enginio
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5LOCATION),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5location
|
||||
PYTHON_PYQT5_MODULES += QtPositioning
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
|
||||
PYTHON_PYQT5_MODULES += QtLocation
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5multimedia
|
||||
PYTHON_PYQT5_MODULES += \
|
||||
QtMultimedia \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtMultimediaWidgets)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5SENSORS),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5sensors
|
||||
PYTHON_PYQT5_MODULES += QtSensors
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5SERIALPORT),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5serialport
|
||||
PYTHON_PYQT5_MODULES += QtSerialPort
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5WEBCHANNEL),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5webchannel
|
||||
PYTHON_PYQT5_MODULES += QtWebChannel
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5WEBENGINE),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5webengine
|
||||
PYTHON_PYQT5_MODULES += \
|
||||
QtWebEngineCore \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtWebEngineWidgets)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5WEBKIT),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5webkit
|
||||
PYTHON_PYQT5_MODULES += \
|
||||
QtWebKit \
|
||||
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtWebKitWidgets)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5WEBSOCKETS),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5websockets
|
||||
PYTHON_PYQT5_MODULES += QtWebSockets
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5X11EXTRAS),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5x11extras
|
||||
PYTHON_PYQT5_MODULES += QtX11Extras
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y)
|
||||
PYTHON_PYQT5_DEPENDENCIES += qt5xmlpatterns
|
||||
PYTHON_PYQT5_MODULES += QtXmlPatterns
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR)
|
||||
PYTHON_PYQT5_RM_PORT_BASE = port_v3
|
||||
else ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||
PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR)
|
||||
PYTHON_PYQT5_RM_PORT_BASE = port_v2
|
||||
endif
|
||||
|
||||
PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source
|
||||
@@ -125,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_OPENSSL),,PyQt_SSL)
|
||||
|
||||
define PYTHON_PYQT5_QTDETAIL
|
||||
echo $(1) >> $(2)/qtdetail.out
|
||||
@@ -144,21 +44,15 @@ define PYTHON_PYQT5_GENERATE_QTDETAIL
|
||||
)
|
||||
endef
|
||||
|
||||
# The file "qt.conf" can be used to override the hard-coded paths that are
|
||||
# compiled into the Qt library. We need it to make "qmake" relocatable and
|
||||
# tweak the per-package install pathes
|
||||
PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP
|
||||
|
||||
PYTHON_PYQT5_CONF_OPTS = \
|
||||
--bindir $(TARGET_DIR)/usr/bin \
|
||||
--destdir $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
|
||||
--destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \
|
||||
--qmake $(HOST_DIR)/bin/qmake \
|
||||
--sysroot $(STAGING_DIR)/usr \
|
||||
-w --confirm-license \
|
||||
--no-designer-plugin \
|
||||
--no-docstrings \
|
||||
--no-sip-files \
|
||||
$(foreach module,$(PYTHON_PYQT5_MODULES),--enable=$(module))
|
||||
--no-sip-files
|
||||
|
||||
define PYTHON_PYQT5_CONFIGURE_CMDS
|
||||
$(call PYTHON_PYQT5_GENERATE_QTDETAIL,$(@D))
|
||||
@@ -178,8 +72,8 @@ endef
|
||||
# __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set
|
||||
define PYTHON_PYQT5_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install
|
||||
touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py
|
||||
$(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2
|
||||
touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py
|
||||
$(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user