Title: [290973] branches/safari-613-branch/Source/WebKit
- Revision
- 290973
- Author
- [email protected]
- Date
- 2022-03-07 21:18:54 -0800 (Mon, 07 Mar 2022)
Log Message
Cherry-pick r290961. rdar://problem/89912760
[macCatalyst] Compilation error: WebContentProcess.xib: error: macOS xibs do not support target device type "ipad".
https://bugs.webkit.org/show_bug.cgi?id=237549
rdar://89912760
Patch by Richard Houle <[email protected]> on 2022-03-07
Reviewed by Alexey Proskuryakov.
Xcode for macOS 12.5 complains that we bundle Mac XIBs inside our macCatalyst builds.
* Configurations/BaseXPCService.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290961 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (290972 => 290973)
--- branches/safari-613-branch/Source/WebKit/ChangeLog 2022-03-08 03:27:30 UTC (rev 290972)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog 2022-03-08 05:18:54 UTC (rev 290973)
@@ -1,5 +1,34 @@
2022-03-07 Russell Epstein <[email protected]>
+ Cherry-pick r290961. rdar://problem/89912760
+
+ [macCatalyst] Compilation error: WebContentProcess.xib: error: macOS xibs do not support target device type "ipad".
+ https://bugs.webkit.org/show_bug.cgi?id=237549
+ rdar://89912760
+
+ Patch by Richard Houle <[email protected]> on 2022-03-07
+ Reviewed by Alexey Proskuryakov.
+
+ Xcode for macOS 12.5 complains that we bundle Mac XIBs inside our macCatalyst builds.
+
+ * Configurations/BaseXPCService.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@290961 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-07 Richard Houle <[email protected]>
+
+ [macCatalyst] Compilation error: WebContentProcess.xib: error: macOS xibs do not support target device type "ipad".
+ https://bugs.webkit.org/show_bug.cgi?id=237549
+ rdar://89912760
+
+ Reviewed by Alexey Proskuryakov.
+
+ Xcode for macOS 12.5 complains that we bundle Mac XIBs inside our macCatalyst builds.
+
+ * Configurations/BaseXPCService.xcconfig:
+
+2022-03-07 Russell Epstein <[email protected]>
+
Cherry-pick r285688. rdar://problem/85307256
[macOS] Add required methods to IOKit message filter
Modified: branches/safari-613-branch/Source/WebKit/Configurations/BaseXPCService.xcconfig (290972 => 290973)
--- branches/safari-613-branch/Source/WebKit/Configurations/BaseXPCService.xcconfig 2022-03-08 03:27:30 UTC (rev 290972)
+++ branches/safari-613-branch/Source/WebKit/Configurations/BaseXPCService.xcconfig 2022-03-08 05:18:54 UTC (rev 290973)
@@ -43,8 +43,9 @@
APP_ICON_Production = ;
EXCLUDED_SOURCE_FILE_NAMES[sdk=embedded*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib MediaFormatReader.bundle;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_PLATFORM_NAME));
EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
+EXCLUDED_SOURCE_FILE_NAMES_maccatalyst = *.xib;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
