19742 2008-06-24 05:55:00 -0700 [GTK] Auto generate webkitmarshal.list 2008-08-02 02:40:26 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 0 marco.barisione webkit-unassigned oldest_to_newest 84245 0 marco.barisione 2008-06-24 05:55:00 -0700 I keep all my changes to WebKit in git branches, but when merging I often get conmflicts in the marshal.list file. It would be nice it this file was autogenerated from source code. 84246 1 21901 marco.barisione 2008-06-24 06:02:53 -0700 Created attachment 21901 Auto generate webkitmarshal.list This is the same approach used in telepathy related projects and in other sw, so it should be portable everywhere. I also renamed webkit-marshal to webkitmarshal. 84261 2 zecke 2008-06-24 08:53:07 -0700 Does the sed work with BSD sed? The shell foo is working with dash and zsh? If that is the case I'm willing to say r=me. 84264 3 marco.barisione 2008-06-24 09:04:30 -0700 I didn't test on BSD as I only have access to linux machines but it should work because we never got any bug reports about that for telepathy-related projects or for avahi-gobject. Nevertheless I would like if someone could test it before committing. Note also that the code in my patch should just use POSIX syntax for portability reasons. 86223 4 21901 zecke 2008-07-17 09:31:47 -0700 Comment on attachment 21901 Auto generate webkitmarshal.list Okay. The change is reasonable, the sed is a bit hard to follow but looks sane. In case it is broken for BSD sed we can look into a solution. Either detecting GNU sed, or changing the sed. 87404 5 21901 christian 2008-07-30 11:18:48 -0700 Comment on attachment 21901 Auto generate webkitmarshal.list Committed in r35455. 87605 6 22607 christian 2008-08-01 12:33:27 -0700 Created attachment 22607 Remove marshaller file The now obsolete marshaller file wasn't removed. This patch does just that. 87668 7 22607 eric 2008-08-02 00:48:24 -0700 Comment on attachment 22607 Remove marshaller file Looks good to me. This won't show up in the commit queue because it's marked as Fixed. Perhaps this was already commited? If not, please re-open the bug so it will show up in the queue. 87679 8 jmalonzo 2008-08-02 02:40:26 -0700 (In reply to comment #7) > (From update of attachment 22607 [edit]) > Looks good to me. This won't show up in the commit queue because it's marked > as Fixed. Perhaps this was already commited? If not, please re-open the bug > so it will show up in the queue. > landed in r35525 21901 2008-06-24 06:02:53 -0700 2008-07-30 11:18:48 -0700 Auto generate webkitmarshal.list marshal.patch text/plain 4308 marco.barisione SW5kZXg6IEdOVW1ha2VmaWxlLmFtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEdOVW1ha2VmaWxlLmFtCShyZXZp c2lvbmUgMzQ3NjYpCisrKyBHTlVtYWtlZmlsZS5hbQkoY29waWEgbG9jYWxlKQpAQCAtMzIwLDgg KzMyMCw4IEBACiAJV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCiAKIHdlYmtpdGd0 a19idWlsdF9zb3VyY2VzICs9IFwKLQlEZXJpdmVkU291cmNlcy93ZWJraXQtbWFyc2hhbC5oIFwK LQlEZXJpdmVkU291cmNlcy93ZWJraXQtbWFyc2hhbC5jcHAgXAorCURlcml2ZWRTb3VyY2VzL3dl YmtpdG1hcnNoYWwuaCBcCisJRGVyaXZlZFNvdXJjZXMvd2Via2l0bWFyc2hhbC5jcHAgXAogCURl cml2ZWRTb3VyY2VzL3dlYmtpdGVudW10eXBlcy5jcHAgXAogCVdlYktpdC9ndGsvd2Via2l0L3dl YmtpdGVudW10eXBlcy5oCiAKQEAgLTM2NywyNiArMzY3LDM3IEBACiBwa2djb25maWdfREFUQSA9 IFdlYktpdC9ndGsvd2Via2l0LTEuMC5wYwogCiBzdGFtcF9maWxlcyA6PSBcCi0Jc3RhbXAtd2Vi a2l0LW1hcnNoYWwuY3BwIFwKLQlzdGFtcC13ZWJraXQtbWFyc2hhbC5oIFwKKwlzdGFtcC13ZWJr aXRtYXJzaGFsLmNwcCBcCisJc3RhbXAtd2Via2l0bWFyc2hhbC5oIFwKIAlzdGFtcC13ZWJraXRl bnVtdHlwZXMuY3BwIFwKIAlzdGFtcC13ZWJraXRlbnVtdHlwZXMuaAogCi1XRUJLSVRfTUFSU0hB TCA9ICQoR0VOU09VUkNFUykvd2Via2l0LW1hcnNoYWwKLVdFQktJVF9NQVJTSEFMX0xJU1QgPSAk KHNyY2RpcikvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0LW1hcnNoYWwubGlzdAorV0VCS0lUX01B UlNIQUwgPSAkKEdFTlNPVVJDRVMpL3dlYmtpdG1hcnNoYWwKK1dFQktJVF9NQVJTSEFMX0xJU1Qg PSAkKFdFQktJVF9NQVJTSEFMKS5saXN0CiAKLURlcml2ZWRTb3VyY2VzL3dlYmtpdC1tYXJzaGFs LmNwcDogc3RhbXAtd2Via2l0LW1hcnNoYWwuY3BwCiskKFdFQktJVF9NQVJTSEFMX0xJU1QpOiAk KHdlYmtpdGd0a19zb3VyY2VzKSBHTlVtYWtlZmlsZS5hbQorCSggY2QgJCh0b3Bfc3JjZGlyKSAm JiBcCisJc2VkIC1uIC1lICdzLy4qd2Via2l0X21hcnNoYWxfXChbWzp1cHBlcjpdWzpkaWdpdDpd XSpfX1tbOnVwcGVyOl1bOmRpZ2l0Ol1fXSpcKS4qL1wxL3AnIFwKKwkkKHdlYmtpdGd0a19zb3Vy Y2VzKSApIFwKKwl8IHNlZCAtZSAncy9fXy86LycgLWUgJ3kvXy8sLycgfCBzb3J0IC11ID4gJEAu dG1wCisJaWYgY21wIC1zICRALnRtcCAkQDsgdGhlbiBcCisJCXJtICRALnRtcDsgXAorCWVsc2Ug XAorCQltdiAkQC50bXAgJEA7IFwKKwlmaQorCiskKFdFQktJVF9NQVJTSEFMKS5jcHA6IHN0YW1w LXdlYmtpdG1hcnNoYWwuY3BwCiAJQHRydWUKIAotRGVyaXZlZFNvdXJjZXMvd2Via2l0LW1hcnNo YWwuaDogc3RhbXAtd2Via2l0LW1hcnNoYWwuaAorJChXRUJLSVRfTUFSU0hBTCkuaDogc3RhbXAt d2Via2l0bWFyc2hhbC5oCiAJQHRydWUKIAotc3RhbXAtd2Via2l0LW1hcnNoYWwuY3BwOiAkKFdF QktJVF9NQVJTSEFMX0xJU1QpCitzdGFtcC13ZWJraXRtYXJzaGFsLmNwcDogJChXRUJLSVRfTUFS U0hBTF9MSVNUKQogCWVjaG8gImV4dGVybiBcIkNcIiB7IiA+ICQoV0VCS0lUX01BUlNIQUwpLmNw cCAmJiBcCiAJJChHTElCX0dFTk1BUlNIQUwpIC0tcHJlZml4PXdlYmtpdF9tYXJzaGFsICQoV0VC S0lUX01BUlNIQUxfTElTVCkgLS1ib2R5ID4+ICQoV0VCS0lUX01BUlNIQUwpLmNwcCAmJiBlY2hv ICd9JyA+PiAkKFdFQktJVF9NQVJTSEFMKS5jcHAgJiYgXAogCWVjaG8gdGltZXN0YW1wID4gJChA RikKIAotc3RhbXAtd2Via2l0LW1hcnNoYWwuaDogJChXRUJLSVRfTUFSU0hBTF9MSVNUKQorc3Rh bXAtd2Via2l0bWFyc2hhbC5oOiAkKFdFQktJVF9NQVJTSEFMX0xJU1QpCiAJJChHTElCX0dFTk1B UlNIQUwpIC0tcHJlZml4PXdlYmtpdF9tYXJzaGFsICQoV0VCS0lUX01BUlNIQUxfTElTVCkgLS1o ZWFkZXIgPiAkKFdFQktJVF9NQVJTSEFMKS5oICYmIFwKIAllY2hvIHRpbWVzdGFtcCA+ICQoQEYp CiAKSW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAJKHJldmlzaW9uZSAzNDc2 NikKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAkoY29waWEgbG9jYWxl KQpAQCAtMjUsNyArMjUsNyBAQAogCiAjaW5jbHVkZSAid2Via2l0d2ViZnJhbWUuaCIKICNpbmNs dWRlICJ3ZWJraXR3ZWJ2aWV3LmgiCi0jaW5jbHVkZSAid2Via2l0LW1hcnNoYWwuaCIKKyNpbmNs dWRlICJ3ZWJraXRtYXJzaGFsLmgiCiAjaW5jbHVkZSAid2Via2l0cHJpdmF0ZS5oIgogCiAjaW5j bHVkZSAiQ1N0cmluZy5oIgpJbmRleDogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAJKHJl dmlzaW9uZSAzNDc2NikKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCShj b3BpYSBsb2NhbGUpCkBAIC0yNSw3ICsyNSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKICNp bmNsdWRlICJ3ZWJraXR3ZWJ2aWV3LmgiCi0jaW5jbHVkZSAid2Via2l0LW1hcnNoYWwuaCIKKyNp bmNsdWRlICJ3ZWJraXRtYXJzaGFsLmgiCiAjaW5jbHVkZSAid2Via2l0cHJpdmF0ZS5oIgogI2lu Y2x1ZGUgIndlYmtpdHdlYmJhY2tmb3J3YXJkbGlzdC5oIgogI2luY2x1ZGUgIndlYmtpdHdlYmhp c3RvcnlpdGVtLmgiCkluZGV4OiBXZWJLaXQvZ3RrL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvZ3RrL0NoYW5nZUxvZwkocmV2aXNpb25lIDM0NzY2KQorKysgV2ViS2l0L2d0ay9DaGFu Z2VMb2cJKGNvcGlhIGxvY2FsZSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOC0wNi0yNCAgTWFyY28g QmFyaXNpb25lICA8bWFyY28uYmFyaXNpb25lQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc0MgorICAgICAgICBbR1RLXSBBdXRvIGdlbmVyYXRlIHdl YmtpdG1hcnNoYWwubGlzdAorCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcDog SW5jbHVkZSB3ZWJraXRtYXJzaGFsLmggaW5zdGVhZCBvZgorICAgICAgICB3ZWJraXQtbWFyc2hh bC5oLgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDogRGl0dG8uCisKIDIwMDgt MDYtMTggIE1hcmNvIEJhcmlzaW9uZSAgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEuY28udWs+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxwIFRva2VyLgpJbmRleDogQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIENoYW5nZUxvZwkocmV2aXNpb25lIDM0NzY2KQorKysgQ2hhbmdlTG9nCShjb3Bp YSBsb2NhbGUpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDYtMjQgIE1hcmNvIEJhcmlzaW9uZSAg PG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk3NDIKKyAgICAgICAgW0dUS10gQXV0byBnZW5lcmF0ZSB3ZWJraXRtYXJzaGFs Lmxpc3QKKworICAgICAgICBBdXRvIGdlbmVyYXRlIHdlYmtpdG1hcnNoYWwubGlzdCBmcm9tIHNv dXJjZSBmaWxlcyB0byByZWR1Y2UgdGhlCisgICAgICAgIG51bWJlciBvZiBjb25mbGljdHMgd2hl biBtZXJnaW5nIGdpdCBicmFuY2hlcyBvciB3aGVuIGFwcGx5aW5nCisgICAgICAgIHBhdGNoZXMu CisgICAgICAgIEFsc28gcmVuYW1lIHdlYmtpdC1tYXJzaGFsLiogdG8gd2Via2l0bWFyc2hhbC4q IGZvciBjb25zaXN0ZW5jeS4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOgorCiAyMDA4LTA2 LTE4ICBNYXJjbyBCYXJpc2lvbmUgIDxtYXJjby5iYXJpc2lvbmVAY29sbGFib3JhLmNvLnVrPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEFscCBUb2tlci4K 22607 2008-08-01 12:33:27 -0700 2008-08-02 00:48:24 -0700 Remove marshaller file mshlist.diff text/plain 959 christian ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggMzI0MzllMC4uNmFkYTUwNCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAwOC0wOC0wMSAg Q2hyaXN0aWFuIER5d2FuICA8Y2hyaXN0aWFuQHR3b3RvYXN0cy5kZT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgd2Via2l0LW1hcnNoYWwu bGlzdCwgd2hpY2ggd2FzIG1hZGUgb2Jzb2xldGUgaW4gIzE5NzQyCisKKyAgICAgICAgKiB3ZWJr aXQvd2Via2l0LW1hcnNoYWwubGlzdDogUmVtb3ZlZC4KKwogMjAwOC0wNy0zMCAgTWFyY28gQmFy aXNpb25lICA8bWFyY28uYmFyaXNpb25lQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZp ZXdlZCBieSBIb2xnZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXQtbWFy c2hhbC5saXN0IGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0LW1hcnNoYWwubGlzdApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYThmMjQ1My4uMDAwMDAwMAotLS0gYS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXQtbWFyc2hhbC5saXN0CisrKyAvZGV2L251bGwKQEAgLTEsMTIgKzAsMCBA QAotVk9JRDpPQkpFQ1QKLVZPSUQ6U1RSSU5HCi1WT0lEOlNUUklORyxTVFJJTkcKLVZPSUQ6T0JK RUNULEJPT0xFQU4KLVZPSUQ6T0JKRUNULFNUUklORwotVk9JRDpPQkpFQ1QsT0JKRUNUCi1WT0lE Ok9CSkVDVCxQT0lOVEVSLFBPSU5URVIKLUJPT0xFQU46U1RSSU5HLElOVCxTVFJJTkcKLUJPT0xF QU46T0JKRUNULFNUUklORwotQk9PTEVBTjpPQkpFQ1QsU1RSSU5HLEJPT0xFQU4KLUJPT0xFQU46 T0JKRUNULFNUUklORyxTVFJJTkcsU1RSSU5HCi1JTlQ6T0JKRUNULE9CSkVDVAo=