[gnome-build-meta/mcatanzaro/webkitgtk-2.33.3] Update to WebKitGTK 2.33.3

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

commit bb4cfa9cdbb14aec1c0a2fb28f0aad39b4343637
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Mon Aug 16 08:31:47 2021 -0500

    Update to WebKitGTK 2.33.3
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1265>

 elements/sdk/webkitgtk.bst                       |  4 +-
 files/webkitgtk/webkitgtk-2.33.3-fix-build.patch | 92 ++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)
---
diff --git a/elements/sdk/webkitgtk.bst b/elements/sdk/webkitgtk.bst
index b7e5d88f..dfa81916 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.33.2.tar.xz
+  url: webkitgtk_org:webkitgtk-2.33.3.tar.xz
 - kind: local
   path: files/webkitgtk/toolchain.i686
 - kind: local
   path: files/webkitgtk/toolchain.arm
+- kind: patch
+  path: files/webkitgtk/webkitgtk-2.33.3-fix-build.patch
 
 build-depends:
 - sdk-deps/bubblewrap.bst
diff --git a/files/webkitgtk/webkitgtk-2.33.3-fix-build.patch 
b/files/webkitgtk/webkitgtk-2.33.3-fix-build.patch
new file mode 100644
index 00000000..cd0756cc
--- /dev/null
+++ b/files/webkitgtk/webkitgtk-2.33.3-fix-build.patch
@@ -0,0 +1,92 @@
+--- a/Source/JavaScriptCore/PlatformGTK.cmake  
++++ a/Source/JavaScriptCore/PlatformGTK.cmake  
+@@ -3,8 +3,9 @@ include(inspector/remote/GLib.cmake)
+ 
+ set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
+ 
++configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
++
+ if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
+-    configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
+     add_custom_target(JavaScriptCore-build-revision
+         ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" 
${JavaScriptCore_PKGCONFIG_FILE}
+         DEPENDS ${JavaScriptCore_PKGCONFIG_FILE}
+@@ -12,8 +13,6 @@ if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
+     list(APPEND JavaScriptCore_DEPENDENCIES
+         JavaScriptCore-build-revision
+     )
+-else ()
+-    configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE})
+ endif ()
+ 
+ install(FILES "${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc"
+--- a/Source/JavaScriptCore/javascriptcoregtk.pc.in    
++++ a/Source/JavaScriptCore/javascriptcoregtk.pc.in    
+@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ libdir=@LIB_INSTALL_DIR@
+ includedir=${prefix}/include
+-revision=${BUILD_REVISION}
++revision=@BUILD_REVISION@
+ 
+ Name: JavaScriptCoreGTK+
+ Description: GTK+ version of the JavaScriptCore engine
+--- a/Source/WebKit/PlatformGTK.cmake  
++++ a/Source/WebKit/PlatformGTK.cmake  
+@@ -10,12 +10,12 @@ file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR})
+ file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
+ file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension)
+ 
++configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
+ configure_file(UIProcess/API/gtk/WebKitVersion.h.in 
${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitVersion.h)
++configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
++configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
+ 
+ if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
+-    configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
+-    configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
+-    configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h @ONLY)
+     add_custom_target(WebKit-build-revision
+         ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" 
${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} 
${WebKit2WebExtension_PKGCONFIG_FILE}
+         DEPENDS ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} 
${WebKit2WebExtension_PKGCONFIG_FILE}
+@@ -23,10 +23,6 @@ if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
+     list(APPEND WebKit_DEPENDENCIES
+         WebKit-build-revision
+     )
+-else ()
+-    configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE})
+-    configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE})
+-    configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
+ endif ()
+ 
+ add_definitions(-DBUILDING_WEBKIT)
+--- a/Source/WebKit/Shared/glib/BuildRevision.h.in     
++++ a/Source/WebKit/Shared/glib/BuildRevision.h.in     
+@@ -25,4 +25,4 @@ 
+ 
+ #pragma once
+ 
+-#define BUILD_REVISION "${BUILD_REVISION}"
++#define BUILD_REVISION "@BUILD_REVISION@"
+--- a/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in 
++++ a/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in 
+@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ libdir=@LIB_INSTALL_DIR@
+ includedir=${prefix}/include
+-revision=${BUILD_REVISION}
++revision=@BUILD_REVISION@
+ 
+ Name: WebKitGTK web process extensions
+ Description: Web content engine for GTK - web process extensions
+--- a/Source/WebKit/gtk/webkit2gtk.pc.in       
++++ a/Source/WebKit/gtk/webkit2gtk.pc.in       
+@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ libdir=@LIB_INSTALL_DIR@
+ includedir=${prefix}/include
+-revision=${BUILD_REVISION}
++revision=@BUILD_REVISION@
+ 
+ Name: WebKitGTK
+ Description: Web content engine for GTK