summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base/0003-xcb-egl-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/qt5/qt5base/0003-xcb-egl-fixes.patch')
-rw-r--r--package/qt5/qt5base/0003-xcb-egl-fixes.patch82
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
-
OpenPOWER on IntegriCloud