From e4349e0d8d8b4ca00885e6d27be87489ba537e17 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@webkit.org>
Date: Mon, 11 Sep 2017 07:18:39 +0000
Subject: [PATCH] Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.0
 release.

.:

* Source/cmake/OptionsGTK.cmake: Bump version numbers.

Source/WebKit:

* gtk/NEWS: Add release notes for 2.18.0.
---
 ChangeLog                     |  6 ++++++
 Source/WebKit/ChangeLog       |  6 ++++++
 Source/WebKit/gtk/NEWS        | 10 ++++++++++
 Source/cmake/OptionsGTK.cmake |  8 ++++----
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1445b85498e..f902e5a7081e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.0 release.
+
+        * Source/cmake/OptionsGTK.cmake: Bump version numbers.
+
 2017-09-04  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.17.92 release.
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 669f57949493..ef888c40db32 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.0 release.
+
+        * gtk/NEWS: Add release notes for 2.18.0.
+
 2017-09-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         REGRESSION: [GTK] Generated HTML API documentation is missing descriptions
diff --git a/Source/WebKit/gtk/NEWS b/Source/WebKit/gtk/NEWS
index fa3ee0ac0d44..222a8103070c 100644
--- a/Source/WebKit/gtk/NEWS
+++ b/Source/WebKit/gtk/NEWS
@@ -1,3 +1,13 @@
+==================
+WebKitGTK+  2.18.0
+==================
+
+What's new in WebKitGTK+ 2.18.0?
+
+  - Fix the API documentation generation.
+  - Fix the build in ARM with NEON.
+  - Fix the build for Clang with libc++.
+
 ==================
 WebKitGTK+ 2.17.92
 ==================
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 65a56d5967d3..bcacfdb310a5 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -1,8 +1,8 @@
 include(GNUInstallDirs)
 
 set(PROJECT_VERSION_MAJOR 2)
-set(PROJECT_VERSION_MINOR 17)
-set(PROJECT_VERSION_MICRO 92)
+set(PROJECT_VERSION_MINOR 18)
+set(PROJECT_VERSION_MICRO 0)
 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
 set(WEBKITGTK_API_VERSION 4.0)
 
@@ -14,8 +14,8 @@ macro(CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE library_name current revisi
     set(${library_name}_VERSION_MICRO ${revision})
     set(${library_name}_VERSION ${${library_name}_VERSION_MAJOR}.${age}.${revision})
 endmacro()
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 61 2 24)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 24 8 6)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 61 3 24)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 24 9 6)
 
 # These are shared variables, but we special case their definition so that we can use the
 # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.