diff options
author | Julien CORJON <corjon.j@ecagroup.com> | 2016-03-17 10:42:28 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-03-20 23:23:37 +0100 |
commit | 59ef95fdaecd0506b99a4144c7a2ae1194ada729 (patch) | |
tree | bcbd0beff66951746ba13fc625ff23501f61ae7d /package/qt5/qt5base/0003-xcb-egl-fixes.patch | |
parent | 940bfe2f4336a3fea1ec6805db1f90ce83bd4a78 (diff) | |
download | buildroot-59ef95fdaecd0506b99a4144c7a2ae1194ada729.tar.gz buildroot-59ef95fdaecd0506b99a4144c7a2ae1194ada729.zip |
qt5: bump version to 5.6.0
Remove upstream committed patches (qt5base):
- 0001-Force_egl_visual_ID_33.patch (see [1], [2])
- 0003-xcb-egl-fixes.patch (see [3])
- 0005-forkd-disable-eventfd-for-uclibc.patch (see [4], [5])
- 0009-fix-eglfs-for-sunxi-mali.patch (see [6])
- 0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (see [7])
Remove MX6_WORKAROUND from qt5base.mk since we do not need to tweak
EGL visual ID to 33.
Remove upstream committed patch (qt5webchannel):
- 0001-Fix-builds-without-qml-module.patch (see [8], [9])
Fix Qt5Enginio to 1.6.0 version (see [10])
[1] https://bugreports.qt.io/browse/QTBUG-44290
[2] https://codereview.qt-project.org/#/c/108849/
[3] https://codereview.qt-project.org/#/c/115438/
[4] https://bugreports.qt.io/browse/QTBUG-47337
[5] https://codereview.qt-project.org/#/c/121988/
[6] https://codereview.qt-project.org/#/c/125837/
[7] https://codereview.qt-project.org/#/c/126725/
[8] https://bugreports.qt.io/browse/QTBUG-47360
[9] https://codereview.qt-project.org/#/c/122086/
[10] https://bugreports.qt.io/browse/QTBUG-50111
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base/0003-xcb-egl-fixes.patch')
-rw-r--r-- | package/qt5/qt5base/0003-xcb-egl-fixes.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/package/qt5/qt5base/0003-xcb-egl-fixes.patch b/package/qt5/qt5base/0003-xcb-egl-fixes.patch deleted file mode 100644 index 65d6f6921c..0000000000 --- a/package/qt5/qt5base/0003-xcb-egl-fixes.patch +++ /dev/null @@ -1,82 +0,0 @@ -Some EGL headers pull in X11 defines which break eglconvenience - -* Adds a missing include to qeglplatformcontext.cpp -* Fix namespace collision on CursorShape, pulled in from X11/X.h -* Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use -* Reorder includes to have the X11-header the last include - -[based on patch from Yocto project] -Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> -Updated to fix issue in qeglplatformscreen (reorder includes, see also -http://lists.qt-project.org/pipermail/development/2013-March/010511.html) -Signed-off-by: Marc Andre <marc.andre@netline.ch> - -diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri ---- a/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:54:52.874278651 -0400 -@@ -30,8 +30,10 @@ - } - } - -- # Avoid X11 header collision -- DEFINES += MESA_EGL_NO_X11_HEADERS -+ !contains(QT_CONFIG,xcb) { -+ # Avoid X11 header collision -+ DEFINES += MESA_EGL_NO_X11_HEADERS -+ } - - contains(QT_CONFIG,xlib) { - HEADERS += \ -diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp ---- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:56:00.630280249 -0400 -@@ -39,6 +39,7 @@ - ** - ****************************************************************************/ - -+#include <qtextstream.h> - #include "qeglplatformcontext_p.h" - #include "qeglconvenience_p.h" - #include "qeglpbuffer_p.h" ---- a/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:58:49.014284222 -0400 -@@ -42,6 +42,11 @@ - #ifndef QEGLPLATFORMCURSOR_H - #define QEGLPLATFORMCURSOR_H - -+// avoid namespace collision with X11/X.h -+#ifdef CursorShape -+#undef CursorShape -+#endif -+ - #include <qpa/qplatformcursor.h> - #include <qpa/qplatformscreen.h> - ---- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp -+++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp -@@ -41,8 +41,8 @@ - - #include <QtGui/private/qguiapplication_p.h> - --#include "qeglplatformcursor_p.h" - #include "qeglplatformintegration_p.h" -+#include "qeglplatformcursor_p.h" - #include "qeglplatformscreen_p.h" - - QT_BEGIN_NAMESPACE ---- qtbase-opensource-src-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:46:57.116883353 +0200 -+++ qtbase-opensource-src-5.5.0/src/platformsupport/eglconvenience/qeglplatformscreen.cpp 2015-09-01 14:47:36.560882333 +0200 -@@ -31,11 +31,11 @@ - ** - ****************************************************************************/ - --#include "qeglplatformscreen_p.h" --#include "qeglplatformwindow_p.h" - #include <QtGui/qwindow.h> - #include <qpa/qwindowsysteminterface.h> - #include <QtPlatformSupport/private/qopenglcompositor_p.h> -+#include "qeglplatformscreen_p.h" -+#include "qeglplatformwindow_p.h" - - QT_BEGIN_NAMESPACE - |