<!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>[166499] 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/166499">166499</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-31 07:38:39 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
https://bugs.webkit.org/show_bug.cgi?id=130936
Reviewed by Carlos Garcia Campos.
.:
* Source/cmake/OptionsGTK.cmake: No longer emulate the Autotools macro names.
Source/WebKit/gtk:
* webkit/webkitversion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.
Source/WebKit2:
* UIProcess/API/gtk/WebKitVersion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitversionhin">trunk/Source/WebKit/gtk/webkit/webkitversion.h.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitVersionhin">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in</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 (166498 => 166499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-31 14:36:16 UTC (rev 166498)
+++ trunk/ChangeLog 2014-03-31 14:38:39 UTC (rev 166499)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-31 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
+ https://bugs.webkit.org/show_bug.cgi?id=130936
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake: No longer emulate the Autotools macro names.
+
</ins><span class="cx"> 2014-03-31 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add support for GTK3 plugins
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (166498 => 166499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-03-31 14:36:16 UTC (rev 166498)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-03-31 14:38:39 UTC (rev 166499)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-31 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
+ https://bugs.webkit.org/show_bug.cgi?id=130936
+
+ Reviewed by Carlos Garcia Campos.
+
+ * webkit/webkitversion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.
+
</ins><span class="cx"> 2014-03-28 Diego Pino Garcia <dpino@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Too many redirects visiting www.globalforestwatch.org
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitversionhin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitversion.h.in (166498 => 166499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitversion.h.in 2014-03-31 14:36:16 UTC (rev 166498)
+++ trunk/Source/WebKit/gtk/webkit/webkitversion.h.in 2014-03-31 14:38:39 UTC (rev 166499)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> G_BEGIN_DECLS
</span><span class="cx">
</span><del>-#define WEBKIT_MAJOR_VERSION (@WEBKIT_MAJOR_VERSION@)
-#define WEBKIT_MINOR_VERSION (@WEBKIT_MINOR_VERSION@)
-#define WEBKIT_MICRO_VERSION (@WEBKIT_MICRO_VERSION@)
</del><ins>+#define WEBKIT_MAJOR_VERSION (@PROJECT_VERSION_PATCH@)
+#define WEBKIT_MINOR_VERSION (@PROJECT_VERSION_MINOR@)
+#define WEBKIT_MICRO_VERSION (@PROJECT_VERSION_PATCH@)
</ins><span class="cx"> #define WEBKIT_USER_AGENT_MAJOR_VERSION (@WEBKIT_USER_AGENT_MAJOR_VERSION@)
</span><span class="cx"> #define WEBKIT_USER_AGENT_MINOR_VERSION (@WEBKIT_USER_AGENT_MINOR_VERSION@)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166498 => 166499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-31 14:36:16 UTC (rev 166498)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-31 14:38:39 UTC (rev 166499)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-31 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] Use PROJECT_VERSION_* instead of WEBKIT_*_VERSION
+ https://bugs.webkit.org/show_bug.cgi?id=130936
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitVersion.h.in: Use PROJECT_VERSION_* macros instead of the Autotools ones.
+
</ins><span class="cx"> 2014-03-31 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Add ewk APIs to control TLS error policy on WebContext.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitVersionhin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in (166498 => 166499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in 2014-03-31 14:36:16 UTC (rev 166498)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in 2014-03-31 14:38:39 UTC (rev 166499)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> * application compile time, rather than from the library linked
</span><span class="cx"> * against at application run time.
</span><span class="cx"> */
</span><del>-#define WEBKIT_MAJOR_VERSION (@WEBKIT_MAJOR_VERSION@)
</del><ins>+#define WEBKIT_MAJOR_VERSION (@PROJECT_VERSION_MAJOR@)
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WEBKIT_MINOR_VERSION:
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> * application compile time, rather than from the library linked
</span><span class="cx"> * against at application run time.
</span><span class="cx"> */
</span><del>-#define WEBKIT_MINOR_VERSION (@WEBKIT_MINOR_VERSION@)
</del><ins>+#define WEBKIT_MINOR_VERSION (@PROJECT_VERSION_MINOR@)
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WEBKIT_MICRO_VERSION:
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> * application compile time, rather than from the library linked
</span><span class="cx"> * against at application run time.
</span><span class="cx"> */
</span><del>-#define WEBKIT_MICRO_VERSION (@WEBKIT_MICRO_VERSION@)
</del><ins>+#define WEBKIT_MICRO_VERSION (@PROJECT_VERSION_PATCH@)
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WEBKIT_CHECK_VERSION:
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (166498 => 166499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-31 14:36:16 UTC (rev 166498)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-31 14:38:39 UTC (rev 166499)
</span><span class="lines">@@ -15,16 +15,6 @@
</span><span class="cx"> CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 32 0 7)
</span><span class="cx"> CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 16 2 16)
</span><span class="cx">
</span><del>-# This is a little confusing: WEBKIT_MICRO_VERSION and friends are used as
-# macros in files like WebKitVersion.h.in to expose the project version to
-# the API. Meanwhile WEBKIT_VERSION_MICRO (note the transposed words) is used
-# by the CMake files to hold the *library* version number, which we calculated
-# from the libtool triple above. We should consider ditching these below
-# and using PROJECT_VERSION_* directly.
-set(WEBKIT_MICRO_VERSION ${PROJECT_VERSION_PATCH})
-set(WEBKIT_MINOR_VERSION ${PROJECT_VERSION_MINOR})
-set(WEBKIT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
-
</del><span class="cx"> set(USE_GTK2 OFF CACHE BOOL "Whether or not to use GTK+ 2. WebKit2 only supports GTK+ 3.")
</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">
</span></span></pre>
</div>
</div>
</body>
</html>