117889 2013-06-21 12:31:13 -0700 [GTK][Stable] Merge r150008 into the webkit-2.0 branch 2013-06-24 00:53:23 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 zan zan cgarcia oldest_to_newest 902641 0 zan 2013-06-21 12:31:13 -0700 r150008 is required to fix missing symbols in the WebKitPluginProcess that's built from the webkit-2.0 branch. A modified patch of that revision is required as there for instance is no libPlatform.la or libANGLE.la in the stable branch. 902643 1 205208 zan 2013-06-21 12:37:11 -0700 Created attachment 205208 Patch 902644 2 zan 2013-06-21 12:38:46 -0700 Based off r150008, the patch only applies to the webkit-2.0 branch. http://trac.webkit.org/changeset/150008 r150884 and r151492 should also be applied afterwards and will be added to the wiki page as proposed merges. http://trac.webkit.org/changeset/150884 http://trac.webkit.org/changeset/151492 902877 3 205208 cgarcia 2013-06-24 00:49:11 -0700 Comment on attachment 205208 Patch I'll merge it in the stable branch, thanks! 902878 4 cgarcia 2013-06-24 00:53:23 -0700 Merged <http://trac.webkit.org/changeset/151895> 205208 2013-06-21 12:37:11 -0700 2013-06-24 00:49:11 -0700 Patch bug-117889-20130621123520.patch text/plain 3980 zan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTg0OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEzLTA2LTIxICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBNZXJnZSByMTUw MDA4IGludG8gdGhlIHdlYmtpdC0yLjAgYnJhbmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc4ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBNZXJnZSByMTUwMDA4IHdp dGggc29tZSBjaGFuZ2VzLCBmb3IgaW5zdGFuY2Ugbm90IGxpc3RpbmcgbGliUGxhdGZvcm0ubGEs IGxpYlBsYXRmb3JtR3RrMi5sYQorICAgICAgICBhbmQgbGliQU5HTEUubGEgYW1vbmcgdGhlIHdl YmNvcmUgbGF5ZXIgZGVwZW5kZW5jaWVzIGFzIHRoZXNlIGxpYnRvb2wgYXJjaGl2ZXMgd2VyZSBj cmVhdGVkIGFmdGVyIHRoZSAyLjAgYnJhbmNoaW5nLgorICAgICAgICAqIEdOVW1ha2VmaWxlLmxp c3QuYW06IE1lcmdlIHIxNTAwMDguCisKIDIwMTMtMDUtMTYgIE1hbnVlbCBSZWdvIENhc2Fzbm92 YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IG1lbW9yeSBsZWFrIGlu IFdlYktpdEJhY2tGb3J3YXJkTGlzdApJbmRleDogU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUu YW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0JKHJldmlzaW9u IDE1MTgzMikKKysrIFNvdXJjZS9XZWJLaXQyL0dOVW1ha2VmaWxlLmFtCSh3b3JraW5nIGNvcHkp CkBAIC01MjUsNiArNTI1LDI2IEBAIHBsdWdpbl9wcm9jZXNzX2Zvcl9kZXBfbGlzdCArPSBcCiBl bmRpZgogJChwbHVnaW5fcHJvY2Vzc19mb3JfZGVwKTogJChwbHVnaW5fcHJvY2Vzc19mb3JfZGVw X2xpc3QpCiAKK3dlYmNvcmVfbGF5ZXJfZ3RrMl9kZXBzID0gXAorCWxpYldlYkNvcmVQbGF0Zm9y bS5sYSBcCisJbGliV2ViQ29yZUd0azIubGEgXAorCWxpYldlYkNvcmUubGEgXAorCWxpYldlYkNv cmVNb2R1bGVzLmxhCitpZiBFTkFCTEVfU1ZHCit3ZWJjb3JlX2xheWVyX2d0azJfZGVwcyArPSBc CisJbGliV2ViQ29yZVNWRy5sYQorZW5kaWYKK2lmIEVOQUJMRV9JTkRFWEVEX0RBVEFCQVNFCit3 ZWJjb3JlX2xheWVyX2d0azJfZGVwcyArPSBcCisJbGliTGV2ZWxEQi5sYQorZW5kaWYKKword2Vi Y29yZV9sYXllcl9ndGsyX2FyY2hpdmVzID0gJChmb3JlYWNoIGxpYiwgJCh3ZWJjb3JlX2xheWVy X2d0azJfZGVwcyksICQoc2hlbGwgZWNobyAkKGxpYikgfCBzZWQgInMvXCguKlwpXC5sYS8ubGli c1wvXDEuYS8iKSkKKworV2ViQ29yZUxheWVyR3RrMi5hOiAkKHdlYmNvcmVfbGF5ZXJfZ3RrMl9k ZXBzKQorCSQoQU1fVl9HRU4pCisJJChBTV9WX2F0KSQoZm9yZWFjaCBhcmNoaXZlLCAkKHdlYmNv cmVfbGF5ZXJfZ3RrMl9hcmNoaXZlcyksICQoc2hlbGwgYXIgdCAkKGFyY2hpdmUpIHwgeGFyZ3Mg LW41MCBhciBjcnVUICRAKSkKKwogUHJvZ3JhbXNfV2ViS2l0UGx1Z2luUHJvY2Vzc19DUFBGTEFH UyA9IFwKIAktaW5jbHVkZSAkKHNyY2RpcikvU291cmNlL1dlYktpdDIvV2ViS2l0MlByZWZpeC5o IFwKIAktSSQoc3JjZGlyKS9Tb3VyY2UvV2ViS2l0MiBcCkBAIC01ODIsMTggKzYwMiwxMCBAQCBQ cm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX1NPVVJDRVMgPSBcCiBQcm9ncmFtc19XZWJLaXRQ bHVnaW5Qcm9jZXNzX0xEQUREID0gXAogCS1scHRocmVhZCBcCiAJbGliamF2YXNjcmlwdGNvcmVn dGstQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkAuQFdFQktJVEdUS19BUElfTUlOT1JfVkVS U0lPTkAubGEgXAotCWxpYldlYkNvcmUubGEKLQotI2lmIEVOQUJMRV9TVkcKLVByb2dyYW1zX1dl YktpdFBsdWdpblByb2Nlc3NfTERBREQgKz0gXAotCWxpYldlYkNvcmVTVkcubGEKLSNlbmRpZgot Ci1Qcm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0xEQUREICs9IFwKLQlsaWJXZWJDb3JlUGxh dGZvcm0ubGEgXAotCWxpYldlYkNvcmVHdGsyLmxhIFwKKwlXZWJDb3JlTGF5ZXJHdGsyLmEgXAog CSQoQ0FJUk9fTElCUykgXAogCSQoQ09WRVJBR0VfTERGTEFHUykgXAorCSQoRlJFRVRZUEVfTElC UykgXAogCSQoR0VPQ0xVRV9MSUJTKSBcCiAJJChHTElCX0xJQlMpIFwKIAkkKEdTVFJFQU1FUl9M SUJTKSBcCkBAIC02MTcsMTMgKzYyOSw2IEBAIFByb2dyYW1zX1dlYktpdFBsdWdpblByb2Nlc3Nf TERBREQgKz0gXAogCSQoV0lOTU1fTElCUykgXAogCSQoWkxJQl9MSUJTKQogCi0jIGxpYldlYkNv cmUgYW5kIGxpYldlYkNvcmVNb2R1bGVzIGhhdmUgY2lyY3VsYXIgZGVwZW5kZW5jaWVzIHRoYXQg b25seSBzZWVtIHRvCi0jIGJlIGEgcHJvYmxlbSB3aGVuIGxpbmtpbmcgdGhlIHBsdWdpbiBwcm9j ZXNzOyB3ZSBkb24ndCByZWFsbHkgY2FyZSBhYm91dAotIyBtb2R1bGVzIGZvciB0aGUgcGx1Z2lu IHByb2Nlc3MsIHRob3VnaCwgc28gdG8gd29yayBhcm91bmQgdGhhdCB3ZSBpZ25vcmUKLSMgaW50 ZXJuYWwgdW5yZXNvbHZlZCBzeW1ib2xzCi1Qcm9ncmFtc19XZWJLaXRQbHVnaW5Qcm9jZXNzX0xE RkxBR1MgPSBcCi0JLVdsLC0tdW5yZXNvbHZlZC1zeW1ib2xzPWlnbm9yZS1pbi1vYmplY3QtZmls ZXMKLQogUHJvZ3JhbXNfV2ViS2l0UGx1Z2luUHJvY2Vzc19DWFhGTEFHUyA9IFwKIAktZnZpc2li aWxpdHktaW5saW5lcy1oaWRkZW4gXAogCSQoZ2xvYmFsX2N4eGZsYWdzKQpJbmRleDogU291cmNl L1dlYktpdDIvR05VbWFrZWZpbGUubGlzdC5hbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9HTlVtYWtlZmlsZS5saXN0LmFtCShyZXZpc2lvbiAxNTE4MzIpCisrKyBTb3VyY2UvV2ViS2l0 Mi9HTlVtYWtlZmlsZS5saXN0LmFtCSh3b3JraW5nIGNvcHkpCkBAIC0xMzI2LDcgKzEzMjYsMTIg QEAgd2Via2l0Ml9wbHVnaW5fcHJvY2Vzc19zb3VyY2VzICs9IFwKIAlTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAgXAogCVNvdXJjZS9XZWJLaXQy L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcCBcCiAJU291cmNlL1dlYktpdDIvU2hhcmVk L2NhaXJvL1NoYXJlYWJsZUJpdG1hcENhaXJvLmNwcCBcCi0JU291cmNlL1dlYktpdDIvU2hhcmVk L3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAgXAorCVNvdXJjZS9XZWJLaXQyL1No YXJlZC9zb3VwL1BsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmNwcCBcCisJU291cmNlL1dlYktpdDIv U2hhcmVkL3NvdXAvUGxhdGZvcm1DZXJ0aWZpY2F0ZUluZm8uaCBcCisgCVNvdXJjZS9XZWJLaXQy L1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwIFwKKwlTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvUHJvY2Vzc0xhdW5jaGVyLmNwcCBcCisJU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL1Byb2Nlc3NMYXVuY2hlci5oIFwKKwlTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvZ3RrL1Byb2Nlc3NMYXVuY2hlckd0ay5jcHAgXAogCVNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luUHJvY2Vzc1Byb3h5VW5p eC5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uY3BwIFwK IAlTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmggXAo=