126792 2014-01-10 16:29:29 -0800 Fix CharsetData.cpp build for iOS 2014-01-10 16:54:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 966676 0 simon.fraser 2014-01-10 16:29:29 -0800 Fix CharsetData.cpp build for iOS 966679 1 220905 simon.fraser 2014-01-10 16:31:17 -0800 Created attachment 220905 Patch 966684 2 220905 mrowe 2014-01-10 16:34:51 -0800 Comment on attachment 220905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220905&action=review r=me > Source/WebCore/DerivedSources.make:1194 > +ifeq ($(WTF_PLATFORM_IOS),1) > + > +CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/ios-encodings.txt > + perl $^ kTextEncoding > $@ > + > +else > + > CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/mac-encodings.txt > perl $^ kTextEncoding > $@ > > +endif # WTF_PLATFORM_IOS Can we avoid some of the duplication by pulling the path to the encodings file in to a variable instead? 966690 3 simon.fraser 2014-01-10 16:54:33 -0800 http://trac.webkit.org/changeset/161698 220905 2014-01-10 16:31:17 -0800 2014-01-10 16:34:51 -0800 Patch bug-126792-20140110163127.patch text/plain 4594 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVlNzBkYmYyOTIzZGFh Yzc4ZWY5YWQ1YzY1OThlNDhiZjk4MmU2OC4uY2YwZTYyNTU5ZmY1Nzk1ODRmZTkwMGFlZTE0N2Y2 ZjY4NDdiMjU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTAxLTEwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEZpeCBDaGFyc2V0 RGF0YS5jcHAgYnVpbGQgZm9yIGlPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI2NzkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hhcnNldERhdGEuY3BwIHNob3VsZCBoYXZlIGFuIGVtcHR5IENoYXJz ZXRUYWJsZSBsaXN0IGZvciBpT1MuCisgICAgICAgIEFjaGlldmUgdGhpcyB3aXRoIGFuIGlPUy1z cGVjaWZpYyBlbmNvZGluZ3MudHh0IGZpbGUuCisKKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy5t YWtlOgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAg ICAgKiBwbGF0Zm9ybS90ZXh0L21hYy9pb3MtZW5jb2RpbmdzLnR4dDogQWRkZWQuCisKKzIwMTQt MDEtMTAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAg Rml4IHRoZSBpT1MgYnVpbGQuCiAKICAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9tYWMvTWVkaWFT ZXNzaW9uTWFuYWdlck1hYy5jcHA6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9EZXJpdmVk U291cmNlcy5tYWtlIGIvU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMubWFrZQppbmRleCBi ZDg4YTdiNTZjMmRiYjVmYThmZGQ3NWY2NWU0ZWQ3YjY0NjgwNGIwLi5lNWQxMzQyOGMwMGY5YjQw ZTJlZmQxZjYxMGMwYWY1MjE0NzNiOGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9EZXJp dmVkU291cmNlcy5tYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UK QEAgLTExODEsOSArMTE4MSwxOCBAQCBhbGwgOiBDaGFyc2V0RGF0YS5jcHAKIAogIyBjaGFyYWN0 ZXIgc2V0IG5hbWUgdGFibGUKIAoraWZlcSAoJChXVEZfUExBVEZPUk1fSU9TKSwxKQorCitDaGFy c2V0RGF0YS5jcHAgOiBwbGF0Zm9ybS90ZXh0L21hYy9tYWtlLWNoYXJzZXQtdGFibGUucGwgcGxh dGZvcm0vdGV4dC9tYWMvY2hhcmFjdGVyLXNldHMudHh0IHBsYXRmb3JtL3RleHQvbWFjL2lvcy1l bmNvZGluZ3MudHh0CisJcGVybCAkXiBrVGV4dEVuY29kaW5nID4gJEAKKworZWxzZQorCiBDaGFy c2V0RGF0YS5jcHAgOiBwbGF0Zm9ybS90ZXh0L21hYy9tYWtlLWNoYXJzZXQtdGFibGUucGwgcGxh dGZvcm0vdGV4dC9tYWMvY2hhcmFjdGVyLXNldHMudHh0IHBsYXRmb3JtL3RleHQvbWFjL21hYy1l bmNvZGluZ3MudHh0CiAJcGVybCAkXiBrVGV4dEVuY29kaW5nID4gJEAKIAorZW5kaWYgIyBXVEZf UExBVEZPUk1fSU9TCisKICMgLS0tLS0tLS0KIAogaWZuZXEgKCQoQUNUSU9OKSxpbnN0YWxsaGRy cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agppbmRleCBmODI3ZTdmZGFlMTM2M2FjNjY1YmM5M2YwNjg3MDE4YjZlYzkxZWQ1Li41NTVjOTk3 NWJjMGM0ZDJhMWFiZmMwOTdiZTMyYjQ0NmQ0NjE4NjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC03MjE3LDYgKzcyMTcsNyBA QAogCQkwRjNGMEU1NzE1NzAzMEMzMDA2REE1N0YgLyogUmVuZGVyR2VvbWV0cnlNYXAuY3BwICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUmVuZGVyR2VvbWV0cnlNYXAuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjNGMEU1ODE1NzAzMEMzMDA2REE1N0Yg LyogUmVuZGVyR2VvbWV0cnlNYXAuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g UmVuZGVyR2VvbWV0cnlNYXAuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEY0RTU3 MTYxMzEzMjc2MjAwQ0Y4NUFGIC8qIFJlbmRlclNWR0FsbEluT25lLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlbmRlclNWR0FsbEluT25lLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMEY1NERDQ0MxODgwQzZBQjAwM0VFREJCIC8qIGlvcy1lbmNv ZGluZ3MudHh0ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBl ID0gdGV4dDsgcGF0aCA9ICJpb3MtZW5jb2RpbmdzLnR4dCI7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTBGNTYwMjhEMEU0Qjc2NTgwMDY1QjAzOCAvKiBSZW5kZXJNYXJxdWVlLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFJlbmRlck1hcnF1ZWUuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMEY1NjAyOEUwRTRCNzY1ODAwNjVCMDM4IC8qIFJlbmRlck1h cnF1ZWUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUmVuZGVyTWFy cXVlZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGNTgwQjA5MEYxMkEyNjkw MDUxRDY4OSAvKiBHcmFwaGljc0xheWVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IEdyYXBoaWNzTGF5ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtMjAwNDYsNiArMjAwNDcsNyBAQAogCQkJCUIyQzNEOUZBMEQwMDZDMUQwMEVGNkYyNiAvKiBD aGFyc2V0RGF0YS5oICovLAogCQkJCUY1OTczRERFMTVDRkIyMDMwMDI3RjgwNCAvKiBMb2NhbGVN YWMuaCAqLywKIAkJCQlGNTk3M0RERjE1Q0ZCMjAzMDAyN0Y4MDQgLyogTG9jYWxlTWFjLm1tICov LAorCQkJCTBGNTREQ0NDMTg4MEM2QUIwMDNFRURCQiAvKiBpb3MtZW5jb2RpbmdzLnR4dCAqLywK IAkJCQlCMkFGRkM4NjBEMDBBNURGMDAzMDA3NEQgLyogbWFjLWVuY29kaW5ncy50eHQgKi8sCiAJ CQkJQjJBRkZDODcwRDAwQTVERjAwMzAwNzREIC8qIG1ha2UtY2hhcnNldC10YWJsZS5wbCAqLywK IAkJCQlCMkFGRkM4QzBEMDBBNURGMDAzMDA3NEQgLyogVGV4dEJvdW5kYXJpZXMubW0gKi8sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9pb3MtZW5jb2Rpbmdz LnR4dCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL2lvcy1lbmNvZGluZ3MudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjA4MjRjOWIxZWE3ZWNhMjYxMzkzZTVkMzI0MGYxMDJkNTZiMWRkZDkKLS0t IC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9pb3MtZW5j b2RpbmdzLnR4dApAQCAtMCwwICsxLDExIEBACisjIFdlJ2QgbGlrZSB0byBlbGltaW5hdGUgdGhp cyBmaWxlLgorIyBJdCB3b3VsZCBiZSBuaWNlIHRvIGdldCByaWQgb2YgZGVwZW5kZW5jZSBvbiB0 aGUgVGV4dEVuY29kaW5nQ29udmVydCBlbnRpcmVseS4KKyMgUGVyaGFwcyB3ZSBjYW4gcHJvdmUg dGhlc2UgYXJlIG5vdCB1c2VkIG9uIHRoZSB3ZWIgYW5kIHJlbW92ZSB0aGVtLgorIyBPciBwZXJo YXBzIHdlIGNhbiBnZXQgdGhlbSBhZGRlZCB0byBJQ1UuCisKKyMgVGhlIGl0ZW1zIG9uIHRoZSBs ZWZ0IGFyZSBuYW1lcyBvZiBURUMgVGV4dEVuY29kaW5nIHZhbHVlcyAod2l0aG91dCB0aGUgbGVh ZGluZyBrVGV4dEVuY29kaW5nKS4KKyMgVGhlIGl0ZW1zIG9uIHRoZSByaWdodCBhcmUgSUFOQSBj aGFyYWN0ZXIgc2V0IG5hbWVzLiBOYW1lcyBsaXN0ZWQgaW4gY2hhcmFjdGVyLXNldHMudHh0IGFy ZSBub3QKKyMgcmVwZWF0ZWQgaGVyZTsgbWVudGlvbmluZyBhbnkgb25lIGNoYXJhY3RlciBzZXQg ZnJvbSBhIGdyb3VwIGluIHRoZXJlIHB1bGxzIGluIGFsbCB0aGUgYWxpYXNlcyBpbgorIyB0aGF0 IGdyb3VwLgorCisjIE5vIGVuY29kaW5ncyBmb3IgaU9TCg==