<!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>[171846] 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/171846">171846</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-31 02:16:57 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Bump binary version for 2.6
https://bugs.webkit.org/show_bug.cgi?id=133724
Reviewed by Philippe Normand.
.:
* Source/cmake/OptionsGTK.cmake: Bump binary version to 4.0 and
update library version numbers.
Source/WebKit2:
* PlatformGTK.cmake: Fix JavaScriptCore dependency on
instrospection commands and make them depend on GTK+-3.0.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (171845 => 171846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/ChangeLog 2014-07-31 09:16:57 UTC (rev 171846)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-31 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Bump binary version for 2.6
+ https://bugs.webkit.org/show_bug.cgi?id=133724
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/OptionsGTK.cmake: Bump binary version to 4.0 and
+ update library version numbers.
+
</ins><span class="cx"> 2014-07-30 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Bump the minimum required version
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171845 => 171846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-31 09:16:57 UTC (rev 171846)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-31 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Bump binary version for 2.6
+ https://bugs.webkit.org/show_bug.cgi?id=133724
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Fix JavaScriptCore dependency on
+ instrospection commands and make them depend on GTK+-3.0.
+
</ins><span class="cx"> 2014-07-30 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (WK2 iOS): Inline editing for Chinese and Japanese keyboards does not work in Safari.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (171845 => 171846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-07-31 09:16:57 UTC (rev 171846)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</span><span class="cx"> DEPENDS WebKit2
</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 LDFLAGS=
</span><span class="cx"> ${INTROSPECTION_SCANNER}
</span><span class="cx"> --quiet
</span><span class="lines">@@ -750,7 +750,7 @@
</span><span class="cx"> --namespace=WebKit2
</span><span class="cx"> --nsversion=${WEBKITGTK_API_VERSION}
</span><span class="cx"> --include=GObject-2.0
</span><del>- --include=Gtk-${WEBKITGTK_API_VERSION}
</del><ins>+ --include=Gtk-3.0
</ins><span class="cx"> --include=Soup-2.4
</span><span class="cx"> --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
</span><span class="cx"> --library=webkit2gtk-${WEBKITGTK_API_VERSION}
</span><span class="lines">@@ -758,7 +758,7 @@
</span><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+-${WEBKITGTK_API_VERSION}
</del><ins>+ --pkg=gtk+-3.0
</ins><span class="cx"> --pkg=libsoup-2.4
</span><span class="cx"> --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
</span><span class="cx"> --output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</span><span class="lines">@@ -777,7 +777,7 @@
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
</span><del>- DEPENDS JavaScriptCore-3-gir
</del><ins>+ DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
</ins><span class="cx"> DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</span><span class="cx"> COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
</span><span class="cx"> ${INTROSPECTION_SCANNER}
</span><span class="lines">@@ -788,7 +788,7 @@
</span><span class="cx"> --namespace=WebKit2WebExtension
</span><span class="cx"> --nsversion=${WEBKITGTK_API_VERSION}
</span><span class="cx"> --include=GObject-2.0
</span><del>- --include=Gtk-${WEBKITGTK_API_VERSION}
</del><ins>+ --include=Gtk-3.0
</ins><span class="cx"> --include=Soup-2.4
</span><span class="cx"> --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
</span><span class="cx"> --library=webkit2gtk-${WEBKITGTK_API_VERSION}
</span><span class="lines">@@ -796,7 +796,7 @@
</span><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+-${WEBKITGTK_API_VERSION}
</del><ins>+ --pkg=gtk+-3.0
</ins><span class="cx"> --pkg=libsoup-2.4
</span><span class="cx"> --pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
</span><span class="cx"> --output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (171845 => 171846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-07-31 09:16:57 UTC (rev 171846)
</span><span class="lines">@@ -4,12 +4,12 @@
</span><span class="cx"> set(PROJECT_VERSION_MINOR 5)
</span><span class="cx"> set(PROJECT_VERSION_PATCH 0)
</span><span class="cx"> set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
</span><del>-set(WEBKITGTK_API_VERSION 3.0)
</del><ins>+set(WEBKITGTK_API_VERSION 4.0)
</ins><span class="cx">
</span><span class="cx"> # Libtool library version, not to be confused with API version.
</span><span class="cx"> # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
</span><del>-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 36 0 11)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 17 0 17)
</del><ins>+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 37 0 0)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 18 0 0)
</ins><span class="cx">
</span><span class="cx"> set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
</span><span class="cx"> set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
</span></span></pre>
</div>
</div>
</body>
</html>