Title: [183363] tags/Safari-601.1.30/Source/WebKit2
- Revision
- 183363
- Author
- [email protected]
- Date
- 2015-04-26 13:36:09 -0700 (Sun, 26 Apr 2015)
Log Message
Merged r183360. rdar://problem/20702337
Modified Paths
Diff
Modified: tags/Safari-601.1.30/Source/WebKit2/ChangeLog (183362 => 183363)
--- tags/Safari-601.1.30/Source/WebKit2/ChangeLog 2015-04-26 20:22:27 UTC (rev 183362)
+++ tags/Safari-601.1.30/Source/WebKit2/ChangeLog 2015-04-26 20:36:09 UTC (rev 183363)
@@ -1,3 +1,25 @@
+2015-04-26 Babak Shafiei <[email protected]>
+
+ Merge r183360.
+
+ 2015-04-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/20702337> REGRESSION (r182952): Plug-in service fails to load because it links against WebKit2.framework
+ https://bugs.webkit.org/show_bug.cgi?id=144233
+
+ Reviewed by Simon Fraser.
+
+ Have the plug-in service link against WebKit.framework rather than WebKit2.framework.
+
+ * Configurations/PluginService.32.xcconfig: Removed linker flags for linking against WebKit2
+ and Foundation from the definition of OTHER_LDFLAGS. Since linking is no longer conditional,
+ we can just do it in the target’s Link Binary With Libraries build phase.
+
+ * Configurations/PluginService.64.xcconfig: Ditto.
+
+ * WebKit2.xcodeproj/project.pbxproj: Have Foundation and WebKit listed in the services’ Link
+ Binariy With Libraries build phases (one service already had WebKit).
+
2015-04-25 Dan Bernstein <[email protected]>
WebKit2 part of <rdar://problem/20697966> Avoid using TBD as an argument to NS_AVAILABLE
Modified: tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.32.xcconfig (183362 => 183363)
--- tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-04-26 20:22:27 UTC (rev 183362)
+++ tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-04-26 20:36:09 UTC (rev 183363)
@@ -32,9 +32,7 @@
PRODUCT_NAME = com.apple.WebKit.Plugin.32;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-FRAMEWORK_LDFLAGS = -framework Foundation -framework WebKit2;
-
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.64.xcconfig (183362 => 183363)
--- tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-04-26 20:22:27 UTC (rev 183362)
+++ tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-04-26 20:36:09 UTC (rev 183363)
@@ -32,9 +32,7 @@
PRODUCT_NAME = com.apple.WebKit.Plugin.64;
INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
-FRAMEWORK_LDFLAGS = -framework Foundation -framework WebKit2;
-
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: tags/Safari-601.1.30/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (183362 => 183363)
--- tags/Safari-601.1.30/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-26 20:22:27 UTC (rev 183362)
+++ tags/Safari-601.1.30/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-26 20:36:09 UTC (rev 183363)
@@ -762,6 +762,9 @@
37183D57182F4E700080C811 /* WKNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 37183D55182F4E700080C811 /* WKNSURLExtras.h */; };
371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 371A193F1824D29300F32A5E /* WKNSDictionary.mm */; };
371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 371A19401824D29300F32A5E /* WKNSDictionary.h */; };
+ 371E69591AED7A0F00495E48 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
+ 371E695A1AED7A5B00495E48 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
+ 371E695B1AED7A6700495E48 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
372CAF0B1833FD910040AC27 /* WKNSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 372CAF091833FD910040AC27 /* WKNSError.h */; };
372CAF0C1833FD910040AC27 /* WKNSError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 372CAF0A1833FD910040AC27 /* WKNSError.mm */; };
373CEAD5185417AE008C363D /* WKNSData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373CEAD3185417AE008C363D /* WKNSData.mm */; };
@@ -4193,6 +4196,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 371E695A1AED7A5B00495E48 /* Foundation.framework in Frameworks */,
+ 371E695B1AED7A6700495E48 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4200,6 +4205,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 371E69591AED7A0F00495E48 /* Foundation.framework in Frameworks */,
BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
