24537 2009-03-11 19:23:18 -0700 Build failure - tzname name conflict 2009-07-14 11:42:46 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC S60 3rd edition RESOLVED FIXED P2 Normal --- 27065 0 norbert.leser webkit-unassigned hausmann mrowe oldest_to_newest 113293 0 norbert.leser 2009-03-11 19:23:18 -0700 In implementation of DateMath class is a name conflict with globally defined tzname in Symbian. The proposed solution is to replace the "tzname" with different name instead of using namespace qualifier (appeared to be less clumsy). Similarly, there doesn't appear to be any reason for a conditional change. See attached patch. 113294 1 28513 norbert.leser 2009-03-11 19:24:06 -0700 Created attachment 28513 Proposed fix for bug 24537 113295 2 mrowe 2009-03-11 19:27:13 -0700 The patch does a lot more than renaming tzname, even though that is all the changelog mentions. That's a bit misleading. 113302 3 mrowe 2009-03-11 19:36:14 -0700 Your changelogs should also have a name rather than "Nokia User". 113391 4 norbert.leser 2009-03-12 08:10:23 -0700 (In reply to comment #2) > The patch does a lot more than renaming tzname, even though that is all the > changelog mentions. That's a bit misleading. > The patch has 1 more (not a lot more) changes, which is PLATFORM(SYMBIAN) conditional stuff related to DST processing. You're right, it should not have been munched together. I will separate it, update the patch and submit the symbian related stuff as a new bug report. 113616 5 28583 norbert.leser 2009-03-13 10:29:03 -0700 Created attachment 28583 Patch update for 24537 As discussed, I removed the SYMBIAN conditional changes from this change request (will file that at a later point separately). This new patch contains the renaming of "tzname" only. 113645 6 28583 darin 2009-03-13 12:16:00 -0700 Comment on attachment 28583 Patch update for 24537 Seems OK. But if I had to change this, I'd prefer to change it to something less cryptic rather than more. Like timeZoneName, rather than tznm. r=me 113655 7 norbert.leser 2009-03-13 12:27:13 -0700 (In reply to comment #6) > (From update of attachment 28583 [review]) > Seems OK. But if I had to change this, I'd prefer to change it to something > less cryptic rather than more. Like timeZoneName, rather than tznm. > > r=me > Sure, I don't mind verbose names. Do you need another patch or can you fix that directly? 113706 8 dimich 2009-03-13 14:54:26 -0700 Name changed and landed in: http://trac.webkit.org/changeset/41685 28513 2009-03-11 19:24:06 -0700 2009-03-13 10:29:03 -0700 Proposed fix for bug 24537 patch_fix08.txt text/plain 4246 norbert.leser SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQxNjAyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDMtMTEgIE5va2lhIFVz ZXIgIDxub3JiZXJ0Lmxlc2VyQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZXNvbHZlZCBuYW1lIGNvbmZsaWN0IHdpdGggZ2xvYmFs bHkgZGVmaW5lZCB0em5hbWUgaW4gU3ltYmlhbi4KKyAgICAgICAgUmVwbGFjZWQgd2l0aCBkaWZm ZXJlbnQgbmFtZSBpbnN0ZWFkIG9mIHVzaW5nIG5hbWVzcGFjZSBxdWFsaWZpZXIKKyAgICAgICAg KGFwcGVhcmVkIHRvIGJlIGxlc3MgY2x1bXN5KS4KKworICAgICAgICAqIHJ1bnRpbWUvRGF0ZU1h dGguY3BwOgorICAgICAgICAoSlNDOjpnZXREU1RPZmZzZXQpOgorICAgICAgICAoSlNDOjpmb3Jt YXRUaW1lKToKKyAgICAgICAgKiBydW50aW1lL0RhdGVNYXRoLmg6CisgICAgICAgIChKU0M6Okdy ZWdvcmlhbkRhdGVUaW1lOjpHcmVnb3JpYW5EYXRlVGltZSk6CisgICAgICAgIChKU0M6OkdyZWdv cmlhbkRhdGVUaW1lOjpvcGVyYXRvciB0bSk6CisKIDIwMDktMDMtMTEgIEFkYW0gUm9iZW4gIDxh cm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIENoYW5nZSB0aGUgV2luZG93cyBpbXBsZW1lbnRh dGlvbiBvZiBUaHJlYWRTcGVjaWZpYyB0byB1c2UgZnVuY3Rpb25zCkluZGV4OiBKYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0RhdGVNYXRoLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9y dW50aW1lL0RhdGVNYXRoLmNwcAkocmV2aXNpb24gNDE2MDIpCisrKyBKYXZhU2NyaXB0Q29yZS9y dW50aW1lL0RhdGVNYXRoLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQwLDYgKzQ0MCwxMCBAQCBz dGF0aWMgZG91YmxlIGdldERTVE9mZnNldFNpbXBsZShkb3VibGUgCiAvLyBHZXQgdGhlIERTVCBv ZmZzZXQsIGdpdmVuIGEgdGltZSBpbiBVVEMKIHN0YXRpYyBkb3VibGUgZ2V0RFNUT2Zmc2V0KGRv dWJsZSBtcywgZG91YmxlIHV0Y09mZnNldCkKIHsKKyNpZiBQTEFURk9STShTWU1CSUFOKQorICAg IC8vIFN5bWJpYW4gZG9lcyBub3Qgc3VwcG9ydCBEU1QKKyAgICByZXR1cm4gVXNlcjo6VVRDT2Zm c2V0KCkuSW50KCkgKiBtc1BlclNlY29uZDsKKyNlbHNlCiAgICAgLy8gT24gTWFjIE9TIFgsIHRo ZSBjYWxsIHRvIGxvY2FsdGltZSAoc2VlIGdldERTVE9mZnNldFNpbXBsZSkgd2lsbCByZXR1cm4g aGlzdG9yaWNhbGx5IGFjY3VyYXRlCiAgICAgLy8gRFNUIGluZm9ybWF0aW9uIChlLmcuIE5ldyBa ZWFsYW5kIGRpZCBub3QgaGF2ZSBEU1QgZnJvbSAxOTQ2IHRvIDE5NzQpIGhvd2V2ZXIgdGhlIEph dmFTY3JpcHQKICAgICAvLyBzdGFuZGFyZCBleHBsaWNpdGx5IGRpY3RhdGVzIHRoYXQgaGlzdG9y aWNhbCBpbmZvcm1hdGlvbiBzaG91bGQgbm90IGJlIGNvbnNpZGVyZWQgd2hlbgpAQCAtNDU3LDYg KzQ2MSw3IEBAIHN0YXRpYyBkb3VibGUgZ2V0RFNUT2Zmc2V0KGRvdWJsZSBtcywgZG8KICAgICB9 CiAKICAgICByZXR1cm4gZ2V0RFNUT2Zmc2V0U2ltcGxlKG1zIC8gbXNQZXJTZWNvbmQsIHV0Y09m ZnNldCk7CisjZW5kaWYKIH0KIAogZG91YmxlIGdyZWdvcmlhbkRhdGVUaW1lVG9NUyhjb25zdCBH cmVnb3JpYW5EYXRlVGltZSYgdCwgZG91YmxlIG1pbGxpU2Vjb25kcywgYm9vbCBpbnB1dElzVVRD KQpAQCAtOTE5LDE0ICs5MjQsMTQgQEAgVVN0cmluZyBmb3JtYXRUaW1lKGNvbnN0IEdyZWdvcmlh bkRhdGVUaQogICAgICAgICBzbnByaW50ZihidWZmZXIsIHNpemVvZihidWZmZXIpLCAiJTAyZDol MDJkOiUwMmQgR01UIiwgdC5ob3VyLCB0Lm1pbnV0ZSwgdC5zZWNvbmQpOwogICAgIH0gZWxzZSB7 CiAgICAgICAgIGludCBvZmZzZXQgPSBhYnMoZ210b2Zmc2V0KHQpKTsKLSAgICAgICAgY2hhciB0 em5hbWVbNzBdOworICAgICAgICBjaGFyIHR6bm1bNzBdOwogICAgICAgICBzdHJ1Y3QgdG0gZ3Rt ID0gdDsKLSAgICAgICAgc3RyZnRpbWUodHpuYW1lLCBzaXplb2YodHpuYW1lKSwgIiVaIiwgJmd0 bSk7CisgICAgICAgIHN0cmZ0aW1lKHR6bm0sIHNpemVvZih0em5tKSwgIiVaIiwgJmd0bSk7CiAK LSAgICAgICAgaWYgKHR6bmFtZVswXSkgeworICAgICAgICBpZiAodHpubVswXSkgewogICAgICAg ICAgICAgc25wcmludGYoYnVmZmVyLCBzaXplb2YoYnVmZmVyKSwgIiUwMmQ6JTAyZDolMDJkIEdN VCVjJTAyZCUwMmQgKCVzKSIsCiAgICAgICAgICAgICAgICAgdC5ob3VyLCB0Lm1pbnV0ZSwgdC5z ZWNvbmQsCi0gICAgICAgICAgICAgICAgZ210b2Zmc2V0KHQpIDwgMCA/ICctJyA6ICcrJywgb2Zm c2V0IC8gKDYwKjYwKSwgKG9mZnNldCAvIDYwKSAlIDYwLCB0em5hbWUpOworICAgICAgICAgICAg ICAgIGdtdG9mZnNldCh0KSA8IDAgPyAnLScgOiAnKycsIG9mZnNldCAvICg2MCo2MCksIChvZmZz ZXQgLyA2MCkgJSA2MCwgdHpubSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBzbnBy aW50ZihidWZmZXIsIHNpemVvZihidWZmZXIpLCAiJTAyZDolMDJkOiUwMmQgR01UJWMlMDJkJTAy ZCIsCiAgICAgICAgICAgICAgICAgdC5ob3VyLCB0Lm1pbnV0ZSwgdC5zZWNvbmQsCkluZGV4OiBK YXZhU2NyaXB0Q29yZS9ydW50aW1lL0RhdGVNYXRoLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlw dENvcmUvcnVudGltZS9EYXRlTWF0aC5oCShyZXZpc2lvbiA0MTYwMikKKysrIEphdmFTY3JpcHRD b3JlL3J1bnRpbWUvRGF0ZU1hdGguaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsMTAgQEAK ICNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KIAorI2lm IFBMQVRGT1JNKFNZTUJJQU4pCisjaW5jbHVkZSA8ZTMyc3RkLmg+CisjZW5kaWYKKwogbmFtZXNw YWNlIEpTQyB7CiAKIGNsYXNzIFVTdHJpbmc7CkBAIC0xMTMsMTIgKzExNywxNSBAQCBzdHJ1Y3Qg R3JlZ29yaWFuRGF0ZVRpbWUgOiBOb25jb3B5YWJsZSB7CiAgICAgICAgICwgeWVhcihpblRtLnRt X3llYXIpCiAgICAgICAgICwgaXNEU1QoaW5UbS50bV9pc2RzdCkKICAgICB7Ci0jaWYgIVBMQVRG T1JNKFdJTl9PUykgJiYgIVBMQVRGT1JNKFNPTEFSSVMpICYmICFDT01QSUxFUihSVkNUKQorI2lm ICFQTEFURk9STShXSU5fT1MpICYmICFQTEFURk9STShTT0xBUklTKSAmJiAhQ09NUElMRVIoUlZD VCkgJiYgIVBMQVRGT1JNKFNZTUJJQU4pCiAgICAgICAgIHV0Y09mZnNldCA9IHN0YXRpY19jYXN0 PGludD4oaW5UbS50bV9nbXRvZmYpOwogCiAgICAgICAgIGludCBpblpvbmVTaXplID0gc3RybGVu KGluVG0udG1fem9uZSkgKyAxOwogICAgICAgICB0aW1lWm9uZSA9IG5ldyBjaGFyW2luWm9uZVNp emVdOwogICAgICAgICBzdHJuY3B5KHRpbWVab25lLCBpblRtLnRtX3pvbmUsIGluWm9uZVNpemUp OworI2VsaWYgUExBVEZPUk0oU1lNQklBTikKKyAgICAgICAgdXRjT2Zmc2V0ID0gVXNlcjo6VVRD T2Zmc2V0KCkuSW50KCk7CisgICAgICAgIHRpbWVab25lID0gMDsKICNlbHNlCiAgICAgICAgIHV0 Y09mZnNldCA9IHN0YXRpY19jYXN0PGludD4oZ2V0VVRDT2Zmc2V0KCkgLyBtc1BlclNlY29uZCAr IChpc0RTVCA/IHNlY29uZHNQZXJIb3VyIDogMCkpOwogICAgICAgICB0aW1lWm9uZSA9IDA7CkBA IC0xNDAsNyArMTQ3LDcgQEAgc3RydWN0IEdyZWdvcmlhbkRhdGVUaW1lIDogTm9uY29weWFibGUg ewogICAgICAgICByZXQudG1feWVhciAgPSAgeWVhcjsKICAgICAgICAgcmV0LnRtX2lzZHN0ID0g IGlzRFNUOwogCi0jaWYgIVBMQVRGT1JNKFdJTl9PUykgJiYgIVBMQVRGT1JNKFNPTEFSSVMpICYm ICFDT01QSUxFUihSVkNUKQorI2lmICFQTEFURk9STShXSU5fT1MpICYmICFQTEFURk9STShTT0xB UklTKSAmJiAhQ09NUElMRVIoUlZDVCkgJiYgIVBMQVRGT1JNKFNZTUJJQU4pCiAgICAgICAgIHJl dC50bV9nbXRvZmYgPSBzdGF0aWNfY2FzdDxsb25nPih1dGNPZmZzZXQpOwogICAgICAgICByZXQu dG1fem9uZSA9IHRpbWVab25lOwogI2VuZGlmCg== 28583 2009-03-13 10:29:03 -0700 2009-03-13 12:16:00 -0700 Patch update for 24537 patch_update1_24537.txt text/plain 1698 norbert.leser SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIEphdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNDE2NjgpDQorKysgSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpDQpAQCAtMSwzICsxLDEzIEBADQorMjAwOS0wMy0xMyAgTm9y YmVydCBMZXNlciAgPG5vcmJlcnQubGVzZXJAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc29sdmVkIG5hbWUgY29uZmxpY3Qgd2l0 aCBnbG9iYWxseSBkZWZpbmVkIHR6bmFtZSBpbiBTeW1iaWFuLgorICAgICAgICBSZXBsYWNlZCB3 aXRoIGRpZmZlcmVudCBuYW1lIGluc3RlYWQgb2YgdXNpbmcgbmFtZXNwYWNlIHF1YWxpZmllcgor ICAgICAgICAoYXBwZWFyZWQgdG8gYmUgbGVzcyBjbHVtc3kpLgorCisgICAgICAgICogcnVudGlt ZS9EYXRlTWF0aC5jcHA6CisKIDIwMDktMDMtMTIgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IEphdmFTY3JpcHRD b3JlL3J1bnRpbWUvRGF0ZU1hdGguY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gSmF2YVNjcmlwdENvcmUv cnVudGltZS9EYXRlTWF0aC5jcHAJKHJldmlzaW9uIDQxNjY0KQ0KKysrIEphdmFTY3JpcHRDb3Jl L3J1bnRpbWUvRGF0ZU1hdGguY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtOTE5LDE0ICs5MTksMTQg QEANCiAgICAgICAgIHNucHJpbnRmKGJ1ZmZlciwgc2l6ZW9mKGJ1ZmZlciksICIlMDJkOiUwMmQ6 JTAyZCBHTVQiLCB0LmhvdXIsIHQubWludXRlLCB0LnNlY29uZCk7CiAgICAgfSBlbHNlIHsKICAg ICAgICAgaW50IG9mZnNldCA9IGFicyhnbXRvZmZzZXQodCkpOwotICAgICAgICBjaGFyIHR6bmFt ZVs3MF07CisgICAgICAgIGNoYXIgdHpubVs3MF07CiAgICAgICAgIHN0cnVjdCB0bSBndG0gPSB0 OwotICAgICAgICBzdHJmdGltZSh0em5hbWUsIHNpemVvZih0em5hbWUpLCAiJVoiLCAmZ3RtKTsK KyAgICAgICAgc3RyZnRpbWUodHpubSwgc2l6ZW9mKHR6bm0pLCAiJVoiLCAmZ3RtKTsKIAotICAg ICAgICBpZiAodHpuYW1lWzBdKSB7CisgICAgICAgIGlmICh0em5tWzBdKSB7CiAgICAgICAgICAg ICBzbnByaW50ZihidWZmZXIsIHNpemVvZihidWZmZXIpLCAiJTAyZDolMDJkOiUwMmQgR01UJWMl MDJkJTAyZCAoJXMpIiwKICAgICAgICAgICAgICAgICB0LmhvdXIsIHQubWludXRlLCB0LnNlY29u ZCwKLSAgICAgICAgICAgICAgICBnbXRvZmZzZXQodCkgPCAwID8gJy0nIDogJysnLCBvZmZzZXQg LyAoNjAqNjApLCAob2Zmc2V0IC8gNjApICUgNjAsIHR6bmFtZSk7CisgICAgICAgICAgICAgICAg Z210b2Zmc2V0KHQpIDwgMCA/ICctJyA6ICcrJywgb2Zmc2V0IC8gKDYwKjYwKSwgKG9mZnNldCAv IDYwKSAlIDYwLCB0em5tKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHNucHJpbnRm KGJ1ZmZlciwgc2l6ZW9mKGJ1ZmZlciksICIlMDJkOiUwMmQ6JTAyZCBHTVQlYyUwMmQlMDJkIiwK ICAgICAgICAgICAgICAgICB0LmhvdXIsIHQubWludXRlLCB0LnNlY29uZCwK