<!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>[201398] trunk/Source</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/201398">201398</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-05-25 12:49:46 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix CMake build.
* PlatformMac.cmake:
Source/WebCore:
c++14 is needed since <a href="http://trac.webkit.org/projects/webkit/changeset/201255">r201255</a>.
ColorSync (in ApplicationServices) is needed since <a href="http://trac.webkit.org/projects/webkit/changeset/201065">r201065</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201397 => 201398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 19:49:46 UTC (rev 201398)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2016-05-25 Alex Christensen <achristensen@webkit.org>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+ c++14 is needed since r201255.
+ ColorSync (in ApplicationServices) is needed since r201065.
+
</ins><span class="cx"> 2016-05-25 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Swap search field's cancel and result button for RTL content.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (201397 => 201398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-05-25 19:49:46 UTC (rev 201398)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> link_directories(../../WebKitLibraries)
</span><span class="cx">
</span><span class="cx"> find_library(ACCELERATE_LIBRARY accelerate)
</span><ins>+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
</ins><span class="cx"> find_library(AVFOUNDATION_LIBRARY AVFoundation)
</span><span class="cx"> find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
</span><span class="cx"> find_library(AUDIOUNIT_LIBRARY AudioUnit)
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx">
</span><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
</span><span class="cx"> add_definitions(-iframework ${AVFOUNDATION_LIBRARY}/Versions/Current/Frameworks)
</span><ins>+add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
</ins><span class="cx">
</span><span class="cx"> find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
</span><span class="cx"> if (NOT DATADETECTORSCORE_FRAMEWORK-NOTFOUND)
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (201397 => 201398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit/ChangeLog 2016-05-25 19:49:46 UTC (rev 201398)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2016-05-25 Alex Christensen <achristensen@webkit.org>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-05-18 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (201397 => 201398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-05-25 19:49:46 UTC (rev 201398)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><ins>+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
</ins><span class="cx"> find_library(QUARTZ_LIBRARY Quartz)
</span><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
</span><ins>+add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
</ins><span class="cx"> link_directories(../../WebKitLibraries)
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><span class="lines">@@ -313,7 +315,7 @@
</span><span class="cx"> foreach (_file ${WebKit_SOURCES})
</span><span class="cx"> list(FIND C99_FILES ${_file} _c99_index)
</span><span class="cx"> if (${_c99_index} EQUAL -1)
</span><del>- set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++11")
</del><ins>+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++14")
</ins><span class="cx"> else ()
</span><span class="cx"> set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201397 => 201398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-25 19:49:46 UTC (rev 201398)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2016-05-25 Alex Christensen <achristensen@webkit.org>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2016-05-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify a few lambda captures in the network cache code
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (201397 => 201398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-05-25 19:49:46 UTC (rev 201398)
</span><span class="lines">@@ -1,17 +1,18 @@
</span><del>-add_definitions("-ObjC++ -std=c++11")
</del><ins>+add_definitions("-ObjC++ -std=c++14")
</ins><span class="cx"> link_directories(../../WebKitLibraries)
</span><del>-find_library(APPLICATION_SERVICES_LIBRARY ApplicationServices)
</del><ins>+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
</ins><span class="cx"> find_library(CARBON_LIBRARY Carbon)
</span><span class="cx"> find_library(QUARTZ_LIBRARY Quartz)
</span><span class="cx"> find_library(AVFOUNDATION_LIBRARY AVFoundation)
</span><span class="cx"> find_library(AVFAUDIO_LIBRARY AVFAudio HINTS ${AVFOUNDATION_LIBRARY}/Versions/*/Frameworks)
</span><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
</span><span class="cx"> add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
</span><ins>+add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
</ins><span class="cx"> add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development")
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_LIBRARIES
</span><span class="cx"> PRIVATE WebKit
</span><del>- ${APPLICATION_SERVICES_LIBRARY}
</del><ins>+ ${APPLICATIONSERVICES_LIBRARY}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (NOT AVFAUDIO_LIBRARY-NOTFOUND)
</span></span></pre>
</div>
</div>
</body>
</html>