<!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>[168720] releases/WebKitGTK/webkit-2.4/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/168720">168720</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2014-05-13 12:31:42 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 165378 - [GTK] [CMake] Clean up library linking
https://bugs.webkit.org/show_bug.cgi?id=129782
Reviewed by Philippe Normand.
.:
* Source/cmake/OptionsGTK.cmake: Add a macro to wrap all libraries in a list with --whole-archive
so that unused symbols are not dropped. This is useful when building up shared libraries
from convenience libraries.
Source/WebCore:
* PlatformGTK.cmake: Some files are duplicated on the source list of two convenience
libraries. Ensure that they are all compiled into WebCore instead of WebCorePlatformGTK.
Some simply need to be moved to WebCore from WebCorePlatformGTK. Don't try to link
WebCorePlatformGTK against WebCore -- convenience libraries should be able to save
their symbol resolution for the final linking step.
Source/WebKit:
* PlatformGTK.cmake: Use the new macro.
Source/WebKit2:
* PlatformGTK.cmake: Use the new macro.
Conflicts:
ChangeLog
Source/WebCore/ChangeLog
Source/WebKit/ChangeLog
Source/WebKit2/ChangeLog</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorePlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitPlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2PlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (168719 => 168720)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake 2014-05-13 19:31:22 UTC (rev 168719)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake 2014-05-13 19:31:42 UTC (rev 168720)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
</span><span class="cx">
</span><span class="cx"> platform/network/soup/AuthenticationChallengeSoup.cpp
</span><ins>+ platform/network/soup/CertificateInfo.cpp
</ins><span class="cx"> platform/network/soup/CookieJarSoup.cpp
</span><span class="cx"> platform/network/soup/CookieStorageSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span><span class="lines">@@ -138,6 +139,10 @@
</span><span class="cx"> platform/text/TextEncodingDetectorICU.cpp
</span><span class="cx">
</span><span class="cx"> platform/text/enchant/TextCheckerEnchant.cpp
</span><ins>+
+ platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
+
+ platform/network/gtk/CredentialBackingStore.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCorePlatformGTK_SOURCES
</span><span class="lines">@@ -236,37 +241,6 @@
</span><span class="cx"> platform/gtk/WidgetBackingStoreGtkX11.cpp
</span><span class="cx"> platform/gtk/WidgetGtk.cpp
</span><span class="cx"> platform/gtk/WidgetRenderingContext.cpp
</span><del>-
- platform/network/gtk/CredentialBackingStore.cpp
-
- platform/network/soup/AuthenticationChallengeSoup.cpp
- platform/network/soup/CertificateInfo.cpp
- platform/network/soup/CookieJarSoup.cpp
- platform/network/soup/CookieStorageSoup.cpp
- platform/network/soup/CredentialStorageSoup.cpp
- platform/network/soup/DNSSoup.cpp
- platform/network/soup/NetworkStorageSessionSoup.cpp
- platform/network/soup/ProxyResolverSoup.cpp
- platform/network/soup/ProxyServerSoup.cpp
- platform/network/soup/ResourceErrorSoup.cpp
- platform/network/soup/ResourceHandleSoup.cpp
- platform/network/soup/ResourceRequestSoup.cpp
- platform/network/soup/ResourceResponseSoup.cpp
- platform/network/soup/SocketStreamHandleSoup.cpp
- platform/network/soup/SynchronousLoaderClientSoup.cpp
-
- platform/soup/SharedBufferSoup.cpp
-
- platform/text/icu/UTextProvider.cpp
- platform/text/icu/UTextProviderLatin1.cpp
- platform/text/icu/UTextProviderUTF16.cpp
- platform/text/LocaleICU.cpp
- platform/text/TextCodecICU.cpp
- platform/text/TextEncodingDetectorICU.cpp
-
- platform/text/enchant/TextCheckerEnchant.cpp
-
- platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (WTF_USE_GEOCLUE2)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake (168719 => 168720)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake 2014-05-13 19:31:22 UTC (rev 168719)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/PlatformGTK.cmake 2014-05-13 19:31:42 UTC (rev 168720)
</span><span class="lines">@@ -135,9 +135,10 @@
</span><span class="cx"> # Since the GObjectDOMBindings convenience library exports API that is unused except
</span><span class="cx"> # in embedding applications we need to instruct the linker to link all symbols explicitly.
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><del>- -Wl,--whole-archive GObjectDOMBindings -Wl,--no-whole-archive
</del><ins>+ GObjectDOMBindings
</ins><span class="cx"> WebCorePlatformGTK
</span><span class="cx"> )
</span><ins>+ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKit_LIBRARIES)
</ins><span class="cx">
</span><span class="cx"> set(WebKit_MARSHAL_LIST ${WEBKIT_DIR}/gtk/webkitmarshal.list)
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake (168719 => 168720)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2014-05-13 19:31:22 UTC (rev 168719)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/PlatformGTK.cmake 2014-05-13 19:31:42 UTC (rev 168720)
</span><span class="lines">@@ -447,9 +447,10 @@
</span><span class="cx"> # Since the GObjectDOMBindings convenience library exports API that is unused except
</span><span class="cx"> # in embedding applications we need to instruct the linker to link all symbols explicitly.
</span><span class="cx"> list(APPEND WebKit2_LIBRARIES
</span><del>- -Wl,--whole-archive GObjectDOMBindings -Wl,--no-whole-archive
</del><ins>+ GObjectDOMBindings
</ins><span class="cx"> WebCorePlatformGTK
</span><span class="cx"> )
</span><ins>+ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKit2_LIBRARIES)
</ins><span class="cx">
</span><span class="cx"> set(WebKit2_MARSHAL_LIST ${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2marshal.list)
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -644,11 +645,12 @@
</span><span class="cx"> ${GDK2_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span><del>- target_link_libraries(WebKitPluginProcess
</del><ins>+ set(WebKitPluginProcess_LIBRARIES
</ins><span class="cx"> ${SharedWebKit2Libraries}
</span><span class="cx"> WebCorePlatformGTK2
</span><del>- WebCore
</del><span class="cx"> )
</span><ins>+ ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKitPluginProcess_LIBRARIES)
+ target_link_libraries(WebKitPluginProcess ${WebKitPluginProcess_LIBRARIES})
</ins><span class="cx">
</span><span class="cx"> add_dependencies(WebKitPluginProcess WebKit2)
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake (168719 => 168720)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake 2014-05-13 19:31:22 UTC (rev 168719)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/OptionsGTK.cmake 2014-05-13 19:31:42 UTC (rev 168720)
</span><span class="lines">@@ -287,3 +287,14 @@
</span><span class="cx"> list(APPEND GObjectIntrospectionTargets ${target_name}-gir)
</span><span class="cx"> set(GObjectIntrospectionTargets ${GObjectIntrospectionTargets} PARENT_SCOPE)
</span><span class="cx"> endmacro()
</span><ins>+
+# CMake does not automatically add --whole-archive when building shared objects from
+# a list of convenience libraries. This can lead to missing symbols in the final output.
+# We add --whole-archive to all libraries manually to prevent the linker from trimming
+# symbols that we actually need later.
+macro(ADD_WHOLE_ARCHIVE_TO_LIBRARIES _list_name)
+ foreach (library IN LISTS ${_list_name})
+ list(APPEND ${_list_name}_TMP -Wl,--whole-archive ${library} -Wl,--no-whole-archive)
+ endforeach ()
+ set(${_list_name} "${${_list_name}_TMP}")
+endmacro()
</ins></span></pre>
</div>
</div>
</body>
</html>