<!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>[188929] 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/188929">188929</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2015-08-25 12:13:39 -0700 (Tue, 25 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] <a href="http://trac.webkit.org/projects/webkit/changeset/186800">r186800</a> broke the build on Ubuntu 14.04
https://bugs.webkit.org/show_bug.cgi?id=147559
Reviewed by Martin Robinson.
* Source/cmake/FindGTK3.cmake: Always define GTK3_SUPPORTS_X11 and GTK3_SUPPORTS_WAYLAND.
* Source/cmake/OptionsGTK.cmake: Autodetect support for X11 and Wayland backends.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeFindGTK3cmake">trunk/Source/cmake/FindGTK3.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 (188928 => 188929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-08-25 19:10:29 UTC (rev 188928)
+++ trunk/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-25 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] r186800 broke the build on Ubuntu 14.04
+ https://bugs.webkit.org/show_bug.cgi?id=147559
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindGTK3.cmake: Always define GTK3_SUPPORTS_X11 and GTK3_SUPPORTS_WAYLAND.
+ * Source/cmake/OptionsGTK.cmake: Autodetect support for X11 and Wayland backends.
+
</ins><span class="cx"> 2015-08-25 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] Build does not generate debug info.
</span></span></pre></div>
<a id="trunkSourcecmakeFindGTK3cmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindGTK3.cmake (188928 => 188929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGTK3.cmake 2015-08-25 19:10:29 UTC (rev 188928)
+++ trunk/Source/cmake/FindGTK3.cmake 2015-08-25 19:13:39 UTC (rev 188929)
</span><span class="lines">@@ -52,11 +52,15 @@
</span><span class="cx"> pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
</span><span class="cx"> if ("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")
</span><span class="cx"> set(GTK3_SUPPORTS_X11 TRUE)
</span><ins>+ else ()
+ set(GTK3_SUPPORTS_X11 FALSE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0)
</span><span class="cx"> if ("${GTK3_WAYLAND_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")
</span><span class="cx"> set(GTK3_SUPPORTS_WAYLAND TRUE)
</span><ins>+ else ()
+ set(GTK3_SUPPORTS_WAYLAND FALSE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (NOT("${GTK3_VERSION}" VERSION_LESS "3.14.0"))
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (188928 => 188929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-08-25 19:10:29 UTC (rev 188928)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-08-25 19:13:39 UTC (rev 188929)
</span><span class="lines">@@ -33,6 +33,8 @@
</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(GTK3 3.6.0 REQUIRED)
+find_package(GDK3 3.6.0 REQUIRED)
</ins><span class="cx"> find_package(HarfBuzz 0.9.2 REQUIRED)
</span><span class="cx"> find_package(ICU REQUIRED)
</span><span class="cx"> find_package(JPEG REQUIRED)
</span><span class="lines">@@ -47,6 +49,7 @@
</span><span class="cx"> find_package(WebP REQUIRED)
</span><span class="cx"> find_package(ATSPI 2.5.3)
</span><span class="cx"> find_package(EGL)
</span><ins>+find_package(GTKUnixPrint)
</ins><span class="cx"> find_package(OpenGL)
</span><span class="cx"> find_package(OpenGLES2)
</span><span class="cx">
</span><span class="lines">@@ -68,8 +71,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON)
</del><ins>+WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK3_SUPPORTS_X11})
+WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ${GTK3_SUPPORTS_WAYLAND})
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON)
</span><span class="cx">
</span><span class="lines">@@ -224,16 +227,6 @@
</span><span class="cx"> add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1)
</span><span class="cx"> add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
</span><span class="cx">
</span><del>-if (ENABLE_WAYLAND_TARGET)
- set(GTK3_REQUIRED_VERSION 3.12.0)
-else ()
- set(GTK3_REQUIRED_VERSION 3.6.0)
-endif ()
-
-find_package(GTK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
-find_package(GDK3 ${GTK3_REQUIRED_VERSION} REQUIRED)
-find_package(GTKUnixPrint)
-
</del><span class="cx"> set(GTK_LIBRARIES ${GTK3_LIBRARIES})
</span><span class="cx"> set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
</span><span class="cx"> set(GDK_LIBRARIES ${GDK3_LIBRARIES})
</span><span class="lines">@@ -424,6 +417,10 @@
</span><span class="cx"> message(FATAL_ERROR "Recompile GTK+ with Wayland backend to use ENABLE_WAYLAND_TARGET")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+ if (ENABLE_WAYLAND_TARGET AND GTK3_VERSION VERSION_LESS 3.12)
+ message(FATAL_ERROR "GTK+ 3.12 is required to use ENABLE_WAYLAND_TARGET")
+ endif ()
+
</ins><span class="cx"> find_package(Wayland REQUIRED)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>