[gnome-build-meta/mcatanzaro/webkit: 1/2] Add a couple patches for WebKitGTK+ 2.23.1

[Michael Catanzaro <mcatanzaro src gnome org>]

commit b7b5812dbd143e14ef7bc1010d8643207888f1fe
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Dec 1 12:18:37 2018 -0600

    Add a couple patches for WebKitGTK+ 2.23.1
    
    Let's add a network backend change from
    https://bugs.webkit.org/show_bug.cgi?id=107451 so I can test it easier.
    
    Also, test a patch that should fix the i686 build.

 elements/sdk/WebKitGTK+.bst             |  8 +++++++-
 files/webkitgtk/i686-build.patch        | 18 ++++++++++++++++++
 files/webkitgtk/soup-session-test.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
---
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index f75334b..b2caac6 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -1,7 +1,13 @@
 kind: cmake
 sources:
+# WARNING: soup-session-test.patch and i686-build.patch
+# should both be removed when upgrading to 2.23.2!
 - kind: tar
   url: webkitgtk_org:webkitgtk-2.23.1.tar.xz
+- kind: patch
+  path: files/webkitgtk/soup-session-test.patch
+- kind: patch
+  path: files/webkitgtk/i686-build.patch
 - kind: patch
   path: files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
 - kind: local
@@ -48,7 +54,7 @@ variables:
   webkitgtk_toolchain: ''
   (?):
     - arch == "i686":
-        webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.i386 
-DENABLE_JIT=OFF -DENABLE_SAMPLING_PROFILER=OFF
+        webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.i386
     - arch == "arm":
         webkitgtk_toolchain: -DCMAKE_TOOLCHAIN_FILE=toolchain.arm
   cmake-local:
diff --git a/files/webkitgtk/i686-build.patch b/files/webkitgtk/i686-build.patch
new file mode 100644
index 0000000..5a99a6d
--- /dev/null
+++ b/files/webkitgtk/i686-build.patch
@@ -0,0 +1,18 @@
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index 31b5f3cdbf7fc24120cd8fa6c26328a1e40fee3e..3f23f4ca43fb660c981fb5101743ed93788f3afc 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -132,13 +132,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PUBLIC ON)
+-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PUBLIC ON)
+-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
+-WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
+ 
+ # Private options shared with other WebKit ports. Add options here when
+ # we need a value different from the default defined in WebKitFeatures.cmake.
diff --git a/files/webkitgtk/soup-session-test.patch b/files/webkitgtk/soup-session-test.patch
new file mode 100644
index 0000000..c93579e
--- /dev/null
+++ b/files/webkitgtk/soup-session-test.patch
@@ -0,0 +1,29 @@
+diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 
b/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp
+index 13ecb5b0f763c201cf17a41612a73f09a8f5a078..f24e265c96eafb5de4371a1d22638cc718e69516 100644
+--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp
++++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp
+@@ -105,7 +105,7 @@ static HashMap<String, HostTLSCertificateSet, ASCIICaseInsensitiveHash>& clientC
+ }
+ 
+ SoupNetworkSession::SoupNetworkSession(PAL::SessionID sessionID, SoupCookieJar* cookieJar)
+-    : m_soupSession(adoptGRef(soup_session_async_new()))
++    : m_soupSession(adoptGRef(soup_session_new()))
+ {
+     // Values taken from http://www.browserscope.org/ following
+     // the rule "Do What Every Other Modern Browser Is Doing". They seem
+@@ -123,13 +123,10 @@ SoupNetworkSession::SoupNetworkSession(PAL::SessionID sessionID, SoupCookieJar*
+     g_object_set(m_soupSession.get(),
+         SOUP_SESSION_MAX_CONNS, maxConnections,
+         SOUP_SESSION_MAX_CONNS_PER_HOST, maxConnectionsPerHost,
+-        SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_DECODER,
++        SOUP_SESSION_TIMEOUT, 0,
++        SOUP_SESSION_IDLE_TIMEOUT, 0,
+         SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_SNIFFER,
+-        SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
+         SOUP_SESSION_ADD_FEATURE, jar.get(),
+-        SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
+-        SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
+-        SOUP_SESSION_SSL_STRICT, TRUE,
+         nullptr);
+ 
+     setupCustomProtocols();