Bug 79101 – [Qt][WK2] Fix the N9 build

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Andras Becsi]

Since http://trac.webkit.org/changeset/107951 building TextureMapperGL.cpp with OpenGL-ES fails, because of missing GL_BGRA GL_RGBA and GL_BGR defines.

[Andras Becsi]

Created attachment 127962 [details]
proposed fix

[Andras Becsi]

Comment on attachment 127962 [details]
proposed fix

Remove from review queue after discussion on IRC.

[Andras Becsi]

Created attachment 127975 [details]
patch for landing

The missing define should be added in http://codereview.qt-project.org/#change,17099 so landing the patch to fix the missing include only.

[Andras Becsi]

Committed r108359: <http://trac.webkit.org/changeset/108359>

[Yael]

This was reverted because it broke the linux desktop build.

[Simon Hausmann]

(In reply to comment #5)
> This was reverted because it broke the linux desktop build.

When rolling out changes please

    1) mention the change set that _did_ roll it out.

    2) explain the build issue that came along with it.

[Andras Becsi]

(In reply to comment #5)
> This was reverted because it broke the linux desktop build.
It did not break the desktop build for me, do you use some special build options?

[Andras Becsi]

Committed r108483: <http://trac.webkit.org/changeset/108483>

[Yael]

(In reply to comment #7)
> (In reply to comment #5)
> > This was reverted because it broke the linux desktop build.
> It did not break the desktop build for me, do you use some special build options?

Have a look at http://build.webkit.org/builders/Qt%20Linux%2064-bit%20Release%20%28Perf%29/builds/148  and http://build.webkit.org/builders/Qt%20Linux%2064-bit%20Release%20%28Perf%29/builds/149 .

[Andras Becsi]

(In reply to comment #9)
> (In reply to comment #7)
> > (In reply to comment #5)
> > > This was reverted because it broke the linux desktop build.
> > It did not break the desktop build for me, do you use some special build options?
> 
> Have a look at http://build.webkit.org/builders/Qt%20Linux%2064-bit%20Release%20%28Perf%29/builds/148  and http://build.webkit.org/builders/Qt%20Linux%2064-bit%20Release%20%28Perf%29/builds/149 .

I get a proxy error for these links.

Guessing from the link this is the performance bot where the incremental build broke because of the WebKit2 widgets removal patch and it needed a clean build locally since the master does not support triggering clean builds on the web interface. 
I notified Ossy about that and he triggered a clean build a bit later.

The release WebKit2 bot can be found here http://build.webkit.sed.hu/waterfall?show=x86-32%20Linux%20Qt%20Release%20WebKit2, I triggered a clean build on that one myself.

But the old patch indeed broke the CONFIG+=force_static_libs_as_shared build, which was fixed with the new patch, so thanks for catching this issue :)

[Yael]

You can see the build error in http://pastebin.com/SzwLqaEg .
It was probably just that we needed a clean build. Sorry about this.