Bug 79101 - [Qt][WK2] Fix the N9 build
Summary: [Qt][WK2] Fix the N9 build
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other Linux
: P2 Normal
Assignee: Andras Becsi
URL:
Keywords: Qt
Depends on:
Blocks:
 
Reported: 2012-02-21 06:53 PST by Andras Becsi
Modified: 2012-02-22 06:20 PST (History)
3 users (show)

See Also:


Attachments
proposed fix (1.61 KB, patch)
2012-02-21 06:56 PST, Andras Becsi
no flags Details | Formatted Diff | Diff
patch for landing (1.40 KB, patch)
2012-02-21 08:23 PST, Andras Becsi
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andras Becsi 2012-02-21 06:53:01 PST
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.
Comment 1 Andras Becsi 2012-02-21 06:56:49 PST
Created attachment 127962 [details]
proposed fix
Comment 2 Andras Becsi 2012-02-21 07:39:21 PST
Comment on attachment 127962 [details]
proposed fix

Remove from review queue after discussion on IRC.
Comment 3 Andras Becsi 2012-02-21 08:23:54 PST
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.
Comment 4 Andras Becsi 2012-02-21 08:27:12 PST
Committed r108359: <http://trac.webkit.org/changeset/108359>
Comment 5 Yael 2012-02-21 18:24:25 PST
This was reverted because it broke the linux desktop build.
Comment 6 Simon Hausmann 2012-02-22 00:31:53 PST
(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.
Comment 7 Andras Becsi 2012-02-22 03:16:00 PST
(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?
Comment 8 Andras Becsi 2012-02-22 04:57:28 PST
Committed r108483: <http://trac.webkit.org/changeset/108483>
Comment 9 Yael 2012-02-22 05:13:21 PST
(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 .
Comment 10 Andras Becsi 2012-02-22 05:43:29 PST
(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 :)
Comment 11 Yael 2012-02-22 06:20:16 PST
You can see the build error in http://pastebin.com/SzwLqaEg .
It was probably just that we needed a clean build. Sorry about this.