68892 2011-09-27 05:37:44 -0700 [GTK] build-webkit --no-webkit2 still builds WebKit2 2011-09-28 02:27:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned oldest_to_newest 473874 0 pnormand 2011-09-27 05:37:44 -0700 WebKit2 build is now enforced, even if the user chooses to opt out. I'll attach a proposed patch for this issue. 473876 1 108829 pnormand 2011-09-27 05:40:34 -0700 Created attachment 108829 proposed patch 474613 2 pnormand 2011-09-28 02:27:06 -0700 Committed r96207: <http://trac.webkit.org/changeset/96207> 108829 2011-09-27 05:40:34 -0700 2011-09-27 06:47:36 -0700 proposed patch proposed-patch.patch text/plain 2991 pnormand RnJvbSA5YzVjM2Y5MWM1YmQ1MzY4Yjk5MjExY2EyODMyN2NjNmUyZmZlNjcxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDI2IFNlcCAyMDExIDE3OjUwOjI0ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgIHwgICAxNCAr KysrKysrKysrKysrKwogVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQgIHwgICAgMiArLQogVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIHwgICAgOCArKysrLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCAxOSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxYzIxODRlLi5kYjNiYzM1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDktMjcgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIGJ1aWxkLXdlYmtpdCAtLW5vLXdlYmtpdDIgc3RpbGwgYnVpbGRzIFdl YktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4 ODkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFr ZSB0aGUgLS1uby13ZWJraXQyIG9wdGlvbiBpbiBhY2NvdW50IHdoZW4gYnVpbGRpbmcgV2ViS2l0 R1RLKy4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCk6CisgICAg ICAgIChidWlsZEd0a1Byb2plY3QpOgorCiAyMDExLTA5LTI2ICBEaW1pdHJpIEdsYXprb3YgIDxk Z2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgZ2FyZGVuLW8tbWF0aWMncyBjb21taXQg ZGF0YSBvbiBzdW1tYXJ5IHBhZ2Ugc2hvdWxkIG5vdCBjcm93ZCBpdHNlbGYgb3IgdHdpdGNoIHdo ZW4gaG92ZXJlZCBvdmVyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQg Yi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCA4MTIyNGY4Li42NjM5MDk5IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1 aWxkLXdlYmtpdApAQCAtNTkzLDcgKzU5Myw3IEBAIGZvciBteSAkZGlyIChAcHJvamVjdHMpIHsK IAogICAgIG15ICRwcm9qZWN0ID0gYmFzZW5hbWUoJGRpcik7CiAgICAgaWYgKGlzR3RrKCkpIHsK LSAgICAgICAgJHJlc3VsdCA9IGJ1aWxkR3RrUHJvamVjdCgkcHJvamVjdCwgJGNsZWFuLCAgQG9w dGlvbnMpOworICAgICAgICAkcmVzdWx0ID0gYnVpbGRHdGtQcm9qZWN0KCRwcm9qZWN0LCAkY2xl YW4sICEkbm9XZWJLaXQyLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNpZiAoaXNRdCgpKSB7CiAgICAg ICAgICNGSVhNRTogJGRpciBzaG91bGQgcHJvYmFibHkgYmUgJHByb2plY3QuCiAgICAgICAgICRy ZXN1bHQgPSBidWlsZFFNYWtlUXRQcm9qZWN0KCRkaXIsICRjbGVhbiwgQG9wdGlvbnMpOwpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCmluZGV4IDQyY2M1MDkuLmMxOTA1MjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTE0 OTYsNyArMTQ5Niw3IEBAIHN1YiBhdXRvZ2VuQXJndW1lbnRzSGF2ZUNoYW5nZWQoJEApCiAKIHN1 YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiB7Ci0gICAgbXkgKCRwcm9qZWN0LCAkY2xlYW4s IEBidWlsZFBhcmFtcykgPSBAXzsKKyAgICBteSAoJHByb2plY3QsICRjbGVhbiwgJGVuYWJsZVdl YktpdDIsIEBidWlsZFBhcmFtcykgPSBAXzsKIAogICAgIG15ICRtYWtlID0gJ21ha2UnOwogICAg IG15ICRkaXIgPSBwcm9kdWN0RGlyKCk7CkBAIC0xNTI5LDcgKzE1MjksNyBAQCBzdWIgYnVpbGRB dXRvdG9vbHNQcm9qZWN0KCRAKQogCiAgICAgIyBUaGlzIGlzIGEgdGVtcG9yYXJ5IHdvcmstYXJv dW5kIHRvIGVuYWJsZSBidWlsZGluZyBXZWJLaXQyIG9uIHRoZSBib3RzLAogICAgICMgYnV0IGVu c3VyaW5nIHRoYXQgaXQgZG9lcyBub3Qgc2hpcCB1bnRpbCB0aGUgQVBJIGlzIHN0YWJsZS4KLSAg ICBpZiAoJHByb2plY3QgZXEgIldlYktpdCIgYW5kIGlzR3RrKCkpIHsKKyAgICBpZiAoJHByb2pl Y3QgZXEgIldlYktpdCIgYW5kIGlzR3RrKCkgYW5kICRlbmFibGVXZWJLaXQyKSB7CiAgICAgICAg IHB1c2ggQGJ1aWxkQXJncywgIi0tZW5hYmxlLXdlYmtpdDIiOwogICAgIH0KIApAQCAtMTg2Nywx MyArMTg2NywxMyBAQCBzdWIgYnVpbGRRTWFrZVF0UHJvamVjdCgkJEApCiAKIHN1YiBidWlsZEd0 a1Byb2plY3QKIHsKLSAgICBteSAoJHByb2plY3QsICRjbGVhbiwgQGJ1aWxkQXJncykgPSBAXzsK KyAgICBteSAoJHByb2plY3QsICRjbGVhbiwgJGVuYWJsZVdlYktpdDIsIEBidWlsZEFyZ3MpID0g QF87CiAKICAgICBpZiAoJHByb2plY3QgbmUgIldlYktpdCIgYW5kICRwcm9qZWN0IG5lICJKYXZh U2NyaXB0Q29yZSIpIHsKICAgICAgICAgZGllICJVbnN1cHBvcnRlZCBwcm9qZWN0OiAkcHJvamVj dC4gU3VwcG9ydGVkIHByb2plY3RzOiBXZWJLaXQsIEphdmFTY3JpcHRDb3JlXG4iOwogICAgIH0K IAotICAgIHJldHVybiBidWlsZEF1dG90b29sc1Byb2plY3QoJHByb2plY3QsICRjbGVhbiwgQGJ1 aWxkQXJncyk7CisgICAgcmV0dXJuIGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCgkcHJvamVjdCwgJGNs ZWFuLCAkZW5hYmxlV2ViS2l0MiwgQGJ1aWxkQXJncyk7CiB9CiAKIHN1YiBidWlsZENocm9taXVt TWFrZWZpbGUoJCRAKQotLSAKMS43LjcucmMx