[gnome-build-meta/alatiera/update-webkit: 6/6] Update tarballs

[Marge Bot <marge-bot src gnome org>]

commit e39f9f4602d0e03d95841d7d0d2d1a6834f89a70
Author: Jordan Petridis <jordan centricular com>
Date:   Wed Jul 13 03:21:45 2022 +0300

    Update tarballs
    
    And patch webkit to build
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1656>

 elements/core-deps/spice-gtk.bst      |  5 +----
 elements/sdk/webkit2gtk-4.0.bst       |  1 +
 elements/sdk/webkit2gtk-4.1.bst       |  1 -
 elements/sdk/webkitgtk.inc            |  7 ++++---
 files/webkitgtk/fix-cloop-build.patch | 27 +++++++++++++++++++++++++++
 5 files changed, 33 insertions(+), 8 deletions(-)
---
diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst
index b2dcc25bf..160ecab7f 100644
--- a/elements/core-deps/spice-gtk.bst
+++ b/elements/core-deps/spice-gtk.bst
@@ -2,10 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  # FIXME: use the proper tarball once its uploaded
-  # https://gitlab.freedesktop.org/spice/spice-gtk/-/issues/159
-  # url: spice:gtk/spice-gtk-0.41.tar.xz
-  url: 
https://gitlab.freedesktop.org/spice/spice-gtk/uploads/05c649d612f31b60e4aa44a7c44e611c/spice-gtk-0.41.tar.xz
+  url: spice:gtk/spice-gtk-0.41.tar.xz
 
 build-depends:
 - core-deps/python-pyparsing.bst
diff --git a/elements/sdk/webkit2gtk-4.0.bst b/elements/sdk/webkit2gtk-4.0.bst
index 2ed9ca783..17cca9bd4 100644
--- a/elements/sdk/webkit2gtk-4.0.bst
+++ b/elements/sdk/webkit2gtk-4.0.bst
@@ -12,6 +12,7 @@ variables:
   cmake-local: >-
     -DPORT=GTK
     -DUSE_SOUP2=ON
+    -DENABLE_DOCUMENTATION=OFF
     -DENABLE_WEBDRIVER=OFF
     %{webkitgtk_toolchain}
 
diff --git a/elements/sdk/webkit2gtk-4.1.bst b/elements/sdk/webkit2gtk-4.1.bst
index f06ad115c..f3c36fa5a 100644
--- a/elements/sdk/webkit2gtk-4.1.bst
+++ b/elements/sdk/webkit2gtk-4.1.bst
@@ -11,7 +11,6 @@ depends:
 variables:
   cmake-local: >-
     -DPORT=GTK
-    -DENABLE_GTKDOC=ON
     -DENABLE_WEBDRIVER=OFF
     %{webkitgtk_toolchain}
 
diff --git a/elements/sdk/webkitgtk.inc b/elements/sdk/webkitgtk.inc
index 539613802..ca2f35dac 100644
--- a/elements/sdk/webkitgtk.inc
+++ b/elements/sdk/webkitgtk.inc
@@ -1,7 +1,8 @@
 sources:
 - kind: tar
-  #FIXME: re-enable gtk-doc for webkit2gtk-5.0.bst when fixed upstream
-  url: webkitgtk:webkitgtk-2.36.4.tar.xz
+  url: webkitgtk:webkitgtk-2.37.1.tar.xz
+- kind: patch
+  path: files/webkitgtk/fix-cloop-build.patch
 - kind: local
   path: files/webkitgtk/toolchain.i686
 - kind: local
@@ -9,9 +10,9 @@ sources:
 
 build-depends:
 - sdk-deps/bubblewrap.bst
+- sdk-deps/gi-docgen.bst
 - sdk-deps/xdg-dbus-proxy.bst
 - sdk/gobject-introspection.bst
-- sdk/gtk-doc.bst
 - freedesktop-sdk.bst:components/gperf.bst
 - freedesktop-sdk.bst:components/perl.bst
 - freedesktop-sdk.bst:components/ruby.bst
diff --git a/files/webkitgtk/fix-cloop-build.patch b/files/webkitgtk/fix-cloop-build.patch
new file mode 100644
index 000000000..f38f3f86c
--- /dev/null
+++ b/files/webkitgtk/fix-cloop-build.patch
@@ -0,0 +1,27 @@
+From 40e49bb53218a986b4d6569f3fc2730cc4b71472 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro redhat com>
+Date: Tue, 12 Jul 2022 16:56:56 -0700
+Subject: [PATCH] Fix cloop build after 252338@main
+ https://bugs.webkit.org/show_bug.cgi?id=242579
+
+Reviewed by Mark Lam.
+
+* Source/JavaScriptCore/CMakeLists.txt:
+
+Canonical link: https://commits.webkit.org/252400@main
+---
+ Source/JavaScriptCore/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
+index aef0678e66f3..f4ba2716faef 100644
+--- a/Source/JavaScriptCore/CMakeLists.txt
++++ b/Source/JavaScriptCore/CMakeLists.txt
+@@ -837,6 +837,7 @@ set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
+     inspector/remote/RemoteInspector.h
+ 
+     interpreter/AbstractPC.h
++    interpreter/CLoopStack.h
+     interpreter/CallFrame.h
+     interpreter/CallFrameInlines.h
+     interpreter/CalleeBits.h