Title: [185814] trunk/Source/WebKit2
- Revision
- 185814
- Author
- [email protected]
- Date
- 2015-06-21 16:44:07 -0700 (Sun, 21 Jun 2015)
Log Message
<rdar://problem/21444762> REGRESSION (r184215): Plug-in services crash on launch on Yosemite
https://bugs.webkit.org/show_bug.cgi?id=146195
Reviewed by Sam Weinig.
* Configurations/PluginService.32.xcconfig: Changed the Yosemite definition of
INFOPLIST_FILE such that it would also apply to the macosx10.10.internal SDK.
* Configurations/PluginService.64.xcconfig: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185813 => 185814)
--- trunk/Source/WebKit2/ChangeLog 2015-06-21 21:14:51 UTC (rev 185813)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-21 23:44:07 UTC (rev 185814)
@@ -1,5 +1,16 @@
2015-06-21 Dan Bernstein <[email protected]>
+ <rdar://problem/21444762> REGRESSION (r184215): Plug-in services crash on launch on Yosemite
+ https://bugs.webkit.org/show_bug.cgi?id=146195
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/PluginService.32.xcconfig: Changed the Yosemite definition of
+ INFOPLIST_FILE such that it would also apply to the macosx10.10.internal SDK.
+ * Configurations/PluginService.64.xcconfig: Ditto.
+
+2015-06-21 Dan Bernstein <[email protected]>
+
Build fix.
* Shared/API/Cocoa/WKFoundation.h: Don’t use generics if the SDK doesn’t support them.
Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (185813 => 185814)
--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-06-21 21:14:51 UTC (rev 185813)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-06-21 23:44:07 UTC (rev 185814)
@@ -32,7 +32,7 @@
PRODUCT_NAME = com.apple.WebKit.Plugin.32;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
+INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (185813 => 185814)
--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-06-21 21:14:51 UTC (rev 185813)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-06-21 23:44:07 UTC (rev 185814)
@@ -32,7 +32,7 @@
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
-INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
+INFOPLIST_FILE[sdk=macosx10.10*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
