59695 2011-04-28 06:26:52 -0700 [GTK] Build webkit1 even when webkit2 is enabled 2011-05-03 02:53:49 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 59694 1 cgarcia webkit-unassigned oldest_to_newest 394393 0 cgarcia 2011-04-28 06:26:52 -0700 Webkit1 and Webkit2 are currently built seprated, but they could be built at the same time using the same libWebCore. 394394 1 91479 cgarcia 2011-04-28 06:29:29 -0700 Created attachment 91479 Patch Webkit2 is still disabled by default, but when enabled, webkit1 is built too. 394470 2 91479 mrobinson 2011-04-28 09:20:16 -0700 Comment on attachment 91479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91479&action=review > GNUmakefile.am:-235 > -stamp-po: Is it safe to remove this stamp-po rule? 394488 3 cgarcia 2011-04-28 09:41:37 -0700 (In reply to comment #2) > (From update of attachment 91479 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91479&action=review > > > GNUmakefile.am:-235 > > -stamp-po: > > Is it safe to remove this stamp-po rule? It's actually defined in the webkit1 gtk makefile, we have to fix #55153. But it doesn't affect the build. 395958 4 91479 eric 2011-05-01 10:51:17 -0700 Comment on attachment 91479 Patch Martin seemed OK with the change otherwise. rs=me assuming you don't break the gtk build. 397023 5 cgarcia 2011-05-03 02:53:49 -0700 Committed r85595: <http://trac.webkit.org/changeset/85595> 91479 2011-04-28 06:29:29 -0700 2011-05-01 10:51:17 -0700 Patch build-webkit1-2.diff text/plain 4506 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAzODQwOTllLi43NDY3MmQw IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTEtMDQtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEJ1 aWxkIHdlYmtpdDEgZXZlbiB3aGVuIHdlYmtpdDIgaXMgZW5hYmxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk2OTUKKworICAgICAgICAqIEdOVW1h a2VmaWxlLmFtOgorICAgICAgICAqIGNvbmZpZ3VyZS5hYzoKKwogMjAxMS0wNC0yNyAgWWkgU2hl biAgPHlpLjQuc2hlbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBS b2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDdkODUwYS4uNWJmZTEyOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTA0LTI4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbR1RLXSBCdWlsZCB3ZWJraXQxIGV2ZW4gd2hlbiB3ZWJraXQyIGlzIGVu YWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5 Njk1CisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToKKwogMjAxMS0wNC0yNyAgU2FtIFdlaW5p ZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRp ZmYgLS1naXQgYS9HTlVtYWtlZmlsZS5hbSBiL0dOVW1ha2VmaWxlLmFtCmluZGV4IGFmNTQ4OTEu LmYyMTkxZmEgMTAwNjQ0Ci0tLSBhL0dOVW1ha2VmaWxlLmFtCisrKyBiL0dOVW1ha2VmaWxlLmFt CkBAIC0yMjcsMTcgKzIyNywxNSBAQCBFWFRSQV9ESVNUICs9IFwKICMgSW5jbHVkZSBtb2R1bGUg bWFrZWZpbGVzCiBpbmNsdWRlIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9HTlVtYWtlZmlsZS5hbQog aW5jbHVkZSBTb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQoraW5jbHVkZSBTb3VyY2UvV2Vi S2l0L2d0ay9HTlVtYWtlZmlsZS5hbQoraW5jbHVkZSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9n b2JqZWN0L0dOVW1ha2VmaWxlLmFtCitpbmNsdWRlIFRvb2xzL0dOVW1ha2VmaWxlLmFtCitpbmNs dWRlIFNvdXJjZS9XZWJLaXQvZ3RrL3BvL0dOVW1ha2VmaWxlLmFtCiBpZiBFTkFCTEVfV0VCS0lU MgogaW5jbHVkZSBTb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQogaW5jbHVkZSBUb29scy9N aW5pQnJvd3Nlci9ndGsvR05VbWFrZWZpbGUuYW0KICMgW0dUS10gUmVmYWN0b3IgdGhlIHRyYW5z bGF0aW9ucyBub3cgdGhhdCB3ZSBoYXZlIHdlYmtpdDIKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU1MTUzCi1zdGFtcC1wbzoKLWVsc2UKLWluY2x1ZGUgU291cmNl L1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KLWluY2x1ZGUgU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvZ29iamVjdC9HTlVtYWtlZmlsZS5hbQotaW5jbHVkZSBUb29scy9HTlVtYWtlZmlsZS5hbQot aW5jbHVkZSBTb3VyY2UvV2ViS2l0L2d0ay9wby9HTlVtYWtlZmlsZS5hbQogZW5kaWYKIAogIyBB dXRvZ2VuZXJhdGVkIHNvdXJjZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0dOVW1ha2Vm aWxlLmFtIGIvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KaW5kZXggYzg5YmUzMy4uYzY0 YmE0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KKysrIGIvU291 cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0KQEAgLTgwMSw4ICs4MDEsNyBAQCBsaWJ3ZWJraXQy Z3RrX0BXRUJLSVRHVEtfQVBJX01BSk9SX1ZFUlNJT05AX0BXRUJLSVRHVEtfQVBJX01JTk9SX1ZF UlNJT05AX2xhX0xJQgogCSQoVU5JQ09ERV9MSUJTKSBcCiAJJChYVF9MSUJTKQogCi1wa2djb25m aWdkaXIgPSAkKGxpYmRpcikvcGtnY29uZmlnCi1wa2djb25maWdfREFUQSA9IFNvdXJjZS9XZWJL aXQyL2d0ay9AV0VCS0lUR1RLX1BDX05BTUVALUBXRUJLSVRHVEtfQVBJX1ZFUlNJT05ALnBjCitw a2djb25maWdfREFUQSArPSBTb3VyY2UvV2ViS2l0Mi9ndGsvQFdFQktJVEdUS19QQ19OQU1FQDIt QFdFQktJVEdUS19BUElfVkVSU0lPTkAucGMKIAogIyBXZWJLaXQyIHNwZWNpZmljIHZhcmlhYmxl cwogd2Via2l0Ml9idWlsdF9zb3VyY2VzICs9IFwKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5hYyBi L2NvbmZpZ3VyZS5hYwppbmRleCBhNzNjMTA5Li4wMWFhNDg4IDEwMDY0NAotLS0gYS9jb25maWd1 cmUuYWMKKysrIGIvY29uZmlndXJlLmFjCkBAIC0xMDI0LDEwICsxMDI0LDYgQEAgQUNfQVJHX0VO QUJMRSh3ZWJraXQyLAogICAgICAgICAgICAgICAgIFtidWlsZCB3ZWJraXQyIFtkZWZhdWx0PW5v XV0pLAogICAgICAgICAgICAgICAgIFtdLCBbZW5hYmxlX3dlYmtpdDI9Im5vIl0pCiBBQ19NU0df UkVTVUxUKFskZW5hYmxlX3dlYmtpdDJdKQotaWYgdGVzdCAiJGVuYWJsZV93ZWJraXQyIiA9ICJ5 ZXMiOyB0aGVuCi0gICAgV0VCS0lUR1RLX1BDX05BTUU9JHtXRUJLSVRHVEtfUENfTkFNRX0yCi0g ICAgQUNfU1VCU1QoW1dFQktJVEdUS19QQ19OQU1FXSkKLWZpCiAKIEdUS19ET0NfQ0hFQ0soWzEu MTBdKQogCkBAIC0xMTIyLDI0ICsxMTE4LDIzIEBAIEFDX0NPTkZJR19GSUxFUyhbCiBHTlVtYWtl ZmlsZQogXSkKICAKLWlmIHRlc3QgIiRlbmFibGVfd2Via2l0MiIgPSAibm8iOyB0aGVuCi0gICAg QUNfQ09ORklHX0ZJTEVTKFsKLSAgICBTb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0dmVy c2lvbi5oCi0gICAgU291cmNlL1dlYktpdC9ndGsvZG9jcy9HTlVtYWtlZmlsZQotICAgIFNvdXJj ZS9XZWJLaXQvZ3RrL2RvY3MvdmVyc2lvbi54bWwKLSAgICBdCi0gICAgKQorQUNfQ09ORklHX0ZJ TEVTKFsKK1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR2ZXJzaW9uLmgKK1NvdXJjZS9X ZWJLaXQvZ3RrL2RvY3MvR05VbWFrZWZpbGUKK1NvdXJjZS9XZWJLaXQvZ3RrL2RvY3MvdmVyc2lv bi54bWwKK10pCiAKK0FDX0NPTkZJR19GSUxFUyhbCitTb3VyY2UvV2ViS2l0L2d0ay8ke1dFQktJ VEdUS19QQ19OQU1FfS0ke1dFQktJVEdUS19BUElfVkVSU0lPTn0ucGM6U291cmNlL1dlYktpdC9n dGsvd2Via2l0LnBjLmluCitTb3VyY2UvV2ViS2l0L2d0ay9KU0NvcmUtJHtXRUJLSVRHVEtfQVBJ X1ZFUlNJT059LmdpcjpTb3VyY2UvV2ViS2l0L2d0ay9KU0NvcmUuZ2lyLmluCitTb3VyY2UvV2Vi S2l0L2d0ay9vcmcud2Via2l0Z3RrLSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfS5nc2NoZW1hLnht bDpTb3VyY2UvV2ViS2l0L2d0ay9vcmcud2Via2l0Z3RrLmdzY2hlbWEueG1sLmluCitdCissW1dF QktJVEdUS19BUElfVkVSU0lPTj0kV0VCS0lUR1RLX0FQSV9WRVJTSU9OLFdFQktJVEdUS19QQ19O QU1FPSRXRUJLSVRHVEtfUENfTkFNRV0KKykKKworaWYgdGVzdCAiJGVuYWJsZV93ZWJraXQyIiA9 ICJ5ZXMiOyB0aGVuCiAgICAgQUNfQ09ORklHX0ZJTEVTKFsKLSAgICBTb3VyY2UvV2ViS2l0L2d0 ay8ke1dFQktJVEdUS19QQ19OQU1FfS0ke1dFQktJVEdUS19BUElfVkVSU0lPTn0ucGM6U291cmNl L1dlYktpdC9ndGsvd2Via2l0LnBjLmluCi0gICAgU291cmNlL1dlYktpdC9ndGsvSlNDb3JlLSR7 V0VCS0lUR1RLX0FQSV9WRVJTSU9OfS5naXI6U291cmNlL1dlYktpdC9ndGsvSlNDb3JlLmdpci5p bgotICAgIFNvdXJjZS9XZWJLaXQvZ3RrL29yZy53ZWJraXRndGstJHtXRUJLSVRHVEtfQVBJX1ZF UlNJT059LmdzY2hlbWEueG1sOlNvdXJjZS9XZWJLaXQvZ3RrL29yZy53ZWJraXRndGsuZ3NjaGVt YS54bWwuaW4KLSAgICBdCi0gICAgLFtXRUJLSVRHVEtfQVBJX1ZFUlNJT049JFdFQktJVEdUS19B UElfVkVSU0lPTixXRUJLSVRHVEtfUENfTkFNRT0kV0VCS0lUR1RLX1BDX05BTUVdCi0gICAgKQot ZWxzZQotICAgIEFDX0NPTkZJR19GSUxFUyhbCi0gICAgU291cmNlL1dlYktpdDIvZ3RrLyR7V0VC S0lUR1RLX1BDX05BTUV9LSR7V0VCS0lUR1RLX0FQSV9WRVJTSU9OfS5wYzpTb3VyY2UvV2ViS2l0 Mi9ndGsvd2Via2l0Mi5wYy5pbgorICAgIFNvdXJjZS9XZWJLaXQyL2d0ay8ke1dFQktJVEdUS19Q Q19OQU1FfTItJHtXRUJLSVRHVEtfQVBJX1ZFUlNJT059LnBjOlNvdXJjZS9XZWJLaXQyL2d0ay93 ZWJraXQyLnBjLmluCiAgICAgXQogICAgICxbV0VCS0lUR1RLX0FQSV9WRVJTSU9OPSRXRUJLSVRH VEtfQVBJX1ZFUlNJT04sV0VCS0lUR1RLX1BDX05BTUU9JFdFQktJVEdUS19QQ19OQU1FXQogICAg ICkK