<!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>[166780] 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/166780">166780</a></dd>
<dt>Author</dt> <dd>rakuco@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-04 07:03:20 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][CMake] Remove FindXt.cmake.
https://bugs.webkit.org/show_bug.cgi?id=131227
Reviewed by Anders Carlsson.
.:
Xt is already detected by CMake's own FindX11.cmake, so there is no need to keep a custom FindXt.cmake around.
* Source/cmake/FindXt.cmake: Removed.
* Source/cmake/OptionsGTK.cmake:
Source/WebCore:
* PlatformGTK.cmake: Use FindX11.cmake's Xt variables instead of our own FindXt.cmake's ones.</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="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindXtcmake">trunk/Source/cmake/FindXt.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (166779 => 166780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/ChangeLog 2014-04-04 14:03:20 UTC (rev 166780)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-04 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+
+ [GTK][CMake] Remove FindXt.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=131227
+
+ Reviewed by Anders Carlsson.
+
+ Xt is already detected by CMake's own FindX11.cmake, so there is no need to keep a custom FindXt.cmake around.
+
+ * Source/cmake/FindXt.cmake: Removed.
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2014-04-04 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Build error due to changed path of generated js files.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166779 => 166780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 14:03:20 UTC (rev 166780)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-04 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+
+ [GTK][CMake] Remove FindXt.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=131227
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformGTK.cmake: Use FindX11.cmake's Xt variables instead of our own FindXt.cmake's ones.
+
</ins><span class="cx"> 2014-04-03 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Fast-path for casting JS wrappers to JSElement.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (166779 => 166780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-04-04 14:03:20 UTC (rev 166780)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> ${X11_Xcomposite_LIB}
</span><span class="cx"> ${X11_Xdamage_LIB}
</span><span class="cx"> ${X11_Xrender_LIB}
</span><del>- ${XT_LIBRARIES}
</del><ins>+ ${X11_Xt_LIB}
</ins><span class="cx"> ${ZLIB_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -335,7 +335,6 @@
</span><span class="cx"> ${LIBXSLT_INCLUDE_DIR}
</span><span class="cx"> ${SQLITE_INCLUDE_DIR}
</span><span class="cx"> ${WEBP_INCLUDE_DIRS}
</span><del>- ${XT_INCLUDE_DIRS}
</del><span class="cx"> ${ZLIB_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeFindXtcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/cmake/FindXt.cmake (166779 => 166780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindXt.cmake 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/cmake/FindXt.cmake 2014-04-04 14:03:20 UTC (rev 166780)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-# - Try to find Xt
-# Once done, this will define
-#
-# XT_FOUND - system has Xt.
-# XT_INCLUDE_DIRS - the Xt. include directories
-# XT_LIBRARIES - link these to use Xt.
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
-# Copyright (C) 2013 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(XT xt)
-
-set(VERSION_OK TRUE)
-if (XT_VERSION)
- if (XT_FIND_VERSION_EXACT)
- if (NOT("${XT_FIND_VERSION}" VERSION_EQUAL "${XT_VERSION}"))
- set(VERSION_OK FALSE)
- endif ()
- else ()
- if ("${XT_VERSION}" VERSION_LESS "${XT_FIND_VERSION}")
- set(VERSION_OK FALSE)
- endif ()
- endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XT_DEFAULT_MSG XT_INCLUDE_DIRS XT_LIBRARIES VERSION_OK)
</del></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (166779 => 166780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-04-04 12:35:47 UTC (rev 166779)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-04-04 14:03:20 UTC (rev 166780)
</span><span class="lines">@@ -174,7 +174,6 @@
</span><span class="cx"> find_package(Sqlite REQUIRED)
</span><span class="cx"> find_package(Threads REQUIRED)
</span><span class="cx"> find_package(ZLIB REQUIRED)
</span><del>-find_package(Xt REQUIRED)
</del><span class="cx"> find_package(ATK REQUIRED)
</span><span class="cx"> find_package(WebP REQUIRED)
</span><span class="cx"> find_package(ATSPI 2.5.3)
</span></span></pre>
</div>
</div>
</body>
</html>