Bug 240175

Summary: WebKit has a broken module in Mac Catalyst
Product: WebKit Reporter: Ian Anderson <iana>
Component: PlatformAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: ap, bfulgham, ddkilzer, iana, james.savage, jbedard, mitz, thorton, webkit-bug-importer, wenson_hsieh
Priority: P2 Keywords: InRadar
Version: WebKit Nightly Build   
Hardware: Unspecified   
OS: macOS 12   
Attachments:
Description Flags
Patch
none
Patch none

Ian Anderson
Reported 2022-05-06 10:54:18 PDT
WebKit has a broken module in Mac Catalyst
Attachments
Patch (5.05 KB, patch)
2022-05-06 10:57 PDT, Ian Anderson 		no flags
DetailsFormatted DiffDiff
Patch (5.07 KB, patch)
2022-05-06 13:05 PDT, Ian Anderson 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Ian Anderson
Comment 1 2022-05-06 10:57:38 PDT
Created attachment 458964 [details] Patch
Alexey Proskuryakov
Comment 2 2022-05-06 12:04:52 PDT
Comment on attachment 458964 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=458964&action=review > Source/WebKit/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=240175 Is there a radar for this already? Please post the link (no title) to the bug, and also add it to ChangeLog if so. I'll leave reviewing the actual change to experts.
Tim Horton
Comment 3 2022-05-06 12:23:31 PDT
Comment on attachment 458964 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=458964&action=review > Source/WebKit/Configurations/WebKit.xcconfig:35 > +MODULEMAP_FILE = $(MODULEMAP_FILE_$(WK_COCOA_TOUCH)_$(WK_IS_CATALYST)); > +MODULEMAP_FILE_cocoatouch_NO = Modules/iOS.modulemap; > +MODULEMAP_FILE_cocoatouch_YES = Modules/MacCatalyst.modulemap; > +MODULEMAP_FILE__NO = Modules/OSX.modulemap; This is fine, though I think usually when we want to make this distinction we fall back to WK_PLATFORM_NAME instead (but, I admit, that would involve a lot more duplication).
Ian Anderson
Comment 4 2022-05-06 13:05:26 PDT
Created attachment 458970 [details] Patch
Alexey Proskuryakov
Comment 5 2022-05-06 13:06:31 PDT
rdar://92703419
Ian Anderson
Comment 6 2022-05-06 13:07:07 PDT
(In reply to Alexey Proskuryakov from comment #2) > Is there a radar for this already? Please post the link (no title) to the > bug, and also add it to ChangeLog if so. Yep, I was wondering how to associate the two! It's rdar://92703419 and I added it to the change log as well.
Ian Anderson
Comment 7 2022-05-06 13:10:21 PDT
(In reply to Tim Horton from comment #3) > Comment on attachment 458964 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=458964&action=review > > > Source/WebKit/Configurations/WebKit.xcconfig:35 > > +MODULEMAP_FILE = $(MODULEMAP_FILE_$(WK_COCOA_TOUCH)_$(WK_IS_CATALYST)); > > +MODULEMAP_FILE_cocoatouch_NO = Modules/iOS.modulemap; > > +MODULEMAP_FILE_cocoatouch_YES = Modules/MacCatalyst.modulemap; > > +MODULEMAP_FILE__NO = Modules/OSX.modulemap; > > This is fine, though I think usually when we want to make this distinction > we fall back to WK_PLATFORM_NAME instead (but, I admit, that would involve a > lot more duplication). Yeah, I couldn't decide which way was less gross. Let me know if you change your mind.
EWS
Comment 8 2022-05-09 12:11:57 PDT
Committed r293984 (250421@main): <https://commits.webkit.org/250421@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458970 [details].
Note You need to log in before you can comment on or make changes to this bug.