<!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>[177885] releases/WebKitGTK/webkit-2.4/Source/WebCore</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/177885">177885</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-05 00:12:55 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit-gtk 2.3.3 fails on darwin/quartz due to duplicate symbols in WebCore
https://bugs.webkit.org/show_bug.cgi?id=126821
Patch by Zan Dobersek <zdobersek@igalia.com> on 2015-01-05
Reviewed by Carlos Garcia Campos.
* GNUmakefile.list.am: Simplify the logic for determining build
targets that are specific to windowing targets. Avoid nested target
checks and list all the additional build targets for each windowing
target - X11, Wayland, X11 and Wayland (i.e. the build targets that
are shared between the two configurations), Win32 and Quartz. This
avoids the current problems of building duplicate build targets on
Quartz, and also cleans up the list.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreGNUmakefilelistam">releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (177884 => 177885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-01-05 05:11:05 UTC (rev 177884)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-01-05 08:12:55 UTC (rev 177885)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-05 Zan Dobersek <zdobersek@igalia.com>
+
+ webkit-gtk 2.3.3 fails on darwin/quartz due to duplicate symbols in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=126821
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.list.am: Simplify the logic for determining build
+ targets that are specific to windowing targets. Avoid nested target
+ checks and list all the additional build targets for each windowing
+ target - X11, Wayland, X11 and Wayland (i.e. the build targets that
+ are shared between the two configurations), Win32 and Quartz. This
+ avoids the current problems of building duplicate build targets on
+ Quartz, and also cleans up the list.
+
</ins><span class="cx"> 2014-10-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] TLS errors should take precedence over HTTP authentication
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am (177884 => 177885)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am 2015-01-05 05:11:05 UTC (rev 177884)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am 2015-01-05 08:12:55 UTC (rev 177885)
</span><span class="lines">@@ -6251,11 +6251,13 @@
</span><span class="cx"> Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
</span><span class="cx"> Source/WebCore/platform/graphics/glx/GLContextGLX.h
</span><span class="cx"> endif # END USE_GLX
</span><del>-else
</del><ins>+endif # END TARGET_X11
+
+if TARGET_WAYLAND
</ins><span class="cx"> webcore_sources += \
</span><span class="cx"> Source/WebCore/plugins/PluginPackageNone.cpp \
</span><span class="cx"> Source/WebCore/plugins/PluginViewNone.cpp
</span><del>-endif # END TARGET_X11
</del><ins>+endif # END TARGET_WAYLAND
</ins><span class="cx">
</span><span class="cx"> if TARGET_X11_OR_WAYLAND
</span><span class="cx"> platformgtk_sources += \
</span><span class="lines">@@ -6273,7 +6275,8 @@
</span><span class="cx"> Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
</span><span class="cx"> Source/WebCore/platform/graphics/egl/GLContextEGL.h
</span><span class="cx"> endif # END USE_EGL
</span><del>-else
</del><ins>+endif # END TARGET_X11_OR_WAYLAND
+
</ins><span class="cx"> if TARGET_WIN32
</span><span class="cx"> webcore_sources += \
</span><span class="cx"> Source/WebCore/platform/graphics/win/DIBPixelData.cpp \
</span><span class="lines">@@ -6299,12 +6302,13 @@
</span><span class="cx"> Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
</span><span class="cx"> Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
</span><span class="cx"> Source/WebCore/plugins/win/PluginViewWin.cpp
</span><del>-else
</del><ins>+endif # END TARGET_WIN32
+
+if TARGET_QUARTZ
</ins><span class="cx"> webcore_sources += \
</span><span class="cx"> Source/WebCore/plugins/PluginPackageNone.cpp \
</span><span class="cx"> Source/WebCore/plugins/PluginViewNone.cpp
</span><del>-endif # END TARGET_WIN32
-endif # END TARGET_X11_OR_WAYLAND
</del><ins>+endif # END TARGET_QUARTZ
</ins><span class="cx">
</span><span class="cx"> if USE_GLES2
</span><span class="cx"> webcore_sources += \
</span></span></pre>
</div>
</div>
</body>
</html>