[Buildroot] [PATCH] qt5base: Fix compile errors in qurl.h / qeglplatformscreen.cpp

[Marc Andre <marc.andre@netline.ch>]

Hi Vincente

On 04.09.2015 15:39, Vicente Olivert Riera wrote:
> Dear Marc Andre,
>
> On 09/03/2015 02:22 PM, Marc Andre wrote:
>> Update the already existing fix for EGL/X11 header issue to fix
>> an additional problem encountered on my system where I had
>> compile errors in qeglplatformscreen.cpp. The problem was related
>> to the wrong order of includes. The X11 headers must always be
>> included last, as indicated in
>> http://lists.qt-project.org/pipermail/development/2013-March/010511.html
> I have seen that message in the mailing list and Thiago says:
>
> "Please reorder the includes in that file. The X11 includes must
> *always* be the last include in the .cpp. If you can, submit that fix to
> codereview.qt-project.org."
>
> Have you submitted that fix to codereview.qt-project.org? It would be
> good to fix it upstream.
I did consider it, but as long as the the other part of the 
0003-xcb-egl-fixes.patch isn't fixed in the upstream project fixing this 
doesn't make too much sense. I will certainly submit, but I would 
appreciate to fix it in buildroot until qt5 is fixed.
I will submit the full 0003-xcb-egl-fixes.patch to qt.
>> I decided instead of adding a new patch to update the existing patch,
>> because it is an additional fix for the same problem. If you don't agree
>> I am happy to submit a seperate patch.
>>
>> This version is updated as suggested by Arnout.
>>
>> Signed-off-by: Marc Andre <marc.andre@netline.ch>
>> ---
>>   package/qt5/qt5base/0003-xcb-egl-fixes.patch | 25 +++++++++++++++++++++++--
>>   1 file changed, 23 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/qt5/qt5base/0003-xcb-egl-fixes.patch b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
>> index 53f8453..0777c44 100644
>> --- a/package/qt5/qt5base/0003-xcb-egl-fixes.patch
>> +++ b/package/qt5/qt5base/0003-xcb-egl-fixes.patch
>> @@ -1,11 +1,17 @@
>> -The vivante headers pull in X11 defines which break eglconvenience
>> +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 and buildroot patch from
>> +Jerome 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)
>>   
>> -[based on patch from Yocto project]
> I'm not sure if this is correct. Yes, you are modifying the patch and
> adding new stuff, but the rest is still based on Yocto Project's patch.
> I think it should stay, or at least say something like:
>
> [part of it based on patch from Yocto project]
It is in, see 3 lines higher: "Based on patch from Yocto project and 
builroot patch from Jerome"
>
>>   Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
>> +Signed-off-by: Marc Andre <marc.andre@netline.ch>
>>   
>>   
>>   diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
>> @@ -61,4 +67,19 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl
>>    #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
>>    
>>
> Regards,
>
> Vincent.

Regards,
Marc

-- 
Marc Andr?, Andr?-Netline
eBusiness-Solutions

Andr?-Netline
K?nizstr. 161
CH-3097 Liebefeld

Tel. 031 974 16 66
Fax: 031 974 16 65
marc.andre at netline.ch
http://www.netline.ch