79101 2012-02-21 06:53:01 -0800 [Qt][WK2] Fix the N9 build 2012-02-22 06:20:16 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other Linux RESOLVED FIXED Qt P2 Normal --- 1 abecsi abecsi hausmann noam yael oldest_to_newest 560844 0 abecsi 2012-02-21 06:53:01 -0800 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. 560847 1 127962 abecsi 2012-02-21 06:56:49 -0800 Created attachment 127962 proposed fix 560873 2 127962 abecsi 2012-02-21 07:39:21 -0800 Comment on attachment 127962 proposed fix Remove from review queue after discussion on IRC. 560894 3 127975 abecsi 2012-02-21 08:23:54 -0800 Created attachment 127975 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. 560897 4 abecsi 2012-02-21 08:27:12 -0800 Committed r108359: <http://trac.webkit.org/changeset/108359> 561453 5 yael 2012-02-21 18:24:25 -0800 This was reverted because it broke the linux desktop build. 561699 6 hausmann 2012-02-22 00:31:53 -0800 (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. 561804 7 abecsi 2012-02-22 03:16:00 -0800 (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? 561853 8 abecsi 2012-02-22 04:57:28 -0800 Committed r108483: <http://trac.webkit.org/changeset/108483> 561869 9 yael 2012-02-22 05:13:21 -0800 (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 . 561890 10 abecsi 2012-02-22 05:43:29 -0800 (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 :) 561925 11 yael 2012-02-22 06:20:16 -0800 You can see the build error in http://pastebin.com/SzwLqaEg . It was probably just that we needed a clean build. Sorry about this. 127962 2012-02-21 06:56:49 -0800 2012-02-21 07:39:21 -0800 proposed fix opengles.patch text/plain 1647 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NTAxZDRhLi40ZTdhNWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMDItMjEgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisK KyAgICAgICAgW1F0XVtXSzJdIEZpeCB0aGUgTjkgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MTAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZC4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwOiBBZGQgbWlz c2luZyBpbmNsdWRlLgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwVGV4dHVyZUdMOjp1cGRhdGVD b250ZW50cyk6IFVzZSBHTF9CR1JBIGZvcm1hdCBmb3IgT3BlbkdMRVMuCisKIDIwMTItMDItMjEg IFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBX ZWIgSW5zcGVjdG9yOiBzZXQgYnJlYWtwb2ludC9wYXVzZSBkb2Vzbid0IHdvcmsgd2hlbiB3b3Jr ZXIgaXMgaW4gYSB0aWdodCBsb29wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IGMwMzQ2MTgu LjA1NGNjY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29w ZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaWYg UExBVEZPUk0oUVQpCiAjaWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDUsIDAsIDAp CiAjaW5jbHVkZSA8UVBsYXRmb3JtUGl4bWFwPgorI2luY2x1ZGUgPHFvcGVuZ2xmdW5jdGlvbnMu aD4KICNlbmRpZgogI2VuZGlmCiAKQEAgLTY5Miw3ICs2OTMsMTEgQEAgdm9pZCBCaXRtYXBUZXh0 dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKEltYWdlKiBpbWFnZSwgY29uc3QgSW50UmVjdCYgdGFyZ2V0 UmVjdCwgY28KICAgICAgICAgcXRJbWFnZSA9IHF0SW1hZ2UuY29weShzb3VyY2VSZWN0KTsKICAg ICBpZiAoZm9ybWF0ID09IEJHUkFGb3JtYXQgfHwgZm9ybWF0ID09IEJHUkZvcm1hdCkgewogICAg ICAgICBpZiAoaGFzQkdSQUV4dGVuc2lvbigpKQorI2lmIGRlZmluZWQoVEVYTUFQX09QRU5HTF9F U18yKQorICAgICAgICAgICAgZ2xGb3JtYXQgPSBHTF9CR1JBOworI2Vsc2UKICAgICAgICAgICAg IGdsRm9ybWF0ID0gaXNPcGFxdWUoKSA/IEdMX0JHUiA6IEdMX0JHUkE7CisjZW5kaWYKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgc3dpenpsZUJHUkFUb1JHQkEocmVpbnRlcnByZXRfY2FzdDx1 aW50MzJfdCo+KHF0SW1hZ2UuYml0cygpKSwgcXRJbWFnZS5zaXplKCkpOwogICAgIH0K 127975 2012-02-21 08:23:54 -0800 2012-02-21 08:23:54 -0800 patch for landing 0001-buildfix.patch text/plain 1433 abecsi RnJvbSA1MmU4ZmFiMzU3Y2VlZDc5NmQ0YWRhNDQyOTU2OTZkYTkyY2IzZDhlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyYXMgQmVjc2kgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+ CkRhdGU6IFR1ZSwgMjEgRmViIDIwMTIgMTc6MTk6MDEgKzAxMDAKU3ViamVjdDogW1BBVENIXSBi dWlsZGZpeAoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMTEgKysrKysrKysrKysKIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wv VGV4dHVyZU1hcHBlckdMLmNwcCAgIHwgICAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGluc2Vy dGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY2OGZmZGUuLjRiYTgwYzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wMi0yMSAgQW5kcmFzIEJlY3NpICA8 YW5kcmFzLmJlY3NpQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gRml4IHRoZSBOOSBi dWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzkx MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOb2FtIFJvc2VudGhhbC4KKworICAgICAgICBObyBu ZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL1Rl eHR1cmVNYXBwZXJHTC5jcHA6IEFkZCBtaXNzaW5nIGluY2x1ZGUuCisKIDIwMTItMDItMjEgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtjcmFzaF0gdXBvbiBzdHlsZSBtb2RpZmljYXRpb24gYWZ0ZXIgbmF2aWdhdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL1RleHR1cmVN YXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGV4 dHVyZU1hcHBlckdMLmNwcAppbmRleCBjMDM0NjE4Li4xMmIwNzFhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBl ckdMLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2lmIFBMQVRGT1JNKFFUKQogI2lmIFFUX1ZFUlNJ T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAwKQogI2luY2x1ZGUgPFFQbGF0Zm9ybVBpeG1h cD4KKyNpbmNsdWRlIDxxb3BlbmdsZnVuY3Rpb25zLmg+CiAjZW5kaWYKICNlbmRpZgogCi0tIAox LjcuOS4xCgo=