Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.6 release.

.: * Source/cmake/OptionsGTK.cmake: Bump version numbers. Source/WebKit: * gtk/NEWS: Add release notes for 2.18.6.
WebKit · Jan 24, 2018 · df68e8e · df68e8e
1 parent 15f7fa8
commit df68e8e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.6 release.
+
+        * Source/cmake/OptionsGTK.cmake: Bump version numbers.
+
 2018-01-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.5 release.

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Update OptionsGTK.cmake and NEWS for 2.18.6 release.
+
+        * gtk/NEWS: Add release notes for 2.18.6.
+
 2018-01-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Disable the WebProcess memory monitor in 32 bits.

diff --git a/Source/WebKit/gtk/NEWS b/Source/WebKit/gtk/NEWS
@@ -1,8 +1,19 @@
+==================
+WebKitGTK+  2.18.6
+==================
+
+What's new in WebKitGTK+ 2.18.6?
+
+  - Fix deadlock in GStreamer video sink during shutdown when accelerated compositing is disabled.
+  - Several fixes and improvements in WebDriver.
+  - Security fixes: CVE-2018-4088, CVE-2017-13885, CVE-2017-7165, CVE-2017-13884, CVE-2017-7160,
+    CVE-2017-7153, CVE-2017-7153, CVE-2017-7161, CVE-2018-4096.
+
 ==================
 WebKitGTK+  2.18.5
 ==================
 
-What's new in WebKitGTK+ 2.18.4?
+What's new in WebKitGTK+ 2.18.5?
 
   - Disable SharedArrayBuffers from Web API.
   - Reduce the precision of "high" resolution time to 1ms.

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
@@ -1,11 +1,11 @@
 include(GNUInstallDirs)
 include(VersioningUtils)
 
-SET_PROJECT_VERSION(2 18 5)
+SET_PROJECT_VERSION(2 18 6)
 set(WEBKITGTK_API_VERSION 4.0)
 
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 61 8 24)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 24 14 6)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 61 9 24)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 24 15 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.