<!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>[163155] 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/163155">163155</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-30 21:37:15 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [CMake] Add support for building against GTK+ 2
https://bugs.webkit.org/show_bug.cgi?id=127959
Reviewed by Anders Carlsson.
.:
* Source/cmake/OptionsGTK.cmake: Add a new option to use GTK 2 and make a variable holding the
library API version. When using GTK 2 do not build WebKit 2.
Source/JavaScriptCore:
* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
Source/WebCore:
* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
Source/WebKit:
* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
Source/WebKit2:
* PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
Tools:
* DumpRenderTree/PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
* GtkLauncher/CMakeLists.txt: Ditto.
* ImageDiff/PlatformGTK.cmake: Ditto.
* TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt: Ditto.</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="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformGTKcmake">trunk/Tools/DumpRenderTree/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsGtkLauncherCMakeListstxt">trunk/Tools/GtkLauncher/CMakeLists.txt</a></li>
<li><a href="#trunkToolsImageDiffPlatformGTKcmake">trunk/Tools/ImageDiff/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitGtkCMakeListstxt">trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/ChangeLog 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-01-30 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] [CMake] Add support for building against GTK+ 2
+ https://bugs.webkit.org/show_bug.cgi?id=127959
+
+ Reviewed by Anders Carlsson.
+
+ * Source/cmake/OptionsGTK.cmake: Add a new option to use GTK 2 and make a variable holding the
+ library API version. When using GTK 2 do not build WebKit 2.
+
+2014-01-30 Martin Robinson <mrobinson@igalia.com>
+
</ins><span class="cx"> [GTK] [CMake] Add a "make dist" target
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=116378
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-30 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Add support for building against GTK+ 2
+ https://bugs.webkit.org/show_bug.cgi?id=127959
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
+
</ins><span class="cx"> 2014-01-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CodeBlock's cloned SymbolTables only need the captured names.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><del>-configure_file(javascriptcoregtk.pc.in ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-3.0.pc @ONLY)
-configure_file(JavaScriptCore.gir.in ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir @ONLY)
</del><ins>+configure_file(javascriptcoregtk.pc.in ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
+configure_file(JavaScriptCore.gir.in ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir @ONLY)
</ins><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
- DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
- COMMAND ${INTROSPECTION_COMPILER} ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
</del><ins>+ OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+ COMMAND ${INTROSPECTION_COMPILER} ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><del>-ADD_TYPELIB(${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib)
</del><ins>+ADD_TYPELIB(${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib)
</ins><span class="cx">
</span><del>-install(FILES "${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-3.0.pc"
</del><ins>+install(FILES "${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc"
</ins><span class="cx"> DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/JavaScriptCore"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
</del><ins>+install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
</span><span class="cx"> )
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
</del><ins>+install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
</ins><span class="cx"> DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-30 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Add support for building against GTK+ 2
+ https://bugs.webkit.org/show_bug.cgi?id=127959
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
+
</ins><span class="cx"> 2014-01-30 Jessie Berlin <jberlin@apple.com>
</span><span class="cx">
</span><span class="cx"> Speculative build fix.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -451,13 +451,13 @@
</span><span class="cx"> APPEND
</span><span class="cx"> PROPERTY INCLUDE_DIRECTORIES
</span><span class="cx"> ${WebCore_INCLUDE_DIRECTORIES}
</span><del>- ${GTK3_INCLUDE_DIRS}
- ${GDK3_INCLUDE_DIRS}
</del><ins>+ ${GTK_INCLUDE_DIRS}
+ ${GDK_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx"> target_link_libraries(WebCorePlatformGTK
</span><span class="cx"> ${WebCore_LIBRARIES}
</span><del>- ${GTK3_LIBRARIES}
- ${GDK3_LIBRARIES}
</del><ins>+ ${GTK_LIBRARIES}
+ ${GDK_LIBRARIES}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2)
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/WebKit/ChangeLog 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-30 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Add support for building against GTK+ 2
+ https://bugs.webkit.org/show_bug.cgi?id=127959
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
+
</ins><span class="cx"> 2014-01-30 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r163052.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformGTK.cmake (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformGTK.cmake 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITGTK_DIR})
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITGTK_API_DIR})
</span><span class="cx"> configure_file(gtk/webkit/webkitversion.h.in ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitversion.h)
</span><del>-configure_file(gtk/webkit.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-3.0.pc @ONLY)
</del><ins>+configure_file(gtk/webkit.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
</ins><span class="cx">
</span><span class="cx"> add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> ${WEBKIT_DIR}/gtk/WebCoreSupport
</span><span class="cx"> ${ENCHANT_INCLUDE_DIRS}
</span><span class="cx"> ${GEOCLUE_INCLUDE_DIRS}
</span><del>- ${GTK3_INCLUDE_DIRS}
</del><ins>+ ${GTK_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBSOUP_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -169,9 +169,9 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
</del><ins>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> DEPENDS WebKit
</span><del>- DEPENDS JavaScriptCore-3-gir
</del><ins>+ DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
</span><span class="cx"> ${INTROSPECTION_SCANNER}
</span><span class="cx"> --quiet
</span><span class="lines">@@ -179,20 +179,20 @@
</span><span class="cx"> --symbol-prefix=webkit
</span><span class="cx"> --identifier-prefix=WebKit
</span><span class="cx"> --namespace=WebKit
</span><del>- --nsversion=3.0
</del><ins>+ --nsversion=${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --include=GObject-2.0
</span><del>- --include=Gtk-3.0
</del><ins>+ --include=Gtk-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --include=Soup-2.4
</span><del>- --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
- --library=webkitgtk-3.0
- --library=javascriptcoregtk-3.0
</del><ins>+ --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+ --library=webkitgtk-${WEBKITGTK_API_VERSION}
+ --library=javascriptcoregtk-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
</span><span class="cx"> --no-libtool
</span><span class="cx"> --pkg=gobject-2.0
</span><del>- --pkg=gtk+-3.0
</del><ins>+ --pkg=gtk+-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --pkg=libsoup-2.4
</span><del>- --pkg-export=webkitgtk-3.0
- --output=${CMAKE_BINARY_DIR}/WebKit-3.0.gir
</del><ins>+ --pkg-export=webkitgtk-${WEBKITGTK_API_VERSION}
+ --output=${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> --c-include="webkit/webkit.h"
</span><span class="cx"> -DBUILDING_WEBKIT
</span><span class="cx"> -I${CMAKE_SOURCE_DIR}/Source
</span><span class="lines">@@ -207,14 +207,14 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
- COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
</del><ins>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.gir
+ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><del>-ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit-3.0.typelib)
</del><ins>+ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.typelib)
</ins><span class="cx">
</span><del>-install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-3.0.pc"
</del><ins>+install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-${WEBKITGTK_API_VERSION}.pc"
</ins><span class="cx"> DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
</span><span class="cx"> )
</span><span class="cx"> install(FILES "${WEBKIT_DIR}/gtk/resources/error.html"
</span><span class="lines">@@ -223,9 +223,9 @@
</span><span class="cx"> install(FILES ${WebKitGTK_INSTALLED_HEADERS}
</span><span class="cx"> DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit"
</span><span class="cx"> )
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
</del><ins>+install(FILES ${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
</span><span class="cx"> )
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
</del><ins>+install(FILES ${CMAKE_BINARY_DIR}/WebKit-${WEBKITGTK_API_VERSION}.typelib
</ins><span class="cx"> DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-30 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Add support for building against GTK+ 2
+ https://bugs.webkit.org/show_bug.cgi?id=127959
+
+ Reviewed by Anders Carlsson.
+
+ * PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
+
</ins><span class="cx"> 2014-01-30 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r163125.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
</span><span class="cx">
</span><span class="cx"> configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
</span><del>-configure_file(webkit2gtk.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-3.0.pc @ONLY)
</del><ins>+configure_file(webkit2gtk.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
</ins><span class="cx">
</span><span class="cx"> add_definitions(-DWEBKIT2_COMPILATION)
</span><span class="cx"> add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><del>- ${GTK3_INCLUDE_DIRS}
</del><ins>+ ${GTK_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebProcess_SOURCES
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> add_webkit2_prefix_header(webkit2gtkinjectedbundle)
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
</del><ins>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</ins><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><span class="lines">@@ -678,20 +678,20 @@
</span><span class="cx"> --symbol-prefix=webkit
</span><span class="cx"> --identifier-prefix=WebKit
</span><span class="cx"> --namespace=WebKit2
</span><del>- --nsversion=3.0
</del><ins>+ --nsversion=${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --include=GObject-2.0
</span><del>- --include=Gtk-3.0
</del><ins>+ --include=Gtk-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --include=Soup-2.4
</span><del>- --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
- --library=webkit2gtk-3.0
- --library=javascriptcoregtk-3.0
</del><ins>+ --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+ --library=webkit2gtk-${WEBKITGTK_API_VERSION}
+ --library=javascriptcoregtk-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
</span><span class="cx"> --no-libtool
</span><span class="cx"> --pkg=gobject-2.0
</span><del>- --pkg=gtk+-3.0
</del><ins>+ --pkg=gtk+-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --pkg=libsoup-2.4
</span><del>- --pkg-export=webkit2gtk-3.0
- --output=${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
</del><ins>+ --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
+ --output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> --c-include="webkit2/webkit2.h"
</span><span class="cx"> -DBUILDING_WEBKIT
</span><span class="cx"> -DWEBKIT2_COMPILATION
</span><span class="lines">@@ -706,9 +706,9 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
</del><ins>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> DEPENDS JavaScriptCore-3-gir
</span><del>- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
</del><ins>+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
</span><span class="cx"> ${INTROSPECTION_SCANNER}
</span><span class="cx"> --quiet
</span><span class="lines">@@ -716,21 +716,21 @@
</span><span class="cx"> --symbol-prefix=webkit
</span><span class="cx"> --identifier-prefix=WebKit
</span><span class="cx"> --namespace=WebKit2WebExtension
</span><del>- --nsversion=3.0
</del><ins>+ --nsversion=${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --include=GObject-2.0
</span><del>- --include=Gtk-3.0
</del><ins>+ --include=Gtk-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --include=Soup-2.4
</span><del>- --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
- --include-uninstalled=${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
- --library=webkit2gtk-3.0
- --library=javascriptcoregtk-3.0
</del><ins>+ --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+ --include-uninstalled=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ --library=webkit2gtk-${WEBKITGTK_API_VERSION}
+ --library=javascriptcoregtk-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
</span><span class="cx"> --no-libtool
</span><span class="cx"> --pkg=gobject-2.0
</span><del>- --pkg=gtk+-3.0
</del><ins>+ --pkg=gtk+-${WEBKITGTK_API_VERSION}
</ins><span class="cx"> --pkg=libsoup-2.4
</span><del>- --pkg-export=webkit2gtk-3.0
- --output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
</del><ins>+ --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
+ --output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> --c-include="webkit2/webkit-web-extension.h"
</span><span class="cx"> -DBUILDING_WEBKIT
</span><span class="cx"> -DWEBKIT2_COMPILATION
</span><span class="lines">@@ -749,35 +749,35 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
- COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
</del><ins>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
- COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
</del><ins>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
</ins><span class="cx"> )
</span><span class="cx">
</span><del>-ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib)
-ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib)
</del><ins>+ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib)
+ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib)
</ins><span class="cx">
</span><span class="cx"> install(TARGETS webkit2gtkinjectedbundle
</span><del>- DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-3.0/injected-bundle"
</del><ins>+ DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/injected-bundle"
</ins><span class="cx"> )
</span><del>-install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-3.0.pc"
</del><ins>+install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
</ins><span class="cx"> DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
</span><span class="cx"> )
</span><span class="cx"> install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
</span><span class="cx"> ${WebKit2WebExtension_INSTALLED_HEADERS}
</span><span class="cx"> DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit2"
</span><span class="cx"> )
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
- ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
</del><ins>+install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
</span><span class="cx"> )
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
- ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
</del><ins>+install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
</ins><span class="cx"> DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> set(WEBKIT_MINOR_VERSION ${PROJECT_VERSION_MINOR})
</span><span class="cx"> set(WEBKIT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
</span><span class="cx">
</span><ins>+set(USE_GTK2 OFF CACHE BOOL "Whether or not to use GTK+ 2. WebKit2 only supports GTK+ 3.")
+
</ins><span class="cx"> # FIXME: We want to expose fewer options to downstream, but for now everything is public.
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
</span><span class="lines">@@ -95,45 +97,51 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><del>-# These are used to generate the pkg-config files, note we only support GTK 3.0
-# builds with cmake.
-set(WEBKITGTK_API_VERSION 3.0)
-set(GTK_API_VERSION 3.0)
</del><ins>+set(ENABLE_WEBCORE ON)
+set(ENABLE_INSPECTOR ON)
+set(ENABLE_WEBKIT ON)
+if (NOT USE_GTK2)
+ set(WEBKITGTK_API_VERSION 3.0)
+ set(GTK_API_VERSION 3.0)
+ set(ENABLE_PLUGIN_PROCESS ON)
+ set(ENABLE_WEBKIT2 ON)
+else ()
+ set(WEBKITGTK_API_VERSION 2.0)
+ set(GTK_API_VERSION 2.0)
+ set(ENABLE_PLUGIN_PROCESS OFF)
+ set(ENABLE_WEBKIT2 OFF)
+endif ()
+
+# These are used to generate the pkg-config files.
</ins><span class="cx"> set(prefix ${CMAKE_INSTALL_PREFIX})
</span><span class="cx"> set(exec_prefix ${CMAKE_INSTALL_PREFIX})
</span><span class="cx"> set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}")
</span><span class="cx"> set(includedir "${prefix}/include")
</span><span class="cx"> set(VERSION ${PROJECT_VERSION})
</span><span class="cx">
</span><del>-set(ENABLE_WEBCORE ON)
-set(ENABLE_INSPECTOR ON)
-set(ENABLE_PLUGIN_PROCESS ON)
-set(ENABLE_WEBKIT ON)
-set(ENABLE_WEBKIT2 ON)
-
</del><span class="cx"> set(WTF_USE_SOUP 1)
</span><span class="cx">
</span><span class="cx"> set(WTF_OUTPUT_NAME WTFGTK)
</span><del>-set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-3.0)
</del><ins>+set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
</ins><span class="cx"> set(WebCore_OUTPUT_NAME WebCoreGTK)
</span><del>-set(WebKit_OUTPUT_NAME webkitgtk-3.0)
-set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
</del><ins>+set(WebKit_OUTPUT_NAME webkitgtk-${WEBKITGTK_API_VERSION})
+set(WebKit2_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
</ins><span class="cx"> set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
</span><span class="cx"> set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
</span><span class="cx">
</span><span class="cx"> set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
</span><del>-set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-3.0")
</del><ins>+set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
</ins><span class="cx"> set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Where to install libraries")
</span><span class="cx"> set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "Where to install executables")
</span><span class="cx"> set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_LIBEXECDIR}" CACHE PATH "Where to install executables executed by the library")
</span><del>-set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-3.0")
</del><ins>+set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
</ins><span class="cx">
</span><span class="cx"> add_definitions(-DBUILDING_GTK__=1)
</span><del>-add_definitions(-DGETTEXT_PACKAGE="WebKitGTK-3.0")
</del><ins>+add_definitions(-DGETTEXT_PACKAGE="WebKitGTK-${WEBKITGTK_API_VERSION}")
</ins><span class="cx"> add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
</span><del>-add_definitions(-DWEBKITGTK_API_VERSION_STRING="3.0")
</del><span class="cx"> add_definitions(-DUSER_AGENT_GTK_MAJOR_VERSION=537)
</span><span class="cx"> add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=30)
</span><ins>+add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span><span class="cx"> add_definitions(-DWTF_USE_GSTREAMER)
</span><span class="lines">@@ -157,8 +165,6 @@
</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(Freetype 2.4.2 REQUIRED)
</span><del>-find_package(GTK3 3.6.0 REQUIRED)
-find_package(GDK3 3.6.0 REQUIRED)
</del><span class="cx"> find_package(GTK2 2.24.10 REQUIRED)
</span><span class="cx"> find_package(GDK2 2.24.10 REQUIRED)
</span><span class="cx"> find_package(HarfBuzz 0.9.2 REQUIRED)
</span><span class="lines">@@ -178,6 +184,22 @@
</span><span class="cx"> find_package(ATSPI 2.5.3)
</span><span class="cx"> find_package(GObjectIntrospection)
</span><span class="cx">
</span><ins>+if (NOT USE_GTK2)
+ find_package(GTK3 3.6.0 REQUIRED)
+ find_package(GDK3 3.6.0 REQUIRED)
+ set(GTK_LIBRARIES ${GTK3_LIBRARIES})
+ set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
+ set(GDK_LIBRARIES ${GDK3_LIBRARIES})
+ set(GDK_INCLUDE_DIRS ${GDK3_INCLUDE_DIRS})
+else ()
+ set(GTK_LIBRARIES ${GTK2_LIBRARIES})
+ set(GTK_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS})
+ set(GDK_LIBRARIES ${GDK2_LIBRARIES})
+ set(GDK_INCLUDE_DIRS ${GDK2_INCLUDE_DIRS})
+ add_definitions(-DGTK_API_VERSION_2)
+ add_definitions(-DWEBKITGTK_API_VERSION_STRING="2.0")
+endif ()
+
</ins><span class="cx"> set(glib_components gio gobject gthread gmodule)
</span><span class="cx"> if (ENABLE_GAMEPAD)
</span><span class="cx"> list(APPEND glib_components gio-unix)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Tools/ChangeLog 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-30 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Add support for building against GTK+ 2
+ https://bugs.webkit.org/show_bug.cgi?id=127959
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/PlatformGTK.cmake: Use the new API version variable and don't use GTK3 directly.
+ * GtkLauncher/CMakeLists.txt: Ditto.
+ * ImageDiff/PlatformGTK.cmake: Ditto.
+ * TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt: Ditto.
+
</ins><span class="cx"> 2014-01-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add webView:didFinishLoadingNavigation: delegate method
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformGTK.cmake (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformGTK.cmake 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Tools/DumpRenderTree/PlatformGTK.cmake 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> ${CAIRO_LIBRARIES}
</span><span class="cx"> ${FONTCONFIG_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><del>- ${GTK3_LIBRARIES}
</del><ins>+ ${GTK_LIBRARIES}
</ins><span class="cx"> ${LIBSOUP_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> ${CAIRO_INCLUDE_DIRS}
</span><span class="cx"> ${FONTCONFIG_INCLUDE_DIR}
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><del>- ${GTK3_INCLUDE_DIRS}
</del><ins>+ ${GTK_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBSOUP_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsGtkLauncherCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/GtkLauncher/CMakeLists.txt (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/GtkLauncher/CMakeLists.txt 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Tools/GtkLauncher/CMakeLists.txt 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> ${DERIVED_SOURCES_WEBKITGTK_DIR}
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><span class="cx"> ${GSTREAMER_INCLUDE_DIRS}
</span><del>- ${GTK3_INCLUDE_DIRS}
</del><ins>+ ${GTK_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBSOUP_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> WebKit
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><span class="cx"> ${GSTREAMER_LIBRARIES}
</span><del>- ${GTK3_LIBRARIES}
</del><ins>+ ${GTK_LIBRARIES}
</ins><span class="cx"> ${LIBSOUP_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsImageDiffPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ImageDiff/PlatformGTK.cmake (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ImageDiff/PlatformGTK.cmake 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Tools/ImageDiff/PlatformGTK.cmake 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND IMAGE_DIFF_INCLUDE_DIRECTORIES
</span><del>- ${GTK3_INCLUDE_DIRS}
</del><ins>+ ${GTK_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND IMAGE_DIFF_LIBRARIES
</span><del>- ${GTK3_LIBRARIES}
</del><ins>+ ${GTK_LIBRARIES}
</ins><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitGtkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt (163154 => 163155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt 2014-01-31 04:51:21 UTC (rev 163154)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGtk/CMakeLists.txt 2014-01-31 05:37:15 UTC (rev 163155)
</span><span class="lines">@@ -10,8 +10,9 @@
</span><span class="cx"> ${DERIVED_SOURCES_DIR}
</span><span class="cx"> ${DERIVED_SOURCES_WEBKITGTK_DIR}
</span><span class="cx"> ${GLIB_INCLUDE_DIRS}
</span><del>- ${GTK3_INCLUDE_DIRS}
</del><ins>+ ${GTK_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBSOUP_INCLUDE_DIRS}
</span><ins>+ ${X11_INCLUDE_DIR}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> macro(ADD_WK1_TEST test_name)
</span><span class="lines">@@ -20,8 +21,9 @@
</span><span class="cx"> JavaScriptCore
</span><span class="cx"> WebKit
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><del>- ${GTK3_LIBRARIES}
</del><ins>+ ${GTK_LIBRARIES}
</ins><span class="cx"> ${LIBSOUP_LIBRARIES}
</span><ins>+ ${X11_X11_LIB}
</ins><span class="cx"> )
</span><span class="cx"> set_target_properties(${test_name} PROPERTIES
</span><span class="cx"> RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestWebKitAPI/WebKitGtk
</span></span></pre>
</div>
</div>
</body>
</html>