Update www/webkit-gtk to 2.10.9.

Changes:
=================
WebKitGTK+ 2.10.9
=================
What's new in WebKitGTK+ 2.10.9?

  - Revert the patch to limit the number of tiles according to the visible area introduced in 2.10.8,
    because it caused rendering issues in several popular websites.
  - Fix the build with musl libc library.
  - Fix the build with clang-3.8.

=================
WebKitGTK+ 2.10.8
=================
What's new in WebKitGTK+ 2.10.8?

  - Limit the number of tiles according to the visible area. This was causing a huge memory
    consumption with some websites.
  - Fix flickering and rendering artifacts when entering accelerated compositing mode
    before the web view is realized.
  - Fix rendering of form controls and scrollbars with GTK+ >= 3.19.
  - Fix HTTP authentication dialog rendering when accelerated compositing mode is enabled.
  - Fix rendering artifacts when using a web view background color.
  - Fix a crash when creating a WebKitWebView without providing a WebKitWebContext.
  - Fix several crashes and rendering issues.
  - Security fixes: CVE-2016-1726.

6 files changed, 17 insertions, 32 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 1dd8ce03ac5..7b9af1c9503 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.110 2016/04/11 19:01:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.111 2016/04/12 07:58:04 leot Exp $
 
-DISTNAME=	webkitgtk-2.10.7
+DISTNAME=	webkitgtk-2.10.9
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index c2314d64ef6..49cf1209d6d 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2016/02/03 17:19:18 leot Exp $
+@comment $NetBSD: PLIST,v 1.33 2016/04/12 07:58:04 leot Exp $
 bin/MiniBrowser
 bin/jsc
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
@@ -280,10 +280,10 @@ lib/girepository-1.0/WebKit2-4.0.typelib
 lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.2.15
+lib/libjavascriptcoregtk-4.0.so.18.2.17
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.11.10
+lib/libwebkit2gtk-4.0.so.37.11.12
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 175e7c8ea1a..f5ed3f7575d 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.88 2016/02/03 17:19:18 leot Exp $
+$NetBSD: distinfo,v 1.89 2016/04/12 07:58:04 leot Exp $
 
-SHA1 (webkitgtk-2.10.7.tar.xz) = 32887ea4fd887d3996b973c6cee681530bb82d81
-RMD160 (webkitgtk-2.10.7.tar.xz) = 793335275dc1e764ea33a1fe559542097cd31637
-SHA512 (webkitgtk-2.10.7.tar.xz) = f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b
-Size (webkitgtk-2.10.7.tar.xz) = 10988396 bytes
+SHA1 (webkitgtk-2.10.9.tar.xz) = 98bb63404da498417fbc8abdb9c2cb875332f61c
+RMD160 (webkitgtk-2.10.9.tar.xz) = 58067eca9cd2b1b0c2cd6b10d88f2f119fe62a8a
+SHA512 (webkitgtk-2.10.9.tar.xz) = a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228
+Size (webkitgtk-2.10.9.tar.xz) = 10992980 bytes
 SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c
-SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = 3f3e5b0e3c944656fc614bad9578e625be0296d2
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 67bac371dff2afd7a1c7fad8763e05b722a11424
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50
-SHA1 (patch-Source_cmake_OptionsGTK.cmake) = e42e91715a54af1cfb70eeca91710fb52c0ead37
+SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 3c1c9695b13e3fbb1a8740de79f7eb873af4cdf0
 SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e
 SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
diff --git a/www/webkit-gtk/options.mk b/www/webkit-gtk/options.mk
index 76e7f240f95..b8a31d3e6c8 100644
--- a/www/webkit-gtk/options.mk
+++ b/www/webkit-gtk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2015/09/26 10:16:37 leot Exp $
+# $NetBSD: options.mk,v 1.11 2016/04/12 07:58:04 leot Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.webkit-gtk
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS=	enchant opengl
  && empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) \
  && empty(MACHINE_PLATFORM:MNetBSD-*-sparc) \
  && empty(MACHINE_PLATFORM:MSunOS-*)
-PKG_SUGGESTED_OPTIONS+= webkit-jit
+PKG_SUGGESTED_OPTIONS+=	webkit-jit
 .endif
 
 .include "../../mk/bsd.options.mk"
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp
deleted file mode 100644
index e22911035a8..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_Options.cpp,v 1.2 2016/01/21 13:42:33 leot Exp $
-
---- Source/JavaScriptCore/runtime/Options.cpp.orig	2016-01-20 12:13:00.000000000 +0000
-+++ Source/JavaScriptCore/runtime/Options.cpp
-@@ -610,7 +610,7 @@ bool Option::operator==(const Option& ot
-     case Options::Type::unsignedType:
-         return m_entry.unsignedVal == other.m_entry.unsignedVal;
-     case Options::Type::doubleType:
--        return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal));
-+        return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
-     case Options::Type::int32Type:
-         return m_entry.int32Val == other.m_entry.int32Val;
-     case Options::Type::optionRangeType:
diff --git a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
index 61a10da2406..f7a7443a14a 100644
--- a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
+++ b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.8 2016/02/03 17:19:18 leot Exp $
+$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.9 2016/04/12 07:58:04 leot Exp $
 
 o Do not require GCC 4.9.0 (should be build *without* IndexedDB support)
 o Do not conflict with CMAKE_MODULE_PATH during the linking phase of
@@ -13,9 +13,9 @@ o Do not conflict with CMAKE_MODULE_PATH during the linking phase of
 
 o Disable DatabaseProcess and IndexedDB support.
 
---- Source/cmake/OptionsGTK.cmake.orig	2016-01-20 12:45:56.000000000 +0000
+--- Source/cmake/OptionsGTK.cmake.orig	2016-03-17 06:50:57.000000000 +0000
 +++ Source/cmake/OptionsGTK.cmake
-@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 7)
+@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 9)
  set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
  set(WEBKITGTK_API_VERSION 4.0)
  
@@ -28,7 +28,7 @@ o Disable DatabaseProcess and IndexedDB support.
 -
  # Libtool library version, not to be confused with API version.
  # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
- CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 10 11)
+ CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 12 11)
 @@ -106,7 +99,7 @@ else ()
      WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF)
      WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)