<!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>[161311] 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/161311">161311</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-04 09:46:06 -0800 (Sat, 04 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [CMake] Improve the way we locate gobject-introspection
https://bugs.webkit.org/show_bug.cgi?id=126452
Reviewed by Philippe Normand.
.:
* Source/cmake/FindGObjectIntrospection.cmake: Added.
* Source/cmake/OptionsGTK.cmake: Load the new FindGObjectIntrospection file.
Source/JavaScriptCore:
* PlatformGTK.cmake: Use the new introspection variables.
Source/WebKit:
* PlatformGTK.cmake: Use the new introspection variables.
Source/WebKit2:
* PlatformGTK.cmake: Use the new introspection variables.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformGTKcmake">trunk/Source/JavaScriptCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformGTKcmake">trunk/Source/WebKit/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindGObjectIntrospectioncmake">trunk/Source/cmake/FindGObjectIntrospection.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/ChangeLog 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-01-04 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] [CMake] Improve the way we locate gobject-introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126452
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/FindGObjectIntrospection.cmake: Added.
+ * Source/cmake/OptionsGTK.cmake: Load the new FindGObjectIntrospection file.
+
+2014-01-04 Martin Robinson <mrobinson@igalia.com>
+
</ins><span class="cx"> [GTK] [CMake] Fix the video and audio build
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126464
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-04 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Improve the way we locate gobject-introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126452
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Use the new introspection variables.
+
</ins><span class="cx"> 2014-01-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
</span><del>- COMMAND g-ir-compiler ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
</del><ins>+ COMMAND ${INTROSPECTION_COMPILER} ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> ADD_TYPELIB(${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib)
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/Source/WebKit/ChangeLog 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-04 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Improve the way we locate gobject-introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126452
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Use the new introspection variables.
+
</ins><span class="cx"> 2014-01-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix EFL build.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformGTK.cmake (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformGTK.cmake 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> DEPENDS WebKit
</span><span class="cx"> DEPENDS JavaScriptCore-3-gir
</span><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
</span><del>- g-ir-scanner
</del><ins>+ ${INTROSPECTION_SCANNER}
</ins><span class="cx"> --quiet
</span><span class="cx"> --warn-all
</span><span class="cx"> --symbol-prefix=webkit
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
</span><del>- COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
</del><ins>+ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit-3.0.typelib)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-04 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Improve the way we locate gobject-introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126452
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Use the new introspection variables.
+
</ins><span class="cx"> 2014-01-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Explicitly use the std:: nested name specifier when using std::pair, std::make_pair
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> DEPENDS WebKit2
</span><span class="cx"> DEPENDS JavaScriptCore-3-gir
</span><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
</span><del>- g-ir-scanner
</del><ins>+ ${INTROSPECTION_SCANNER}
</ins><span class="cx"> --quiet
</span><span class="cx"> --warn-all
</span><span class="cx"> --symbol-prefix=webkit
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> DEPENDS JavaScriptCore-3-gir
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
</span><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
</span><del>- g-ir-scanner
</del><ins>+ ${INTROSPECTION_SCANNER}
</ins><span class="cx"> --quiet
</span><span class="cx"> --warn-all
</span><span class="cx"> --symbol-prefix=webkit
</span><span class="lines">@@ -731,13 +731,13 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
</span><del>- COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
</del><ins>+ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
</span><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
</span><del>- COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
</del><ins>+ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib)
</span></span></pre></div>
<a id="trunkSourcecmakeFindGObjectIntrospectioncmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindGObjectIntrospection.cmake (0 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGObjectIntrospection.cmake (rev 0)
+++ trunk/Source/cmake/FindGObjectIntrospection.cmake 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+# - Try to find gobject-introspection
+# Once done, this will define
+#
+# INTROSPECTION_FOUND - system has gobject-introspection
+# INTROSPECTION_SCANNER - the gobject-introspection scanner, g-ir-scanner
+# INTROSPECTION_COMPILER - the gobject-introspection compiler, g-ir-compiler
+# INTROSPECTION_GENERATE - the gobject-introspection generate, g-ir-generate
+# INTROSPECTION_GIRDIR
+# INTROSPECTION_TYPELIBDIR
+# INTROSPECTION_CFLAGS
+# INTROSPECTION_LIBS
+#
+# Copyright (C) 2010, Pino Toscano, <pino@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args)
+ execute_process(
+ COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=${_varname} ${_extra_args} gobject-introspection-1.0
+ OUTPUT_VARIABLE _result
+ RESULT_VARIABLE _null
+ )
+
+ if (_null)
+ else ()
+ string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
+ string(REGEX REPLACE " +$" "" _result "${_result}")
+ separate_arguments(_result)
+ set(${_outvar} ${_result} CACHE INTERNAL "")
+ endif ()
+endmacro(_GIR_GET_PKGCONFIG_VAR)
+
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+ if (PACKAGE_FIND_VERSION_COUNT GREATER 0)
+ set(_gir_version_cmp ">=${PACKAGE_FIND_VERSION}")
+ endif ()
+ pkg_check_modules(_pc_gir gobject-introspection-1.0${_gir_version_cmp})
+ if (_pc_gir_FOUND)
+ set(INTROSPECTION_FOUND TRUE)
+ _gir_get_pkgconfig_var(INTROSPECTION_SCANNER "g_ir_scanner" "")
+ _gir_get_pkgconfig_var(INTROSPECTION_COMPILER "g_ir_compiler" "")
+ _gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate" "")
+ _gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir" "")
+ _gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir" "")
+ _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_GIRDIR "girdir" "--define-variable=prefix=${CMAKE_INSTALL_PREFIX}")
+ _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_TYPELIBDIR "typelibdir" "--define-variable=prefix=${CMAKE_INSTALL_PREFIX}")
+ set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
+ set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
+ endif ()
+endif ()
+
+mark_as_advanced(
+ INTROSPECTION_SCANNER
+ INTROSPECTION_COMPILER
+ INTROSPECTION_GENERATE
+ INTROSPECTION_GIRDIR
+ INTROSPECTION_TYPELIBDIR
+ INTROSPECTION_CFLAGS
+ INTROSPECTION_LIBS
+ INTROSPECTION_INSTALL_GIRDIR
+ INTROSPECTION_INSTALL_TYPELIBDIR
+)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (161310 => 161311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-04 17:44:28 UTC (rev 161310)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-04 17:46:06 UTC (rev 161311)
</span><span class="lines">@@ -168,6 +168,7 @@
</span><span class="cx"> find_package(WebP REQUIRED)
</span><span class="cx"> find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
</span><span class="cx"> find_package(ATSPI 2.5.3)
</span><ins>+find_package(GObjectIntrospection)
</ins><span class="cx">
</span><span class="cx"> # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
</span><span class="cx"> find_package(OpenGL)
</span></span></pre>
</div>
</div>
</body>
</html>