[gtk-osx] Update webkit2gtk3 to 2.16.6.

[John Ralls <jralls src gnome org>]

commit 723610b589b4673346de9cdf89afb3f1921dcd81
Author: John Ralls <jralls ceridwen us>
Date:   Tue Oct 17 10:21:55 2017 -0700

    Update webkit2gtk3 to 2.16.6.

 modulesets-stable/gtk-osx-network.modules        |    8 +++++---
 patches/webkit-2.16-No-stringview-lifetime.patch |   13 +++++++++++++
 patches/webkit-2.16-main-thread.patch            |   21 +++++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 00d2deb..a4913b5 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -200,10 +200,12 @@
   -->
   <cmake id="webkit2gtk3"
          cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_INTROSPECTION=OFF  
-DENABLE_OPENGL=OFF -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF 
-DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF 
-DENABLE_TOUCH_EVENTS=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++"'>
-    <branch repo="webkit.org" module="webkitgtk-2.16.1.tar.xz" version="2.16.1">
-      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/WebKit-2.16.1-Bug-167343-wtf-unicode-UTF8.h.patch"; 
strip="1"/>
+    <branch repo="webkit.org" module="webkitgtk-2.16.6.tar.xz" version="2.16.6">
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/Webkit-2.16-build-without-OpenGL.patch"; strip="1"/>
-<patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Webkit-2.16-Fix-some-includes.patch"; 
strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Webkit-2.16-Fix-some-includes.patch"; 
strip="1"/>
+      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-2.16-No-stringview-lifetime.patch"; strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-2.16-main-thread.patch"; 
strip="1"/>
+
     </branch>
     <dependencies>
       <dep package="libwebp"/>
diff --git a/patches/webkit-2.16-No-stringview-lifetime.patch 
b/patches/webkit-2.16-No-stringview-lifetime.patch
new file mode 100644
index 0000000..793b1e5
--- /dev/null
+++ b/patches/webkit-2.16-No-stringview-lifetime.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/WTF/wtf/text/StringView.h~ b/Source/WTF/wtf/text/StringView.h
+index ef209f9..42ecca8 100644
+--- a/Source/WTF/wtf/text/StringView.h~
++++ b/Source/WTF/wtf/text/StringView.h
+@@ -37,7 +37,7 @@
+ #include <wtf/text/StringCommon.h>
+ 
+ // FIXME: Enabling the StringView lifetime checking causes the MSVC build to fail. Figure out why.
+-#if defined(NDEBUG) || COMPILER(MSVC)
++#if defined(NDEBUG) || COMPILER(MSVC) || __APPLE__
+ #define CHECK_STRINGVIEW_LIFETIME 0
+ #else
+ #define CHECK_STRINGVIEW_LIFETIME 1
diff --git a/patches/webkit-2.16-main-thread.patch b/patches/webkit-2.16-main-thread.patch
new file mode 100644
index 0000000..cd64436
--- /dev/null
+++ b/patches/webkit-2.16-main-thread.patch
@@ -0,0 +1,21 @@
+diff --git a/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp~ 
b/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp
+index 480f9d0..26e351b 100644
+--- a/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp~
++++ b/Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp
+@@ -23,6 +23,8 @@
+  * THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#include <config.h>
++#include <wtf/MainThread.h>
+ #include "WebProcessMainUnix.h"
+ 
+ #include <cstdlib>
+@@ -40,6 +42,6 @@ int main(int argc, char** argv)
+     // https://bugzilla.gnome.org/show_bug.cgi?id=738633
+     // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
+     setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
+-
++    WTF::initializeMainThread();
+     return WebProcessMainUnix(argc, argv);
+ }