233977 2021-12-07 22:21:03 -0800 [MacCatalyst] Fix build after r286603 2022-03-22 06:53:42 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=237113 InRadar P2 Normal --- 1 mmaxfield mmaxfield darin dino ews-watchlist kbr kkinnunen kondapallykalyan webkit-bug-importer oldest_to_newest 1821386 0 mmaxfield 2021-12-07 22:21:03 -0800 [MacCatalyst] Fix build after r286603 1821391 1 446300 mmaxfield 2021-12-07 22:24:44 -0800 Created attachment 446300 Patch 1821392 2 ews-watchlist 2021-12-07 22:25:30 -0800 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1821428 3 ews-feeder 2021-12-07 23:28:34 -0800 Committed r286645 (244958@main): <https://commits.webkit.org/244958@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446300. 1821429 4 webkit-bug-importer 2021-12-07 23:29:20 -0800 <rdar://problem/86194597> 1821586 5 446300 darin 2021-12-08 09:13:43 -0800 Comment on attachment 446300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446300&action=review > Source/ThirdParty/ANGLE/src/common/platform.h:135 > +# undef TARGET_OS_IOS How is it safe to do this? Don’t system headers depend on how these macros are set? Setting them the way ANGLE code expects could fix ANGLE, but then break the system headers? You said something about long-term fix, but doing it this way may work now, but seems like it could cause new problems at any time when Apple system headers are changed. 1821779 6 446300 mmaxfield 2021-12-08 14:36:32 -0800 Comment on attachment 446300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446300&action=review >> Source/ThirdParty/ANGLE/src/common/platform.h:135 >> +# undef TARGET_OS_IOS > > How is it safe to do this? Don’t system headers depend on how these macros are set? Setting them the way ANGLE code expects could fix ANGLE, but then break the system headers? > > You said something about long-term fix, but doing it this way may work now, but seems like it could cause new problems at any time when Apple system headers are changed. Yes, you’re absolutely right, and I’m working with Kyle to get this fixed properly as soon as we can. This patch is just to allow developers to continue developing rather than hitting a 100% repro build failure. 446300 2021-12-07 22:24:44 -0800 2021-12-07 23:28:37 -0800 Patch bug-233977-20211207222443.patch text/plain 1612 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggMDlmZGVlMTUzZmFiM2VjNzY5ZjMyMzU3NmI1ODAyYTgxYTk3YTNjMS4uMTcyN2IwZmNjYTI0 YTA2NWM5YjM0ZjdkMzIyNTA4NzE0ZDc2MzFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEyLTA3ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhm aWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY0NhdGFseXN0XSBGaXggYnVpbGQgYWZ0ZXIg cjI4NjYwMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjMzOTc3CisKKyAgICAgICAgVW5yZXZpZXdlZC4KKworICAgICAgICBQcmV2aW91c2x5LCBUQVJH RVRfT1NfSU9TIGFuZCBUQVJHRVRfT1NfTUFDQ0FUQUxZU1Qgd2VyZSBuZXZlciBvbiBhdCB0aGUg c2FtZSB0aW1lLgorICAgICAgICBOb3csIHRoZXkncmUgb24gYXQgdGhlIHNhbWUgdGltZSwgYW5k IEFOR0xFIGRvZXNuJ3QgZXhwZWN0IHRoYXQuIFRoaXMgcGF0Y2ggdHVybnMKKyAgICAgICAgb2Zm IFRBUkdFVF9PU19JT1Mgd2hlbiBUQVJHRVRfT1NfTUFDQ0FUQUxZU1QgaXMgb24sIGp1c3QgdG8g Z2V0IEFOR0xFIHRvIGJ1aWxkLgorICAgICAgICBUaGUgbG9uZy10ZXJtIGZpeCBpcyB0byBlaXRo ZXIgdXBkYXRlIGFsbCB0aGUgc2l0ZXMgdG8gdXNlIGNvcnJlY3QgbWFjcm9zLCBvciB0bworICAg ICAgICB1c2UgdGhlIEFOR0xFX1BMQVRGT1JNXyogZGVmaW5lcyBpbnN0ZWFkLgorCisgICAgICAg ICogc3JjL2NvbW1vbi9wbGF0Zm9ybS5oOgorCiAyMDIxLTEyLTA3ICBZdXN1a2UgU3V6dWtpICA8 eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgdGhlc2UgZmlsZXMgYXJl IG1vZGlmaWVkIGFmdGVyIGJ1aWxkaW5nIEFOR0xFCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvY29tbW9uL3BsYXRmb3JtLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvY29tbW9uL3BsYXRmb3JtLmgKaW5kZXggMWY0ZjI5NTA1OGRlMDk2YzZhNWUwNjA5OTNm MDhmYzM2ZDQzMTE0Zi4uZTBmMGEzMTU1MTdkYTcxOWNiYTc1OTI1NGRmYmUwMzZkYzRkNjZjZiAx MDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbW1vbi9wbGF0Zm9ybS5o CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21tb24vcGxhdGZvcm0uaApAQCAt MTMyLDYgKzEzMiw3IEBACiAjICAgICAgICBlbmRpZgogIyAgICAgICAgaWYgVEFSR0VUX09TX01B Q0NBVEFMWVNUCiAjICAgICAgICAgICAgZGVmaW5lIEFOR0xFX1BMQVRGT1JNX01BQ0NBVEFMWVNU IDEKKyMgICAgICAgICAgICB1bmRlZiBUQVJHRVRfT1NfSU9TCiAjICAgICAgICBlbmRpZgogIyAg ICBlbmRpZgogIyAgICAvLyBUaGlzIG1pZ2h0IGJlIHVzZWZ1bCBnbG9iYWxseS4gQXQgdGhlIG1v bWVudCBpdCBpcyB1c2VkCg==