Update www/webkit-gtk to 2.10.4.

Changes:
  - Fixed dashed and dotted border painting.
  - Properly cancel navigation policy checks.
  - Several crashes fixed when running editor commands.
  - Fix several crashes due to assertions in Debug builds.
  - Fix the build on Mac OSX and bring back the Quartz target.
  - Fix the build on glibc-based BSD systems.

4 files changed, 18 insertions, 18 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index d4aed6bf1d7..de8d92bdb99 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2015/11/04 07:03:57 leot Exp $
+# $NetBSD: Makefile,v 1.105 2015/11/22 08:46:35 leot Exp $
 
-DISTNAME=	webkitgtk-2.10.3
+DISTNAME=	webkitgtk-2.10.4
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/releases/
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index e9f4c989078..c684222e7ee 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2015/11/04 07:03:57 leot Exp $
+@comment $NetBSD: PLIST,v 1.30 2015/11/22 08:46:35 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.11
+lib/libjavascriptcoregtk-4.0.so.18.2.12
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.11.6
+lib/libwebkit2gtk-4.0.so.37.11.7
 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 2e2f4ac70f7..2f3b5c45e60 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.85 2015/11/04 07:03:57 leot Exp $
+$NetBSD: distinfo,v 1.86 2015/11/22 08:46:35 leot Exp $
 
-SHA1 (webkitgtk-2.10.3.tar.xz) = 5c58ec103b3c677cb8dc5f8bf50703d660d110c1
-RMD160 (webkitgtk-2.10.3.tar.xz) = 3d1dbcc39ea18c9ba454609efc02b6daee4b7d19
-SHA512 (webkitgtk-2.10.3.tar.xz) = 12546184cb0b60f00382da010f5c5717e01aca2a56e1a351be1b5fae0a1584e534b82ddf2361bac2f213fddeabcf29772cc20f1cf4a5ac834e7876beb13b2f24
-Size (webkitgtk-2.10.3.tar.xz) = 11013220 bytes
+SHA1 (webkitgtk-2.10.4.tar.xz) = 45f368823c806542b24db3fd06442c0ccedc875f
+RMD160 (webkitgtk-2.10.4.tar.xz) = 99dc267c6fb5690b394e2541520c42bcfa53be58
+SHA512 (webkitgtk-2.10.4.tar.xz) = 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039
+Size (webkitgtk-2.10.4.tar.xz) = 11015164 bytes
 SHA1 (patch-CMakeLists.txt) = e5834d3935c4a25ab4aeb7210d0ccbffc012b670
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2b1eadc7a11b37dc36a7491f30bf72a6dddf5725
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1c5e0113e939163a69115809148dc184e64839ae
@@ -13,6 +13,6 @@ SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829c75
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29
-SHA1 (patch-Source_cmake_OptionsGTK.cmake) = b3c12728ef54118d4f822361a4582cd4c055e8c2
+SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 18f161fd72dd8d95ab382ca077f3773f0762a2a1
 SHA1 (patch-ai) = f0b059fe71022e961903655f5c2a5205fe452968
 SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
diff --git a/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
index af1fe98a93c..a5884a0ea11 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.5 2015/11/04 07:03:57 leot Exp $
+$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.6 2015/11/22 08:46:35 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	2015-10-26 09:33:05.000000000 +0000
+--- Source/cmake/OptionsGTK.cmake.orig	2015-11-11 09:22:48.000000000 +0000
 +++ Source/cmake/OptionsGTK.cmake
-@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 3)
+@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 4)
  set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
  set(WEBKITGTK_API_VERSION 4.0)
  
@@ -28,8 +28,8 @@ 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 6 11)
-@@ -105,7 +98,7 @@ else ()
+ CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 7 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)
      if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -38,7 +38,7 @@ o Disable DatabaseProcess and IndexedDB support.
      endif ()
  endif ()
  
-@@ -140,7 +133,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
+@@ -141,7 +134,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF)
@@ -47,7 +47,7 @@ o Disable DatabaseProcess and IndexedDB support.
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE OFF)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE OFF)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PRIVATE OFF)
-@@ -150,7 +143,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
+@@ -151,7 +144,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PRIVATE OFF)