diff options
author | Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> | 2015-04-19 10:03:53 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-04-19 19:19:11 +0200 |
commit | ecb26b1add5b4b97e86c0fb60b56bcc44576aa6f (patch) | |
tree | 21270d79794dd638522ed67159dc7b534a81d133 /package/python-pyqt/0005-sip-fix_qws_handle.patch | |
parent | 32574fe118377511c51bfea20a7bf3e2a9c0bfb2 (diff) | |
download | buildroot-ecb26b1add5b4b97e86c0fb60b56bcc44576aa6f.tar.gz buildroot-ecb26b1add5b4b97e86c0fb60b56bcc44576aa6f.zip |
python-pyqt: new package
[Thomas:
- Remove dependency on python (already a dependency of python-sip),
and add a dependency on host-python-sip, since python-sip no longer
depends on host-python-sip.
- Make the code Python 2 / Python 3 compatible (both have been
tested).
- Fix indentation all over the place.
- Remove double quotes when defining variable values, not needed.
- Add <pkg>_BUILD_CMDS to do the build process separately from the
installation.
- Create a PYTHON_PYQT_CONF_OPTS variable with all the config
options, since some of them are now conditional.
- Use 'compileall' to byte-compile the dummy __init__.py.]
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Cc: Sergey Kostanbaev <sergey.kostanbaev@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/python-pyqt/0005-sip-fix_qws_handle.patch')
-rw-r--r-- | package/python-pyqt/0005-sip-fix_qws_handle.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/package/python-pyqt/0005-sip-fix_qws_handle.patch b/package/python-pyqt/0005-sip-fix_qws_handle.patch new file mode 100644 index 0000000000..80623d112a --- /dev/null +++ b/package/python-pyqt/0005-sip-fix_qws_handle.patch @@ -0,0 +1,24 @@ +Fix build issue in QWS flavor + +Change HANDLE to void* to get rid of : +buildroot/output/build/python-pyqt-4.11.3/QtCore/sipQtCoreQThread.cpp:318:50: +error: invalid conversion from 'Qt::HANDLE {aka void*}' to 'long +unsigned int' [-fpermissive] error during compilation. + +Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> +Signed-off-by: Sergey Kostanbaev <sergey.kostanbaev@gmail.com> +--- +Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip +=================================================================== +--- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qnamespace.sip ++++ PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip +@@ -1673,6 +1673,9 @@ namespace Qt + %If (WS_X11) + typedef unsigned long HANDLE; + %End ++%If (WS_QWS) ++ typedef void* HANDLE; ++%End + %End + %If (PyQt_Deprecated_5_0) + typedef Qt::WindowFlags WFlags; |