[gnome-build-meta/mcatanzaro/webkitgtk-2.33.1: 2/2] Update to WebKitGTK 2.33.1 and WPEBackend-fdo 1.9.92

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e9fe46a4a9a6f0cdb22d28d1a47b9bdf210de48f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri May 14 14:32:13 2021 -0500

    Update to WebKitGTK 2.33.1 and WPEBackend-fdo 1.9.92
    
    Notably, we will temporarily disable WebKitGTK's new dependency on
    libsoup3, and add a new dependency on lcms for color management.

 elements/sdk/webkitgtk.bst      |  7 +++++--
 elements/sdk/wpebackend-fdo.bst |  2 +-
 files/webkitgtk/fix-build.patch | 12 ++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/elements/sdk/webkitgtk.bst b/elements/sdk/webkitgtk.bst
index b359b976..cbacc5bb 100644
--- a/elements/sdk/webkitgtk.bst
+++ b/elements/sdk/webkitgtk.bst
@@ -2,11 +2,13 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: webkitgtk_org:webkitgtk-2.32.1.tar.xz
+  url: webkitgtk_org:webkitgtk-2.33.1.tar.xz
 - kind: local
   path: files/webkitgtk/toolchain.i686
 - kind: local
   path: files/webkitgtk/toolchain.arm
+- kind: patch
+  path: files/webkitgtk/fix-build.patch
 
 build-depends:
 - sdk-deps/bubblewrap.bst
@@ -37,6 +39,7 @@ depends:
 - sdk/wpebackend-fdo.bst
 - freedesktop-sdk.bst:components/brotli.bst
 - freedesktop-sdk.bst:components/hyphen.bst
+- freedesktop-sdk.bst:components/lcms.bst
 - freedesktop-sdk.bst:components/libseccomp.bst
 - freedesktop-sdk.bst:components/libtasn1.bst
 - freedesktop-sdk.bst:components/libwebp.bst
@@ -56,7 +59,7 @@ variables:
       webkitgtk_toolchain: -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=toolchain.%{arch}
   # FIXME: Enable gamepad support via libmanette once freedesktop-sdk's gudev is built with 
gobject-introspection support
   cmake-local: >-
-    -DPORT=GTK -DENABLE_GAMEPAD=OFF
+    -DPORT=GTK -DENABLE_GAMEPAD=OFF -DUSE_SOUP2=ON
     %{webkitgtk_toolchain}
     %{webkitgtk_arch_options}
 (?):
diff --git a/elements/sdk/wpebackend-fdo.bst b/elements/sdk/wpebackend-fdo.bst
index 4e3332bb..5db436d3 100644
--- a/elements/sdk/wpebackend-fdo.bst
+++ b/elements/sdk/wpebackend-fdo.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://wpewebkit.org/releases/wpebackend-fdo-1.9.91.tar.xz
+  url: https://wpewebkit.org/releases/wpebackend-fdo-1.9.92.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/files/webkitgtk/fix-build.patch b/files/webkitgtk/fix-build.patch
new file mode 100644
index 00000000..90da7511
--- /dev/null
+++ b/files/webkitgtk/fix-build.patch
@@ -0,0 +1,12 @@
+--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h   
++++ a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h   
+@@ -33,6 +33,9 @@ 
+ #if USE(LIBEPOXY)
+ #include <epoxy/gl.h>
+ #else
++#if HAVE(OPENGL_ES_3)
++#include <GLES3/gl3.h>
++#endif // HAVE(OPENGL_ES_3)
+ #include <GLES2/gl2.h>
+ #include <GLES2/gl2ext.h>
+ #endif