<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183363] tags/Safari-601.1.30/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183363">183363</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-04-26 13:36:09 -0700 (Sun, 26 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/183360">r183360</a>. rdar://problem/20702337</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari601130SourceWebKit2ChangeLog">tags/Safari-601.1.30/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari601130SourceWebKit2ConfigurationsPluginService32xcconfig">tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.32.xcconfig</a></li>
<li><a href="#tagsSafari601130SourceWebKit2ConfigurationsPluginService64xcconfig">tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.64.xcconfig</a></li>
<li><a href="#tagsSafari601130SourceWebKit2WebKit2xcodeprojprojectpbxproj">tags/Safari-601.1.30/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari601130SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.30/Source/WebKit2/ChangeLog (183362 => 183363)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-04-26 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r183360.
+
+ 2015-04-26 Dan Bernstein <mitz@apple.com>
+
+ <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).
+
</ins><span class="cx"> 2015-04-25 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 part of <rdar://problem/20697966> Avoid using TBD as an argument to NS_AVAILABLE
</span></span></pre></div>
<a id="tagsSafari601130SourceWebKit2ConfigurationsPluginService32xcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.32.xcconfig (183362 => 183363)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,9 +32,7 @@
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.32;
</span><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
</span><span class="cx">
</span><del>-FRAMEWORK_LDFLAGS = -framework Foundation -framework WebKit2;
-
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</del><ins>+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</span><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span></span></pre></div>
<a id="tagsSafari601130SourceWebKit2ConfigurationsPluginService64xcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.30/Source/WebKit2/Configurations/PluginService.64.xcconfig (183362 => 183363)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,9 +32,7 @@
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.64;
</span><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
</span><span class="cx">
</span><del>-FRAMEWORK_LDFLAGS = -framework Foundation -framework WebKit2;
-
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</del><ins>+OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</span><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span></span></pre></div>
<a id="tagsSafari601130SourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.30/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (183362 => 183363)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -762,6 +762,9 @@
</span><span class="cx"> 37183D57182F4E700080C811 /* WKNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 37183D55182F4E700080C811 /* WKNSURLExtras.h */; };
</span><span class="cx"> 371A19411824D29300F32A5E /* WKNSDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 371A193F1824D29300F32A5E /* WKNSDictionary.mm */; };
</span><span class="cx"> 371A19421824D29300F32A5E /* WKNSDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 371A19401824D29300F32A5E /* WKNSDictionary.h */; };
</span><ins>+ 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 */; };
</ins><span class="cx"> 372CAF0B1833FD910040AC27 /* WKNSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 372CAF091833FD910040AC27 /* WKNSError.h */; };
</span><span class="cx"> 372CAF0C1833FD910040AC27 /* WKNSError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 372CAF0A1833FD910040AC27 /* WKNSError.mm */; };
</span><span class="cx"> 373CEAD5185417AE008C363D /* WKNSData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373CEAD3185417AE008C363D /* WKNSData.mm */; };
</span><span class="lines">@@ -4193,6 +4196,8 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ 371E695A1AED7A5B00495E48 /* Foundation.framework in Frameworks */,
+ 371E695B1AED7A6700495E48 /* WebKit.framework in Frameworks */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -4200,6 +4205,7 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ 371E69591AED7A0F00495E48 /* Foundation.framework in Frameworks */,
</ins><span class="cx"> BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */,
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span></span></pre>
</div>
</div>
</body>
</html>