Commit 965167c
committed
[Build] Support public builds on the macOS 26 SDK
https://bugs.webkit.org/show_bug.cgi?id=294213
rdar://152747039
Reviewed by Abrar Rahman Protyasha.
Copy SDK additions from macOS Sequoia, and fix a couple build failures
in places where code is assuming an internal SDK.
Rename the directories containing SPI modules added in
https://commits.webkit.org/293940@main. Directory names need to match
the module name imported, so that the compiler enters the directory and
discovers the modulemap.
* Source/WebKit/Platform/cocoa/WKMaterialHostingSupport.swift:
* Source/WebKit/Platform/spi/Cocoa/Modules/WritingToolsUI_Private_SPI/WritingToolsUISPI.h: Renamed from Source/WebKit/Platform/spi/Cocoa/Modules/WritingToolsUI/WritingToolsUISPI.h.
* Source/WebKit/Platform/spi/Cocoa/Modules/WritingToolsUI_Private_SPI/module.modulemap: Renamed from Source/WebKit/Platform/spi/Cocoa/Modules/WritingToolsUI/module.modulemap.
* Source/WebKit/Platform/spi/Cocoa/Modules/WritingTools_SPI/WritingToolsSPI.h: Renamed from Source/WebKit/Platform/spi/Cocoa/Modules/WritingTools/WritingToolsSPI.h.
* Source/WebKit/Platform/spi/Cocoa/Modules/WritingTools_SPI/module.modulemap: Renamed from Source/WebKit/Platform/spi/Cocoa/Modules/WritingTools/module.modulemap.
* Source/WebKit/_WebKit_SwiftUI/Implementation/WebViewRepresentable.swift:
(WebPageWebView.configureScrollInputBehavior(_:for:)):
* WebKitLibraries/SDKs/macosx26.0-additions.sdk/SDKSettings.plist: Added.
* WebKitLibraries/SDKs/macosx26.0-additions.sdk/SymlinkedHeaders-output.xcfilelist: Added.
* WebKitLibraries/SDKs/macosx26.0-additions.sdk/SymlinkedHeaders.xcfilelist: Added.
* WebKitLibraries/SDKs/macosx26.0-additions.sdk/usr/local/include/AvailabilityProhibitedInternal.h: Added.
Canonical link: https://commits.webkit.org/296023@main1 parent 3c907c5 commit 965167c
10 files changed
Lines changed: 85 additions & 1 deletion
File tree
- Source/WebKit
- Platform
- cocoa
- spi/Cocoa/Modules
- WritingToolsUI_Private_SPI
- WritingTools_SPI
- _WebKit_SwiftUI/Implementation
- WebKitLibraries/SDKs/macosx26.0-additions.sdk
- usr/local/include
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
27 | 34 | | |
28 | 35 | | |
29 | 36 | | |
| |||
Lines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
Whitespace-only changes.
Whitespace-only changes.
Lines changed: 63 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
0 commit comments