Update webkit2-gtk3 to 2.20.2.

Obtained from:	gnome devel repo

6 files changed, 23 insertions, 18 deletions

diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index 1a2d8bd20a88..44f03007e039 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTVERSION=	2.20.0
-PORTREVISION=	1
+PORTVERSION=	2.20.2
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
@@ -28,7 +27,6 @@ LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libsoup-2.4.so:devel/libsoup \
 		libgcrypt.so:security/libgcrypt \
-		libgnutls.so:security/gnutls \
 		libtasn1.so:security/libtasn1 \
 		libwoff2dec.so:devel/woff2
 
diff --git a/www/webkit2-gtk3/distinfo b/www/webkit2-gtk3/distinfo
index 49360aa49d23..e27bf80deb51 100644
--- a/www/webkit2-gtk3/distinfo
+++ b/www/webkit2-gtk3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522145820
-SHA256 (webkitgtk-2.20.0.tar.xz) = 57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c
-SIZE (webkitgtk-2.20.0.tar.xz) = 16617492
+TIMESTAMP = 1526325251
+SHA256 (webkitgtk-2.20.2.tar.xz) = dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2
+SIZE (webkitgtk-2.20.2.tar.xz) = 16622048
diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp
deleted file mode 100644
index 0fb7155698bb..000000000000
--- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source/WTF/wtf/NumberOfCores.cpp.orig	2018-02-19 07:45:30 UTC
-+++ Source/WTF/wtf/NumberOfCores.cpp
-@@ -35,6 +35,7 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #elif OS(LINUX) || OS(AIX) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
-+#include <stdio.h> // sscanf
- #include <unistd.h>
- #elif OS(WINDOWS)
- #include <windows.h>
diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_soup_SoupNetworkSession.h b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_soup_SoupNetworkSession.h
new file mode 100644
index 000000000000..464b0897ade3
--- /dev/null
+++ b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_soup_SoupNetworkSession.h
@@ -0,0 +1,11 @@
+--- Source/WebCore/platform/network/soup/SoupNetworkSession.h.orig	2018-05-07 10:56:05.000000000 +0200
++++ Source/WebCore/platform/network/soup/SoupNetworkSession.h	2018-05-14 21:15:28.165991000 +0200
+@@ -33,6 +33,8 @@
+ #include <wtf/glib/GRefPtr.h>
+ #include <wtf/text/WTFString.h>
+ 
++#include "URL.h"
++
+ typedef struct _SoupCache SoupCache;
+ typedef struct _SoupCookieJar SoupCookieJar;
+ typedef struct _SoupMessage SoupMessage;
diff --git a/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake b/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
index c24f48e80f25..ba73721ae92c 100644
--- a/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
+++ b/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
@@ -8,3 +8,9 @@
  )
  
  list(APPEND WebDriver_SOURCES
+@@ -18,4 +19,5 @@ list(APPEND WebDriver_SOURCES
+ 
+ list(APPEND WebDriver_LIBRARIES
+     ${LIBSOUP_LIBRARIES}
++    ${ICU_LIBRARIES}
+ )
diff --git a/www/webkit2-gtk3/pkg-plist b/www/webkit2-gtk3/pkg-plist
index 0846d205d011..104192a224bf 100644
--- a/www/webkit2-gtk3/pkg-plist
+++ b/www/webkit2-gtk3/pkg-plist
@@ -199,10 +199,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.7.8
+lib/libjavascriptcoregtk-4.0.so.18.7.10
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.28.0
+lib/libwebkit2gtk-4.0.so.37.28.2
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libdata/pkgconfig/javascriptcoregtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-4.0.pc