10896 2006-09-17 05:32:29 -0700 REGRESSION: WebKit can't be built with SVG disabled 2006-09-18 02:10:59 -0700 1 1 1 Unclassified WebKit New Bugs 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 Graham.Dennis Graham.Dennis dwood oldest_to_newest 55718 0 Graham.Dennis 2006-09-17 05:32:29 -0700 The build-bot is failing to compile WebKit without SVG and it is failing while compiling DerivedSources/WebCore/DOMXPathExpression.mm which shouldn't exist in the no-SVG build. I have tested this locally, and have run into the same problem. 55740 1 10603 Graham.Dennis 2006-09-17 06:57:29 -0700 Created attachment 10603 patch The problem is not that DerivedSources/WebCore/DOMXPathExpression.mm shouldn't exist, but that it should have a #ifdef XPATH_SUPPORT at the start of the file. This is a general problem for the ObjC generated code that have the Conditional extended attribute set. This patch modifies CodeGeneratorObjC.pm to add #ifdef / #endif pairs to the appropriate files. 55813 2 10603 eric 2006-09-18 02:05:40 -0700 Comment on attachment 10603 patch Looks good to me. r=me 55814 3 10603 eric 2006-09-18 02:06:18 -0700 Comment on attachment 10603 patch You should probably add your copyright to the files however. 55815 4 mrowe 2006-09-18 02:10:59 -0700 Landed in r16420. 10603 2006-09-17 06:57:29 -0700 2006-09-18 02:05:40 -0700 patch patch-10896.diff text/plain 4441 Graham.Dennis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNjQwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDYtMDktMTcgIEdyYWhhbSBEZW5uaXMgIDxncmFoYW0uZGVubmlz QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAg ICAgCisgICAgICAgIC0gZml4IGZvciBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hv d19idWcuY2dpP2lkPTEwODk2CisgICAgICAgIFJFR1JFU1NJT046IFdlYktpdCBjYW4ndCBiZSBi dWlsdCB3aXRoIFNWRyBkaXNhYmxlZAorICAgICAgICAKKyAgICAgICAgKiBiaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtOgorICAgICAgICBGb3IgZWFjaCBmaWxlIGdlbmVyYXRl ZCBhZGQgYSAjaWZkZWYgPHNvbWV0aGluZz5fU1VQUE9SVCAvICNlbmRpZgorICAgICAgICBwYWly IGlmIHRoZSBpZGwgZmlsZSBoYXMgYSBDb25kaXRpb25hbCBleHRlbmRlZCBhdHRyaWJ1dGUKKwog MjAwNi0wOS0xNyAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4 IGZvciBidWd6aWxsYSBidWcgMzI0MCwgaW1wbGVtZW50IHN1cHBvcnQgZm9yIHRoZSBIVE1MNCAi ZnJhbWUiIGFuZApJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JP YmpDLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yT2JqQy5wbQkocmV2aXNpb24gMTYzOTQpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvck9iakMucG0JKHdvcmtpbmcgY29weSkKQEAgLTQzMyw2ICs0MzMsNyBAQCBz dWIgR2VuZXJhdGVIZWFkZXIKICAgICBteSAkaW50ZXJmYWNlTmFtZSA9ICRkYXRhTm9kZS0+bmFt ZTsKICAgICBteSAkY2xhc3NOYW1lID0gR2V0Q2xhc3NOYW1lKCRpbnRlcmZhY2VOYW1lKTsKICAg ICBteSAkcGFyZW50Q2xhc3NOYW1lID0gIkRPTSIgLiBHZXRQYXJlbnRJbXBsQ2xhc3NOYW1lKCRk YXRhTm9kZSk7CisgICAgbXkgJGNvbmRpdGlvbmFsID0gJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJp YnV0ZXMtPnsiQ29uZGl0aW9uYWwifTsKIAogICAgIG15ICRudW1Db25zdGFudHMgPSBAeyRkYXRh Tm9kZS0+Y29uc3RhbnRzfTsKICAgICBteSAkbnVtQXR0cmlidXRlcyA9IEB7JGRhdGFOb2RlLT5h dHRyaWJ1dGVzfTsKQEAgLTQ0MSw2ICs0NDIsOSBAQCBzdWIgR2VuZXJhdGVIZWFkZXIKICAgICAj IC0gQWRkIGRlZmF1bHQgaGVhZGVyIHRlbXBsYXRlCiAgICAgQGhlYWRlckNvbnRlbnRIZWFkZXIg PSBzcGxpdCgiXHIiLCAkaGVhZGVyTGljZW5jZVRlbXBsYXRlKTsKICAgICBwdXNoKEBoZWFkZXJD b250ZW50SGVhZGVyLCAiXG4iKTsKKyAgICAKKyAgICAjIC0gQWRkIGEgY2hlY2sgZm9yIHRoZSBh cHByb3ByaWF0ZSBjb25kaXRpb25hbCB2YXJpYWJsZQorICAgIHB1c2goQGhlYWRlckNvbnRlbnQs ICIjaWZkZWYgJHtjb25kaXRpb25hbH1fU1VQUE9SVFxuXG4iKSBpZiAkY29uZGl0aW9uYWw7CiAK ICAgICAjIC0gSU5DTFVERVMgLQogICAgIHVubGVzcyAoJGlzUHJvdG9jb2wpIHsKQEAgLTYyMyw5 ICs2MjcsMTMgQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAgaWYgKEBwcml2YXRlSGVhZGVyQXR0 cmlidXRlcyA+IDAgb3IgQHByaXZhdGVIZWFkZXJGdW5jdGlvbnMgPiAwKSB7CiAgICAgICAgICMg LSBQcml2YXRlIGNhdGVnb3J5IEBpbnRlcmZhY2UKICAgICAgICAgQHByaXZhdGVIZWFkZXJDb250 ZW50SGVhZGVyID0gc3BsaXQoIlxyIiwgJGhlYWRlckxpY2VuY2VUZW1wbGF0ZSk7CisgICAgICAg IHB1c2goQGhlYWRlckNvbnRlbnRIZWFkZXIsICJcbiIpOwogCisgICAgICAgICMgLSBBZGQgYSBj aGVjayBmb3IgdGhlIGFwcHJvcHJpYXRlIGNvbmRpdGlvbmFsIHZhcmlhYmxlCisgICAgICAgIHB1 c2goQHByaXZhdGVIZWFkZXJDb250ZW50SGVhZGVyLCAiI2lmZGVmICR7Y29uZGl0aW9uYWx9X1NV UFBPUlRcblxuIikgaWYgJGNvbmRpdGlvbmFsOworICAgICAgICAKICAgICAgICAgbXkgJGNsYXNz SGVhZGVyTmFtZSA9IEdldENsYXNzSGVhZGVyTmFtZSgkY2xhc3NOYW1lKTsKLSAgICAgICAgcHVz aChAcHJpdmF0ZUhlYWRlckNvbnRlbnRIZWFkZXIsICJcbiNpbXBvcnQgPFdlYkNvcmUvJGNsYXNz SGVhZGVyTmFtZS5oPlxuXG4iKTsKKyAgICAgICAgcHVzaChAcHJpdmF0ZUhlYWRlckNvbnRlbnRI ZWFkZXIsICIjaW1wb3J0IDxXZWJDb3JlLyRjbGFzc0hlYWRlck5hbWUuaD5cblxuIik7CiAKICAg ICAgICAgQHByaXZhdGVIZWFkZXJDb250ZW50ID0gKCk7CiAgICAgICAgIHB1c2goQHByaXZhdGVI ZWFkZXJDb250ZW50LCAiXEBpbnRlcmZhY2UgJGNsYXNzTmFtZSAoIiAuICRjbGFzc05hbWUgLiAi UHJpdmF0ZSlcbiIpOwpAQCAtNjMzLDcgKzY0MSwxMyBAQCBzdWIgR2VuZXJhdGVIZWFkZXIKICAg ICAgICAgcHVzaChAcHJpdmF0ZUhlYWRlckNvbnRlbnQsICJcbiIpIGlmICRidWlsZGluZ0Zvckxl b3BhcmRPckxhdGVyIGFuZCBAcHJpdmF0ZUhlYWRlckF0dHJpYnV0ZXMgPiAwIGFuZCBAcHJpdmF0 ZUhlYWRlckZ1bmN0aW9ucyA+IDA7CiAgICAgICAgIHB1c2goQHByaXZhdGVIZWFkZXJDb250ZW50 LCBAcHJpdmF0ZUhlYWRlckZ1bmN0aW9ucykgaWYgQHByaXZhdGVIZWFkZXJGdW5jdGlvbnMgPiAw OwogICAgICAgICBwdXNoKEBwcml2YXRlSGVhZGVyQ29udGVudCwgIlxAZW5kXG4iKTsKKyAgICAg ICAgCisgICAgICAgICMgLSBFbmQgdGhlIGlmZGVmIGNvbmRpdGlvbmFsIGlmIG5lY2Vzc2FyeSAo Zm9yIHRoZSBwcml2YXRlIGhlYWRlcikKKyAgICAgICAgcHVzaChAcHJpdmF0ZUhlYWRlckNvbnRl bnQsICJcbiNlbmRpZiAvLyAke2NvbmRpdGlvbmFsfV9TVVBQT1JUXG5cbiIpIGlmICRjb25kaXRp b25hbDsKICAgICB9CisgICAgCisgICAgIyAtIEVuZCB0aGUgaWZkZWYgY29uZGl0aW9uYWwgaWYg bmVjZXNzYXJ5CisgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIlxuI2VuZGlmIC8vICR7Y29uZGl0 aW9uYWx9X1NVUFBPUlRcblxuIikgaWYgJGNvbmRpdGlvbmFsOwogfQogCiBzdWIgR2VuZXJhdGVJ bXBsZW1lbnRhdGlvbgpAQCAtNjQ2LDYgKzY2MCw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0 aW9uCiAgICAgbXkgJGltcGxDbGFzc05hbWUgPSBHZXRJbXBsQ2xhc3NOYW1lKCRpbnRlcmZhY2VO YW1lKTsKICAgICBteSAkcGFyZW50SW1wbENsYXNzTmFtZSA9IEdldFBhcmVudEltcGxDbGFzc05h bWUoJGRhdGFOb2RlKTsKICAgICBteSAkaW1wbENsYXNzTmFtZVdpdGhOYW1lc3BhY2UgPSAiV2Vi Q29yZTo6IiAuICRpbXBsQ2xhc3NOYW1lOworICAgIG15ICRjb25kaXRpb25hbCA9ICRkYXRhTm9k ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNvbmRpdGlvbmFsIn07CiAKICAgICBteSAkbnVtQXR0 cmlidXRlcyA9IEB7JGRhdGFOb2RlLT5hdHRyaWJ1dGVzfTsKICAgICBteSAkbnVtRnVuY3Rpb25z ID0gQHskZGF0YU5vZGUtPmZ1bmN0aW9uc307CkBAIC02NTQsNyArNjY5LDggQEAgc3ViIEdlbmVy YXRlSW1wbGVtZW50YXRpb24KICAgICBAaW1wbENvbnRlbnRIZWFkZXIgPSBzcGxpdCgiXHIiLCAk aW1wbGVtZW50YXRpb25MaWNlbmNlVGVtcGxhdGUpOwogCiAgICAgIyAtIElOQ0xVREVTIC0KLSAg ICBwdXNoKEBpbXBsQ29udGVudEhlYWRlciwgIlxuI2ltcG9ydCBcImNvbmZpZy5oXCJcbiIpOwor ICAgIHB1c2goQGltcGxDb250ZW50SGVhZGVyLCAiXG4jaW1wb3J0IFwiY29uZmlnLmhcIlxuXG4i KTsKKyAgICBwdXNoKEBpbXBsQ29udGVudEhlYWRlciwgIiNpZmRlZiAke2NvbmRpdGlvbmFsfV9T VVBQT1JUXG5cbiIpIGlmICRjb25kaXRpb25hbDsKIAogICAgIG15ICRjbGFzc0hlYWRlck5hbWUg PSBHZXRDbGFzc0hlYWRlck5hbWUoJGNsYXNzTmFtZSk7CiAgICAgcHVzaChAaW1wbENvbnRlbnRI ZWFkZXIsICIjaW1wb3J0IFwiJGNsYXNzSGVhZGVyTmFtZS5oXCJcblxuIik7CkBAIC0xMDgwLDYg KzEwOTYsOCBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAjIEVORCBXZWJD b3JlSW50ZXJuYWwgY2F0ZWdvcnkKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJcQGVuZFxu Iik7CiAgICAgfQorICAgICMgLSBFbmQgdGhlIGlmZGVmIGNvbmRpdGlvbmFsIGlmIG5lY2Vzc2Fy eQorICAgIHB1c2goQGltcGxDb250ZW50LCAiXG4jZW5kaWYgLy8gJHtjb25kaXRpb25hbH1fU1VQ UE9SVFxuXG4iKSBpZiAkY29uZGl0aW9uYWw7CiB9CiAKICMgSW50ZXJuYWwgaGVscGVyCg==