<!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>[197623] trunk</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/197623">197623</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-03-05 17:20:45 -0800 (Sat, 05 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix GTK/EFL build after <a href="http://trac.webkit.org/projects/webkit/changeset/197575">r197575</a> and add mandatory GnuTLS dependency
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
* PlatformEfl.cmake:
* PlatformGTK.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (197622 => 197623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/ChangeLog 2016-03-06 01:20:45 UTC (rev 197623)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2016-03-05 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2016-03-02 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [cmake] Moved PRE/POST_BUILD_COMMAND to WEBKIT_FRAMEWORK.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197622 => 197623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/WebCore/ChangeLog 2016-03-06 01:20:45 UTC (rev 197623)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2016-03-05 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ Unreviewed, fix GTK/EFL build after r197575 and add mandatory GnuTLS dependency
+
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2016-03-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for the object-position CSS property
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (197622 => 197623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-03-06 01:20:45 UTC (rev 197623)
</span><span class="lines">@@ -282,6 +282,7 @@
</span><span class="cx"> ${GLIB_GIO_LIBRARIES}
</span><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><ins>+ ${GNUTLS_LIBRARIES}
</ins><span class="cx"> ${HARFBUZZ_LIBRARIES}
</span><span class="cx"> ${LIBSOUP_LIBRARIES}
</span><span class="cx"> ${LIBXML2_LIBRARIES}
</span><span class="lines">@@ -307,6 +308,7 @@
</span><span class="cx"> ${FREETYPE2_INCLUDE_DIRS}
</span><span class="cx"> ${GEOCLUE_INCLUDE_DIRS}
</span><span class="cx"> ${GIO_UNIX_INCLUDE_DIRS}
</span><ins>+ ${GNUTLS_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBXML2_INCLUDE_DIR}
</span><span class="cx"> ${LIBXSLT_INCLUDE_DIR}
</span><span class="cx"> ${SQLITE_INCLUDE_DIR}
</span><span class="lines">@@ -443,13 +445,6 @@
</span><span class="cx"> crypto/keys/CryptoKeyHMAC.cpp
</span><span class="cx"> crypto/keys/CryptoKeySerializationRaw.cpp
</span><span class="cx"> )
</span><del>-
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${GNUTLS_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${GNUTLS_LIBRARIES}
- )
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (DEVELOPER_MODE)
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (197622 => 197623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-03-06 01:20:45 UTC (rev 197623)
</span><span class="lines">@@ -259,6 +259,7 @@
</span><span class="cx"> ${GLIB_GMODULE_LIBRARIES}
</span><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><ins>+ ${GNUTLS_LIBRARIES}
</ins><span class="cx"> ${GUDEV_LIBRARIES}
</span><span class="cx"> ${HARFBUZZ_LIBRARIES}
</span><span class="cx"> ${LIBSECRET_LIBRARIES}
</span><span class="lines">@@ -283,6 +284,7 @@
</span><span class="cx"> ${GEOCLUE_INCLUDE_DIRS}
</span><span class="cx"> ${GIO_UNIX_INCLUDE_DIRS}
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><ins>+ ${GNUTLS_INCLUDE_DIRS}
</ins><span class="cx"> ${GUDEV_INCLUDE_DIRS}
</span><span class="cx"> ${HARFBUZZ_INCLUDE_DIRS}
</span><span class="cx"> ${LIBSECRET_INCLUDE_DIRS}
</span><span class="lines">@@ -818,11 +820,4 @@
</span><span class="cx"> crypto/keys/CryptoKeyHMAC.cpp
</span><span class="cx"> crypto/keys/CryptoKeySerializationRaw.cpp
</span><span class="cx"> )
</span><del>-
- list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
- ${GNUTLS_INCLUDE_DIRS}
- )
- list(APPEND WebCore_LIBRARIES
- ${GNUTLS_LIBRARIES}
- )
</del><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (197622 => 197623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-03-06 01:20:45 UTC (rev 197623)
</span><span class="lines">@@ -145,6 +145,7 @@
</span><span class="cx"> # Begin to find necessary packages for EFL port.
</span><span class="cx"> find_package(Cairo 1.10.2 REQUIRED)
</span><span class="cx"> find_package(Fontconfig 2.8.0 REQUIRED)
</span><ins>+find_package(GnuTLS 3.0.0 REQUIRED)
</ins><span class="cx"> find_package(LibXml2 2.8.0 REQUIRED)
</span><span class="cx"> find_package(LibXslt 1.1.7 REQUIRED)
</span><span class="cx"> find_package(ICU REQUIRED)
</span><span class="lines">@@ -289,10 +290,6 @@
</span><span class="cx"> message(FATAL_ERROR "FTL JIT is only available on X86_64 architecture.")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_SUBTLE_CRYPTO)
- find_package(GnuTLS 3.0.0 REQUIRED)
-endif ()
-
</del><span class="cx"> if (USE_LIBHYPHEN)
</span><span class="cx"> find_package(Hyphen)
</span><span class="cx"> if (NOT HYPHEN_FOUND)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (197622 => 197623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2016-03-06 00:48:11 UTC (rev 197622)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-03-06 01:20:45 UTC (rev 197623)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> find_package(Cairo 1.10.2 REQUIRED)
</span><span class="cx"> find_package(Fontconfig 2.8.0 REQUIRED)
</span><span class="cx"> find_package(Freetype2 2.4.2 REQUIRED)
</span><ins>+find_package(GnuTLS 3.0.0 REQUIRED)
</ins><span class="cx"> find_package(GTK3 3.6.0 REQUIRED)
</span><span class="cx"> find_package(GDK3 3.6.0 REQUIRED)
</span><span class="cx"> find_package(HarfBuzz 0.9.2 REQUIRED)
</span><span class="lines">@@ -326,13 +327,6 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_SUBTLE_CRYPTO)
- find_package(GnuTLS 3.0.0)
- if (NOT GNUTLS_FOUND)
- message(FATAL_ERROR "GnuTLS is needed for ENABLE_SUBTLE_CRYPTO")
- endif ()
-endif ()
-
</del><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span><span class="cx"> set(GSTREAMER_COMPONENTS app pbutils)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>