68178 2011-09-15 12:03:28 -0700 [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit 2011-09-16 04:51:01 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson alex cgarcia xan.lopez oldest_to_newest 467975 0 mrobinson 2011-09-15 12:03:28 -0700 We do not want to ship WebKit2 yet, so we should disable it in configure.ac. We want the bots to test the build though, so we should enable it during calls to build-webkit. 467987 1 107527 mrobinson 2011-09-15 12:18:17 -0700 Created attachment 107527 Patch 468001 2 107527 cgarcia 2011-09-15 12:30:38 -0700 Comment on attachment 107527 Patch Looks good to me 468109 3 107527 xan.lopez 2011-09-15 15:02:29 -0700 Comment on attachment 107527 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107527&action=review > Source/WebKit2/GNUmakefile.am:916 > +pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc Shouldn't this have $(top_builddir)? Otherwise might be ambiguous? 468324 4 cgarcia 2011-09-15 23:22:28 -0700 (In reply to comment #3) > (From update of attachment 107527 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=107527&action=review > > > Source/WebKit2/GNUmakefile.am:916 > > +pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc > > Shouldn't this have $(top_builddir)? Otherwise might be ambiguous? We have the same for the other .pc files, so if this is wrong we should fix all of them: pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc 468423 5 cgarcia 2011-09-16 04:42:27 -0700 Committed r95283: <http://trac.webkit.org/changeset/95283> 468428 6 xan.lopez 2011-09-16 04:48:18 -0700 (In reply to comment #4) > We have the same for the other .pc files, so if this is wrong we should fix all of them: > > pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc > pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc Well, ok, but that does not really answer anything. I'd have expected someone to say whether it's wrong or not before committing... 468432 7 cgarcia 2011-09-16 04:51:01 -0700 (In reply to comment #6) > (In reply to comment #4) > > We have the same for the other .pc files, so if this is wrong we should fix all of them: > > > > pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc > > pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc > > Well, ok, but that does not really answer anything. I'd have expected someone to say whether it's wrong or not before committing... we are trying to release, and webkit2 breaks distcheck. 107527 2011-09-15 12:18:17 -0700 2011-09-15 15:02:29 -0700 Patch bug-68178-20110915121816.patch text/plain 4802 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogOTUyMDUKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5n ZUxvZwppbmRleCAwM2UxYTg0MDVjYWI0MzA1YTJhMDc0NzY2OWY2MTU1YzdhN2NmOWNiLi4wOGYw ZmZkYjliZDNjN2EwNDNmN2NjY2EzY2FiN2E2YjU5OWM0ODA3IDEwMDY0NAotLS0gYS9DaGFuZ2VM b2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMTUgIE1hcnRpbiBS b2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIERpc2FibGUg V2ViS2l0MiBieSBkZWZhdWx0IGluIGNvbmZpZ3VyZS5hYywgYnV0IGVuYWJsZSBpdCB3aXRoIGJ1 aWxkLXdlYmtpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjgxNzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGNvbmZpZ3VyZS5hYzogRG8gbm90IGJ1aWxkIFdlYktpdDIgYnkgZGVmYXVsdC4gUmUtYWRk IHBrZ2NvbmZpZyBzdXBwb3J0CisgICAgICAgIGZvciBXZWJLaXQyLgorCiAyMDExLTA5LTE0ICBB bGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFtR dF0gUmVwbGFjZSBRVF9HQ0NfWCBhcyB0aGV5IGRvbid0IGV4aXN0IGluIFF0NSBhbnltb3JlLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCmluZGV4IDA4ZjI5YmRjYWUzNjI3YzkzZjQ4ZjMxMzU3N2FjYzhiMDYxNzkwNDMuLmU2 ODJmZDM3NDZhNDVmOGZiOTI5MzhlZDExNzQ5NjI3Y2IxZGI5N2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxMS0wOS0xNSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0dUS10gRGlzYWJsZSBXZWJLaXQyIGJ5IGRlZmF1bHQgaW4gY29u ZmlndXJlLmFjLCBidXQgZW5hYmxlIGl0IHdpdGggYnVpbGQtd2Via2l0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODE3OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06IERvIG5v dCBidWlsZCBXZWJLaXQyIGJ5IGRlZmF1bHQuIFJlLWFkZCBwa2djb25maWcgc3VwcG9ydAorICAg ICAgICBmb3IgV2ViS2l0Mi4KKwogMjAxMS0wOS0xNSAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5t ZW5hcmRAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbUXRdW1dLMl0gTWFrZSBRV2ViRXJyb3Ig bW9yZSBmcmllbmRseSB0byBRTUwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtl ZmlsZS5hbSBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCmluZGV4IGQ2MzU5NjNjYmQ3 NmViMjkzZGYxYTVmNGU0N2IyZDM1MDVkMTBmZTIuLjlmYThjNGJlN2MwNmNmOTllOWJjMWZjZDZm YjNhZDdhMzVkNmFhNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFt CisrKyBiL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCkBAIC05MTMsNiArOTEzLDggQEAg bGlid2Via2l0Mmd0a19AV0VCS0lUR1RLX0FQSV9NQUpPUl9WRVJTSU9OQF9AV0VCS0lUR1RLX0FQ SV9NSU5PUl9WRVJTSU9OQF9sYV9MSUIKIAkkKFhSRU5ERVJfTElCUykgXAogCSQoWFRfTElCUykK IAorcGtnY29uZmlnX0RBVEEgKz0gU291cmNlL1dlYktpdDIvd2Via2l0Mmd0ay1AV0VCS0lUR1RL X0FQSV9WRVJTSU9OQC5wYworCiAjIFdlYktpdDIgc3BlY2lmaWMgdmFyaWFibGVzCiBmb3J3YXJk aW5nX2hlYWRlcnMgOj0gJChHRU5TT1VSQ0VTX1dFQktJVDIpL2luY2x1ZGUKIGdlbmVyYXRlLXdl YmtpdDItZm9yd2FyZGluZy1oZWFkZXJzOiAkKFdlYktpdDIpL1NjcmlwdHMvZ2VuZXJhdGUtZm9y d2FyZGluZy1oZWFkZXJzLnBsICQobGliV2ViS2l0Ml9sYV9TT1VSQ0VTKQpAQCAtOTYwLDYgKzk2 Miw5IEBAIENMRUFORklMRVMgKz0gXAogCSQoQlVJTFRfU09VUkNFUykgXAogCSQodG9wX2J1aWxk ZGlyKS9Qcm9ncmFtcy9XZWJLaXRXZWJQcm9jZXNzCiAKK0RJU1RDTEVBTkZJTEVTICs9IFwKKwkk KHRvcF9idWlsZGRpcikvV2ViS2l0Mi93ZWJraXQyZ3RrLUBXRUJLSVRHVEtfQVBJX1ZFUlNJT05A LnBjCisKICMgV2ViS2l0V2ViUHJvY2VzcwogbGliZXhlY19QUk9HUkFNUyArPSBcCiAJUHJvZ3Jh bXMvV2ViS2l0V2ViUHJvY2VzcwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IGZkYzhjNTVjMGI5OTk5OTU3NGI0NDIyZTliNGY0MzAyZDQwMTg5ZDgu LjUyNWRlYzZjNDA5NDJjNWYwYjI0M2E0YWI1MDNlMWFhZTBlZGM2OTcgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAx MS0wOS0xNSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgW0dUS10gRGlzYWJsZSBXZWJLaXQyIGJ5IGRlZmF1bHQgaW4gY29uZmlndXJlLmFjLCBidXQg ZW5hYmxlIGl0IHdpdGggYnVpbGQtd2Via2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02ODE3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBhIHdvcmstYXJvdW5kIHRvIGVuYWJsZSBXZWJLaXQyIHdo ZW4gdXNpbmcgYnVpbGQtd2Via2l0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBt OgorICAgICAgICAoYnVpbGRBdXRvdG9vbHNQcm9qZWN0KTogCisKIDIwMTEtMDktMTUgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggTWFjIGJ1aWxk IGJ5IGluY2x1ZGluZyBjb25maWcuaCB3aGVyZSBuZWVkZWQuCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXgg OTYyYTE2OGEzODU2NzU4YjdmNzhiZmQ0MWU0ZjgyZGIzMDI0N2NlMy4uNjkzZWU5MGJlMTE4NmQ1 ZmEzZjIzZWQwMTAzNTNjYWM1OTc0Njk3NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTUyMSw2ICsx NTIxLDEyIEBAIHN1YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiAgICAgICAgICRtYWtlQXJn cyAuPSAiIGpzYyI7CiAgICAgfQogCisgICAgIyBUaGlzIGlzIGEgdGVtcG9yYXJ5IHdvcmstYXJv dW5kIHRvIGVuYWJsZSBidWlsZGluZyBXZWJLaXQyIG9uIHRoZSBib3RzLAorICAgICMgYnV0IGVu c3VyaW5nIHRoYXQgaXQgZG9lcyBub3Qgc2hpcCB1bnRpbCB0aGUgQVBJIGlzIHN0YWJsZS4KKyAg ICBpZiAoJHByb2plY3QgZXEgIldlYktpdCIgYW5kIGlzR3RrKCkpIHsKKyAgICAgICAgcHVzaCBA YnVpbGRBcmdzLCAiLS1lbmFibGUtd2Via2l0MiI7CisgICAgfQorCiAgICAgJHByZWZpeCA9ICRF TlZ7IldlYktpdEluc3RhbGxhdGlvblByZWZpeCJ9IGlmICFkZWZpbmVkKCRwcmVmaXgpOwogICAg IHB1c2ggQGJ1aWxkQXJncywgIi0tcHJlZml4PSIgLiAkcHJlZml4IGlmIGRlZmluZWQoJHByZWZp eCk7CiAKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5hYyBiL2NvbmZpZ3VyZS5hYwppbmRleCA0ODc5 NjcyNGY4YTVlYzI1YjdlN2NmNDZmOGYzZDg1ZjFlY2U4ZWE4Li41NjQ3MTc1MTg1YTBiOWFjNTk0 N2EzMmQ4Nzc1ZTgxYzdkYzQ1OTkxIDEwMDY0NAotLS0gYS9jb25maWd1cmUuYWMKKysrIGIvY29u ZmlndXJlLmFjCkBAIC0xMDgzLDggKzEwODMsOCBAQCBmaQogIyBXZWJLaXQyCiBBQ19NU0dfQ0hF Q0tJTkcoW3doZXRoZXIgdG8gYnVpbGQgV2Via2l0Ml0pCiBBQ19BUkdfRU5BQkxFKHdlYmtpdDIs Ci0gICAgQUNfSEVMUF9TVFJJTkcoWy0tZW5hYmxlLXdlYmtpdDJdLCBbYnVpbGQgd2Via2l0MiBb ZGVmYXVsdD15ZXNdXSksCi0gICAgW10sIFtlbmFibGVfd2Via2l0Mj0ieWVzIl0pCisgICAgQUNf SEVMUF9TVFJJTkcoWy0tZW5hYmxlLXdlYmtpdDJdLCBbYnVpbGQgd2Via2l0MiBbZGVmYXVsdD1u b11dKSwKKyAgICBbXSwgW2VuYWJsZV93ZWJraXQyPSJubyJdKQogQUNfTVNHX1JFU1VMVChbJGVu YWJsZV93ZWJraXQyXSkKIGlmIHRlc3QgIiRlbmFibGVfd2Via2l0MiIgPSAieWVzIjsgdGhlbgog ICAgaWYgdGVzdCAiJEdUS19BUElfVkVSU0lPTiIgPSAiMi4wIjsgdGhlbgpAQCAtMTIyNiw2ICsx MjI2LDE1IEBAIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qYXZhc2NyaXB0Y29yZWd0ay0ke1dFQktJ VEdUS19BUElfVkVSU0lPTn0ucGM6U291cmNlL0phdmFTCiAsW1dFQktJVEdUS19BUElfVkVSU0lP Tj0kV0VCS0lUR1RLX0FQSV9WRVJTSU9OLFdFQktJVEdUS19QQ19OQU1FPSRXRUJLSVRHVEtfUENf TkFNRV0KICkKIAorCitpZiB0ZXN0ICIkZW5hYmxlX3dlYmtpdDIiID0gInllcyI7IHRoZW4KKyAg ICBBQ19DT05GSUdfRklMRVMoWworICAgIFNvdXJjZS9XZWJLaXQyL3dlYmtpdDJndGstJHtXRUJL SVRHVEtfQVBJX1ZFUlNJT059LnBjOlNvdXJjZS9XZWJLaXQyL3dlYmtpdDJndGsucGMuaW4KKyAg ICBdCisgICAgLFtXRUJLSVRHVEtfQVBJX1ZFUlNJT049JFdFQktJVEdUS19BUElfVkVSU0lPTixX RUJLSVRHVEtfUENfTkFNRT0kV0VCS0lUR1RLX1BDX05BTUVdCisgICAgKQorZmkKKwogQUNfT1VU UFVUCiAKIGVjaG8gIgo=