Title: [185831] tags/Safari-601.1.35.2.3/Source/WebKit2
- Revision
- 185831
- Author
- [email protected]
- Date
- 2015-06-22 09:35:33 -0700 (Mon, 22 Jun 2015)
Log Message
Merged r185814. rdar://problem/21444762
Modified Paths
Diff
Modified: tags/Safari-601.1.35.2.3/Source/WebKit2/ChangeLog (185830 => 185831)
--- tags/Safari-601.1.35.2.3/Source/WebKit2/ChangeLog 2015-06-22 16:34:05 UTC (rev 185830)
+++ tags/Safari-601.1.35.2.3/Source/WebKit2/ChangeLog 2015-06-22 16:35:33 UTC (rev 185831)
@@ -1,3 +1,18 @@
+2015-06-22 Babak Shafiei <[email protected]>
+
+ Merge r185814.
+
+ 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-16 Babak Shafiei <[email protected]>
Merge r185599.
Modified: tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.32.xcconfig (185830 => 185831)
--- tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-06-22 16:34:05 UTC (rev 185830)
+++ tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-06-22 16:35:33 UTC (rev 185831)
@@ -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: tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.64.xcconfig (185830 => 185831)
--- tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-06-22 16:34:05 UTC (rev 185830)
+++ tags/Safari-601.1.35.2.3/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-06-22 16:35:33 UTC (rev 185831)
@@ -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
