<!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>[198122] releases/WebKitGTK/webkit-2.12</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/198122">198122</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-14 06:12:12 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198058">r198058</a> - [GTK][Mac] Don't force ENABLE_INTROSPECTION=OFF on Mac
https://bugs.webkit.org/show_bug.cgi?id=152650
Patch by Jeremy Huddleston Sequoia <jeremyhu@apple.com> on 2016-03-12
Reviewed by Carlos Garcia Campos.
* Source/cmake/OptionsGTK.cmake:
Source/WebKit2:
[GTK][Mac] Use DYLD_LIBRARY_PATH on OSX rather then LD_LIBRARY_PATH
https://bugs.webkit.org/show_bug.cgi?id=152650
Patch by Jeremy Huddleston Sequoia <jeremyhu@apple.com> on 2016-03-12
Reviewed by Carlos Garcia Campos.
* PlatformGTK.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212ChangeLog">releases/WebKitGTK/webkit-2.12/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2PlatformGTKcmake">releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.12/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/ChangeLog (198121 => 198122)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/ChangeLog 2016-03-14 13:09:44 UTC (rev 198121)
+++ releases/WebKitGTK/webkit-2.12/ChangeLog 2016-03-14 13:12:12 UTC (rev 198122)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-03-12 Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+ [GTK][Mac] Don't force ENABLE_INTROSPECTION=OFF on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=152650
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2016-03-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.11.91 release.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (198121 => 198122)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-14 13:09:44 UTC (rev 198121)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-14 13:12:12 UTC (rev 198122)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-03-12 Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+ [GTK][Mac] Use DYLD_LIBRARY_PATH on OSX rather then LD_LIBRARY_PATH
+ https://bugs.webkit.org/show_bug.cgi?id=152650
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2016-03-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Artifacts when using web view background color
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake (198121 => 198122)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake 2016-03-14 13:09:44 UTC (rev 198121)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/PlatformGTK.cmake 2016-03-14 13:12:12 UTC (rev 198122)
</span><span class="lines">@@ -887,15 +887,23 @@
</span><span class="cx"> add_webkit2_prefix_header(webkit2gtkinjectedbundle)
</span><span class="cx"> target_link_libraries(webkit2gtkinjectedbundle WebKit2)
</span><span class="cx">
</span><del>-# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
-string(COMPARE EQUAL "$ENV{LD_LIBRARY_PATH}" "" ld_library_path_not_exist)
</del><ins>+# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH or DYLD_LIBRARY_PATH
+if (APPLE)
+ set(LOADER_LIBRARY_PATH_VAR "DYLD_LIBRARY_PATH")
+ set(PREV_LOADER_LIBRARY_PATH "$ENV{DYLD_LIBRARY_PATH}")
+else ()
+ set(LOADER_LIBRARY_PATH_VAR "LD_LIBRARY_PATH")
+ set(PREV_LOADER_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
+endif ()
+
+string(COMPARE EQUAL "${PREV_LOADER_LIBRARY_PATH}" "" ld_library_path_not_exist)
</ins><span class="cx"> if (ld_library_path_does_not_exist)
</span><span class="cx"> set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
</span><span class="cx"> "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
</span><span class="cx"> )
</span><span class="cx"> else ()
</span><span class="cx"> set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
</span><del>- "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}"
</del><ins>+ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${PREV_LOADER_LIBRARY_PATH}"
</ins><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -908,7 +916,7 @@
</span><span class="cx"> DEPENDS WebKit2
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
</span><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
</span><del>- LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
</del><ins>+ ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
</ins><span class="cx"> ${INTROSPECTION_SCANNER}
</span><span class="cx"> --quiet
</span><span class="cx"> --warn-all
</span><span class="lines">@@ -950,7 +958,7 @@
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</span><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
</span><span class="cx"> LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
</span><del>- LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
</del><ins>+ ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
</ins><span class="cx"> ${INTROSPECTION_SCANNER}
</span><span class="cx"> --quiet
</span><span class="cx"> --warn-all
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/cmake/OptionsGTK.cmake (198121 => 198122)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/cmake/OptionsGTK.cmake 2016-03-14 13:09:44 UTC (rev 198121)
+++ releases/WebKitGTK/webkit-2.12/Source/cmake/OptionsGTK.cmake 2016-03-14 13:12:12 UTC (rev 198122)
</span><span class="lines">@@ -424,12 +424,17 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building or when building on Mac.
-if (CMAKE_CROSSCOMPILING OR APPLE)
</del><ins>+# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
+if (CMAKE_CROSSCOMPILING)
</ins><span class="cx"> set(ENABLE_GTKDOC OFF)
</span><span class="cx"> set(ENABLE_INTROSPECTION OFF)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+# Override the cached variable, gtk-doc does not really work when building on Mac.
+if (APPLE)
+ set(ENABLE_GTKDOC OFF)
+endif ()
+
</ins><span class="cx"> set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
</span><span class="cx"> set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
</span><span class="cx"> set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
</span></span></pre>
</div>
</div>
</body>
</html>