The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...

[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / python-pyqt / 0005-sip-fix_qws_handle.patch

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/python-pyqt/0005-sip-fix_qws_handle.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/python-pyqt/0005-sip-fix_qws_handle.patch
new file mode 100644 (file)
index 0000000..80623d1
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/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;