66770 2011-08-23 06:06:04 -0700 [Qt] Build fails on Lion 2011-08-25 12:26:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vestbo vestbo ademar menard webkit.review.bot oldest_to_newest 455359 0 vestbo 2011-08-23 06:06:04 -0700 [Qt] Build fails on Lion 455361 1 104833 vestbo 2011-08-23 06:12:41 -0700 Created attachment 104833 Patch 455362 2 webkit.review.bot 2011-08-23 06:14:58 -0700 Attachment 104833 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:20: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 455366 3 vestbo 2011-08-23 06:18:28 -0700 (In reply to comment #2) > Source/WebCore/ChangeLog:20: Line contains tab character. [whitespace/tab] [5] > Total errors found: 1 in 5 files Gah, I'll fix before landing. 455369 4 104833 benjamin 2011-08-23 06:22:59 -0700 Comment on attachment 104833 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104833&action=review > w/Source/WebKit/qt/ChangeLog:17 > + We were mistakenly picking up mac/WebCoreSystemInterface.h instead of > + the Qt one, and building on Lion revealed this when a typedef for > + IOSurfaceRef was wrapped in PLATFORM(MAC). > + > + For now we fix this by including WebCoreSystemInterface using > + brackets, so that we'll pick up the right file based on the > + include paths. This also means exposing a few missing enums > + in our own version of the file, so those were added. > + Not relevant for this particular Changelog 455370 5 104833 kling 2011-08-23 06:23:59 -0700 Comment on attachment 104833 Patch rs=me 455371 6 vestbo 2011-08-23 06:27:29 -0700 Landed in r93600 455384 7 menard 2011-08-23 06:44:22 -0700 Good job 457059 8 ademar 2011-08-25 12:26:38 -0700 Revision r93600 cherry-picked into qtwebkit-2.2 with commit f011bd5 <http://gitorious.org/webkit/qtwebkit/commit/f011bd5> 104833 2011-08-23 06:12:41 -0700 2011-08-23 06:23:59 -0700 Patch bug-66770-20110823151239.patch text/plain 5163 vestbo U3VidmVyc2lvbiBSZXZpc2lvbjogOTM1ODkKZGlmZiAtLWdpdCBjL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyB3L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzNjllY2E4ZGE1ZmIxZWE1 ZDBmNmY3MWYwYjJjOGRiZjgzYmVhODJlLi5jODViMjUxMDk4OGU3MzRhM2VjYzNkOWUxM2VlMTFh MmZhNTU3YWQzIDEwMDY0NAotLS0gYy9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIHcvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDgtMjMgIFRvciBB cm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgorCisgICAgICAgIFtRdF0g QnVpbGQgZmFpbHMgb24gTGlvbgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02Njc3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlIHdlcmUgbWlzdGFrZW5seSBwaWNraW5nIHVwIG1hYy9XZWJDb3JlU3lz dGVtSW50ZXJmYWNlLmggaW5zdGVhZCBvZgorICAgICAgICB0aGUgUXQgb25lLCBhbmQgYnVpbGRp bmcgb24gTGlvbiByZXZlYWxlZCB0aGlzIHdoZW4gYSB0eXBlZGVmIGZvcgorICAgICAgICBJT1N1 cmZhY2VSZWYgd2FzIHdyYXBwZWQgaW4gUExBVEZPUk0oTUFDKS4KKworICAgICAgICBGb3Igbm93 IHdlIGZpeCB0aGlzIGJ5IGluY2x1ZGluZyBXZWJDb3JlU3lzdGVtSW50ZXJmYWNlIHVzaW5nCisg ICAgICAgIGJyYWNrZXRzLCBzbyB0aGF0IHdlJ2xsIHBpY2sgdXAgdGhlIHJpZ2h0IGZpbGUgYmFz ZWQgb24gdGhlCisgICAgICAgIGluY2x1ZGUgcGF0aHMuIFRoaXMgYWxzbyBtZWFucyBleHBvc2lu ZyBhIGZldyBtaXNzaW5nIGVudW1zCisgICAgICAgIGluIG91ciBvd24gdmVyc2lvbiBvZiB0aGUg ZmlsZSwgc28gdGhvc2Ugd2VyZSBhZGRlZC4KKworICAgICAgICBMYXN0eSwgd2UgbmVlZCB0byBs aW5rIGFnYWluc3QgdGhlIHJpZ2h0IHN5c3RlbSBpbnRlcmZhY2UgbGlicmFyeQorICAgICAgICBv biBMaW9uLgorCQorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5IVURX aW5kb3dDb250cm9sbGVyLm1tOgorICAgICAgICAqIHBsYXRmb3JtL3F0L1dlYkNvcmVTeXN0ZW1J bnRlcmZhY2UuaDoKKwogMjAxMS0wOC0yMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJlbW92ZSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQKZGlmZiAtLWdpdCBj L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5IVURXaW5kb3dD b250cm9sbGVyLm1tIHcvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNj cmVlbkhVRFdpbmRvd0NvbnRyb2xsZXIubW0KaW5kZXggNDFkMjRmMWU1MTRkNmE3OTQ0OWNmMzIw NmU3NDdjZWEyMjcyZGM4ZC4uNjMxODI4YWNjOWIwODU4OTM3ZDQxNGJkOTU2ZjYwZDE5NDE2NTg3 MiAxMDA2NDQKLS0tIGMvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNj cmVlbkhVRFdpbmRvd0NvbnRyb2xsZXIubW0KKysrIHcvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1dlYlZpZGVvRnVsbHNjcmVlbkhVRFdpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTI5LDcgKzI5 LDcgQEAKICNpbXBvcnQgIldlYlZpZGVvRnVsbHNjcmVlbkhVRFdpbmRvd0NvbnRyb2xsZXIuaCIK IAogI2ltcG9ydCAiRmxvYXRDb252ZXJzaW9uLmgiCi0jaW1wb3J0ICJXZWJDb3JlU3lzdGVtSW50 ZXJmYWNlLmgiCisjaW1wb3J0IDxXZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL0hUTUxNZWRpYUVsZW1lbnQuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KICNp bXBvcnQgPHd0Zi9VbnVzZWRQYXJhbS5oPgpkaWZmIC0tZ2l0IGMvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vcXQvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIHcvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vcXQvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oCmluZGV4IDQwY2I0NDk2MTQ2MGExYWIzM2Q1 ZDA1ZjI5MmQ3YWJkZGM1OTBkYzIuLmU4MmE2ZmM4YTI1NzQ4ZmZiNjYzNTEwODkyYzM2Zjg5ODU1 MjZlYWQgMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L1dlYkNvcmVTeXN0 ZW1JbnRlcmZhY2UuaAorKysgdy9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9XZWJDb3JlU3lz dGVtSW50ZXJmYWNlLmgKQEAgLTc5LDYgKzc5LDE3IEBAIGV4dGVybiB2b2lkICgqd2tRVENsZWFy TWVkaWFEb3dubG9hZENhY2hlKSgpOwogZXh0ZXJuIHZvaWQgKCp3a1dpbmRvd1NldEFscGhhKShO U1dpbmRvdyAqLCBmbG9hdCk7CiBleHRlcm4gdm9pZCAoKndrV2luZG93U2V0U2NhbGVkRnJhbWUp KE5TV2luZG93ICosIE5TUmVjdCwgTlNSZWN0KTsKIAordHlwZWRlZiBlbnVtIHsKKyAgICB3a01l ZGlhVUlDb250cm9sVGltZWxpbmUsCisgICAgd2tNZWRpYVVJQ29udHJvbFNsaWRlciwKKyAgICB3 a01lZGlhVUlDb250cm9sUGxheVBhdXNlQnV0dG9uLAorICAgIHdrTWVkaWFVSUNvbnRyb2xFeGl0 RnVsbHNjcmVlbkJ1dHRvbiwKKyAgICB3a01lZGlhVUlDb250cm9sUmV3aW5kQnV0dG9uLAorICAg IHdrTWVkaWFVSUNvbnRyb2xGYXN0Rm9yd2FyZEJ1dHRvbiwKKyAgICB3a01lZGlhVUlDb250cm9s Vm9sdW1lVXBCdXR0b24sCisgICAgd2tNZWRpYVVJQ29udHJvbFZvbHVtZURvd25CdXR0b24KK30g d2tNZWRpYVVJQ29udHJvbFR5cGU7CisKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYy9Tb3VyY2Uv V2ViS2l0L3F0L0NoYW5nZUxvZyB3L1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDE3 ZDNhNzNmYzM3ZTE4MTQzMGRkNDU2NjQwOWI0NjI1NGIzNzFhZGUuLmNiMDA4ZDI1M2VlM2U1MDZi ZTQ1ZTM5M2EwZThhODJkYjM3N2YxOWEgMTAwNjQ0Ci0tLSBjL1NvdXJjZS9XZWJLaXQvcXQvQ2hh bmdlTG9nCisrKyB3L1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAK KzIwMTEtMDgtMjMgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29t PgorCisgICAgICAgIFtRdF0gQnVpbGQgZmFpbHMgb24gTGlvbgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Njc3MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHdlcmUgbWlzdGFrZW5seSBwaWNraW5n IHVwIG1hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmggaW5zdGVhZCBvZgorICAgICAgICB0aGUg UXQgb25lLCBhbmQgYnVpbGRpbmcgb24gTGlvbiByZXZlYWxlZCB0aGlzIHdoZW4gYSB0eXBlZGVm IGZvcgorICAgICAgICBJT1N1cmZhY2VSZWYgd2FzIHdyYXBwZWQgaW4gUExBVEZPUk0oTUFDKS4K KworICAgICAgICBGb3Igbm93IHdlIGZpeCB0aGlzIGJ5IGluY2x1ZGluZyBXZWJDb3JlU3lzdGVt SW50ZXJmYWNlIHVzaW5nCisgICAgICAgIGJyYWNrZXRzLCBzbyB0aGF0IHdlJ2xsIHBpY2sgdXAg dGhlIHJpZ2h0IGZpbGUgYmFzZWQgb24gdGhlCisgICAgICAgIGluY2x1ZGUgcGF0aHMuIFRoaXMg YWxzbyBtZWFucyBleHBvc2luZyBhIGZldyBtaXNzaW5nIGVudW1zCisgICAgICAgIGluIG91ciBv d24gdmVyc2lvbiBvZiB0aGUgZmlsZSwgc28gdGhvc2Ugd2VyZSBhZGRlZC4KKworICAgICAgICBM YXN0eSwgd2UgbmVlZCB0byBsaW5rIGFnYWluc3QgdGhlIHJpZ2h0IHN5c3RlbSBpbnRlcmZhY2Ug bGlicmFyeQorICAgICAgICBvbiBMaW9uLgorCisgICAgICAgICogUXRXZWJLaXQucHJvOgorCiAy MDExLTA4LTIxICBMaW5kc2F5IE1hdGhpZXNvbiAgPGxpbmRzYXkubWF0aGllc29uQGdtYWlsLmNv bT4KIAogICAgICAgICBbUXRdIEZpeGVzIHByZW1hdHVyZSBwbHVnaW4gdW5sb2FkIGJ1ZwpkaWZm IC0tZ2l0IGMvU291cmNlL1dlYktpdC9xdC9RdFdlYktpdC5wcm8gdy9Tb3VyY2UvV2ViS2l0L3F0 L1F0V2ViS2l0LnBybwppbmRleCAxOWI1NTE5OTA1N2ZhNmYzNDA3ZTRiM2EzNDdkZmU2ZGZkMTU4 NmZjLi4yYzA1OGE1NjNlOGY2NzFiZmMyYTZiMzM2YTE0ZDQ1ZTkwMmI1NGFmIDEwMDY0NAotLS0g Yy9Tb3VyY2UvV2ViS2l0L3F0L1F0V2ViS2l0LnBybworKysgdy9Tb3VyY2UvV2ViS2l0L3F0L1F0 V2ViS2l0LnBybwpAQCAtMjU2LDEyICsyNTYsMTIgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxF X1ZJREVPPTEpIHsKICAgICAgICAgIyBXZSBjYW4ga25vdyB0aGUgTWFjIE9TIHZlcnNpb24gYnkg dXNpbmcgdGhlIERhcndpbiBtYWpvciB2ZXJzaW9uCiAgICAgICAgIERBUldJTl9WRVJTSU9OID0g JCRzcGxpdChRTUFLRV9IT1NULnZlcnNpb24sICIuIikKICAgICAgICAgREFSV0lOX01BSk9SX1ZF UlNJT04gPSAkJGZpcnN0KERBUldJTl9WRVJTSU9OKQotICAgICAgICBlcXVhbHMoREFSV0lOX01B Sk9SX1ZFUlNJT04sICIxMCIpIHsKLSAgICAgICAgICAgIExJQlMrPSAkJFNPVVJDRV9ESVIvLi4v V2ViS2l0TGlicmFyaWVzL2xpYldlYktpdFN5c3RlbUludGVyZmFjZVNub3dMZW9wYXJkLmEKLSAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGVxdWFscyhEQVJXSU5fTUFKT1JfVkVSU0lPTiwg IjkiKSB7Ci0gICAgICAgICAgICAgICAgTElCUys9ICQkU09VUkNFX0RJUi8uLi9XZWJLaXRMaWJy YXJpZXMvbGliV2ViS2l0U3lzdGVtSW50ZXJmYWNlTGVvcGFyZC5hCi0gICAgICAgICAgICB9Cisg ICAgICAgIGVxdWFscyhEQVJXSU5fTUFKT1JfVkVSU0lPTiwgIjExIikgeworICAgICAgICAgICAg TElCUyArPSAkJFNPVVJDRV9ESVIvLi4vV2ViS2l0TGlicmFyaWVzL2xpYldlYktpdFN5c3RlbUlu dGVyZmFjZUxpb24uYQorICAgICAgICB9IGVsc2U6ZXF1YWxzKERBUldJTl9NQUpPUl9WRVJTSU9O LCAiMTAiKSB7CisgICAgICAgICAgICBMSUJTICs9ICQkU09VUkNFX0RJUi8uLi9XZWJLaXRMaWJy YXJpZXMvbGliV2ViS2l0U3lzdGVtSW50ZXJmYWNlU25vd0xlb3BhcmQuYQorICAgICAgICB9IGVs c2U6ZXF1YWxzKERBUldJTl9NQUpPUl9WRVJTSU9OLCAiOSIpIHsKKyAgICAgICAgICAgIExJQlMg Kz0gJCRTT1VSQ0VfRElSLy4uL1dlYktpdExpYnJhcmllcy9saWJXZWJLaXRTeXN0ZW1JbnRlcmZh Y2VMZW9wYXJkLmEKICAgICAgICAgfQogICAgIH0KIH0K