<!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>[171988] 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/171988">171988</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-04 00:17:55 -0700 (Mon, 04 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Windowing target support should reflect the support in the GTK+ dependency
https://bugs.webkit.org/show_bug.cgi?id=134736
Reviewed by Martin Robinson.
* Source/cmake/FindGTK3.cmake: Don't error out if the GTK+ dependency doesn't
support the X11 or Wayland windowing targets -- instead, if there's no support
the specific target is disabled, and an error is thrown only if neither of the
backends is enabled at the end..
For now the X11 target remains enabled by default, and the Wayland target is
kept disabled. Once it's possible to have both targets enabled at runtime in
WebKit, the Wayland target will be enabled as well and we'll leave it to the
GTK+ dependency to determine which targets can be enabled.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (171987 => 171988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-08-04 07:10:15 UTC (rev 171987)
+++ trunk/ChangeLog 2014-08-04 07:17:55 UTC (rev 171988)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-08-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Windowing target support should reflect the support in the GTK+ dependency
+ https://bugs.webkit.org/show_bug.cgi?id=134736
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindGTK3.cmake: Don't error out if the GTK+ dependency doesn't
+ support the X11 or Wayland windowing targets -- instead, if there's no support
+ the specific target is disabled, and an error is thrown only if neither of the
+ backends is enabled at the end..
+ For now the X11 target remains enabled by default, and the Wayland target is
+ kept disabled. Once it's possible to have both targets enabled at runtime in
+ WebKit, the Wayland target will be enabled as well and we'll leave it to the
+ GTK+ dependency to determine which targets can be enabled.
+
+2014-08-04 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [CMake] Add FindWayland.cmake
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135540
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeFindGTK3cmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindGTK3.cmake (171987 => 171988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGTK3.cmake 2014-08-04 07:10:15 UTC (rev 171987)
+++ trunk/Source/cmake/FindGTK3.cmake 2014-08-04 07:17:55 UTC (rev 171988)
</span><span class="lines">@@ -48,16 +48,21 @@
</span><span class="cx"> if (GTK3_VERSION AND VERSION_OK AND ENABLE_X11_TARGET)
</span><span class="cx"> pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
</span><span class="cx"> if (NOT("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
</span><del>- set(VERSION_OK FALSE)
</del><ins>+ set(ENABLE_X11_TARGET OFF)
</ins><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (GTK3_VERSION AND VERSION_OK AND ENABLE_WAYLAND_TARGET)
</span><span class="cx"> pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0)
</span><span class="cx"> if (NOT("${GTK3_WAYLAND_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
</span><del>- set(VERSION_OK FALSE)
</del><ins>+ set(ENABLE_WAYLAND_TARGET OFF)
</ins><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (NOT(ENABLE_X11_TARGET OR ENABLE_WAYLAND_TARGET))
+ message(FATAL_ERROR "At least one of the following windowing targets must "
+ "be enabled and also supported by the GTK+ dependency: X11, Wayland")
+endif ()
+
</ins><span class="cx"> include(FindPackageHandleStandardArgs)
</span><span class="cx"> FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
</span></span></pre>
</div>
</div>
</body>
</html>