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.
WebKit · Sep 11, 2017 · e4349e0 · e4349e0
1 parent 9d2293a
commit e4349e0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.