[oe] [PATCH][meta-qt5] qtbase: fix build for PACKAGECONFIG gles2

[Khem Raj]

On Mon, Sep 14, 2015 at 11:51 PM, Ahsan, Noor <Noor_Ahsan at mentor.com> wrote:
> Noor,
>
> I am keen to know that how this patch does not include X.h where None was being defined to 0 earlier.
>

QT can build without X, in case you have X in there then using it from
X.h might be OK.

> Noor
>
> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of Andreas Müller
> Sent: Saturday, September 12, 2015 4:38 PM
> To: openembedded-devel at lists.openembedded.org
> Subject: [oe] [PATCH][meta-qt5] qtbase: fix build for PACKAGECONFIG gles2
>
> fixes:
>
> | In file included from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/X11/Xlib.h:44:0,
> |                  from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglvivante.h:244,
> |                  from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglplatform.h:38,
> |                  from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/egl.h:39,
> |                  from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen_p.h:52,
> |                  from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen.cpp:34:
> | ../../include/QtCore/../../../git/src/corelib/io/qurl.h:131:9: error: expected identifier before numeric constant
> |          None = 0x0,
> |          ^
>
> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> ---
>  ...mscreen.cpp-reorder-headers-to-fix-build-.patch | 49 ++++++++++++++++++++++
>  recipes-qt/qt5/qtbase_git.bb                       |  1 +
>  2 files changed, 50 insertions(+)
>  create mode 100644 recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
>
> diff --git a/recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch b/recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
> new file mode 100644
> index 0000000..a1a8791
> --- /dev/null
> +++ b/recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-
> +++ to-fix-build-.patch
> @@ -0,0 +1,49 @@
> +From f8873b5ba0fa42cc0d2aadfd6c5a449b37799609 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
> +Date: Sat, 12 Sep 2015 12:58:46 +0200
> +Subject: [PATCH] qeglplatformscreen.cpp: reorder headers to fix build
> +with egl  enabled
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +fixes:
> +In file included from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/X11/Xlib.h:44:0,
> +                 from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglvivante.h:244,
> +                 from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/eglplatform.h:38,
> +                 from /home/superandy/tmp/oe-core-glibc/sysroots/varsomimx6q/usr/include/EGL/egl.h:39,
> +                 from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen_p.h:52,
> +                 from /home/superandy/tmp/oe-core-glibc/work/cortexa9t2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.0+gitAUTOINC+2fde9f59ee-r0/git/src/platformsupport/eglconvenience/qeglplatformscreen.cpp:34:
> +../../include/QtCore/../../../git/src/corelib/io/qurl.h:131:9: error: expected identifier before numeric constant
> +         None = 0x0,
> +         ^
> +
> +This patch has a very limited lifetime: In branch dev and 5.6 the patched file is gone. Therefore:
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> +---
> + src/platformsupport/eglconvenience/qeglplatformscreen.cpp | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
> +b/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
> +index 61f8cdd..ceec797 100644
> +--- a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
> ++++ b/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
> +@@ -31,10 +31,10 @@
> + **
> +
> +***********************************************************************
> +*****/
> +
> +-#include "qeglplatformscreen_p.h"
> +-#include "qeglplatformwindow_p.h"
> + #include <QtGui/qwindow.h>
> + #include <qpa/qwindowsysteminterface.h>
> ++#include "qeglplatformscreen_p.h"
> ++#include "qeglplatformwindow_p.h"
> + #include <QtPlatformSupport/private/qopenglcompositor_p.h>
> +
> + QT_BEGIN_NAMESPACE
> +--
> +2.1.0
> +
> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f4287cc..4a073c5 100644
> --- a/recipes-qt/qt5/qtbase_git.bb
> +++ b/recipes-qt/qt5/qtbase_git.bb
> @@ -25,6 +25,7 @@ SRC_URI += "\
>  SRC_URI += "\
>      file://0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
>      file://0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
> +
> + file://0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
> + \
>  "
>
>  DEPENDS += "qtbase-native"
> --
> 2.1.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel