16 changed files with 455 additions and 3129 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/webkitgtk-2.48.1.tar.xz
+SOURCES/webkitgtk-2.44.3.tar.xz
 SOURCES/webkitgtk-keys.gpg
--- a/.webkit2gtk3.metadata
+++ b/.webkit2gtk3.metadata
@ -1,2 +1,2 @@
-f7939f920f92f6b1395b8573f069d3fb9c085b3f SOURCES/webkitgtk-2.48.1.tar.xz
+c9bcb2097d8f774b2c64ca650a4f8a6365ff54f6 SOURCES/webkitgtk-2.44.3.tar.xz
 04b10b8a486542c4551269c20b18b5c1c6cb4f94 SOURCES/webkitgtk-keys.gpg
--- a/SOURCES/cairo-1.15.patch
+++ b/SOURCES/cairo-1.15.patch
@ -1,22 +0,0 @@
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 44ab9b35c6c9..f9c576764f43 100644
--- a/Source/cmake/OptionsGTK.cmake
-+++ b/Source/cmake/OptionsGTK.cmake
-@@ -8,7 +8,7 @@ SET_PROJECT_VERSION(2 48 1)
- set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
- 
- find_package(GLIB 2.70.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
-find_package(Cairo 1.16.0 REQUIRED)
-+find_package(Cairo 1.14.0 REQUIRED)
- find_package(LibGcrypt 1.7.0 REQUIRED)
- find_package(Libtasn1 REQUIRED)
- find_package(HarfBuzz 2.7.4 REQUIRED COMPONENTS ICU)
-@@ -133,7 +133,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE ${ENABLE_DEVELOPER_MODE}
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
--- a/SOURCES/compiler-flags.patch
+++ b/SOURCES/compiler-flags.patch
@ -1,26 +0,0 @@
-diff --git a/Source/ThirdParty/libsysprof-capture/CMakeLists.txt b/Source/ThirdParty/libsysprof-capture/CMakeLists.txt
-index 7ea8f0469ad7..13a9e390643a 100644
--- a/Source/ThirdParty/libsysprof-capture/CMakeLists.txt
-+++ b/Source/ThirdParty/libsysprof-capture/CMakeLists.txt
-@@ -46,6 +46,7 @@ target_link_libraries(SysProfCapture
- 
- WEBKIT_ADD_TARGET_C_FLAGS(SysProfCapture
-     -Wno-implicit-function-declaration
-+    -Wno-int-conversion
-     -Wno-sign-compare
-     -Wno-unused-parameter
- )
-diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index f5ec0a55919b..cf307eac2775 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
-+++ b/Source/cmake/WebKitCompilerFlags.cmake
-@@ -184,8 +184,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
-                                          -Wno-misleading-indentation
-                                          -Wno-psabi)
- 
-    # GCC < 12.0 gives false warnings for mismatched-new-delete <https://webkit.org/b/241516>
-    if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0.0"))
-+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-         WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-mismatched-new-delete)
-         WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-uninitialized)
-     endif ()
--- a/SOURCES/denormal-disabler-build.patch
+++ b/SOURCES/denormal-disabler-build.patch
@ -1,12 +0,0 @@
-diff --git a/Source/WebCore/platform/audio/DenormalDisabler.cpp b/Source/WebCore/platform/audio/DenormalDisabler.cpp
-index 35715e663ce7..44ba08a33d5d 100644
--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
-+++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
-@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler()
-     }
- }
- #else
-DenormalDisabler::DenormalDisabler() = default
-+DenormalDisabler::DenormalDisabler() = default;
- DenormalDisabler::~DenormalDisabler() = default;
- #endif
--- a/SOURCES/evolution-sandbox-warning.patch
+++ b/SOURCES/evolution-sandbox-warning.patch
@ -1,14 +0,0 @@
-diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-index a2f3b582dcc5..1faf219c2adb 100644
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
-@@ -91,7 +91,8 @@ void WebProcessPool::platformInitialize(NeedsGlobalStaticInitialization)
-         else {
-             static bool once = false;
-             if (!once) {
-                g_warning("WEBKIT_FORCE_SANDBOX no longer allows disabling the sandbox. Use WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 instead.");
-+                if (g_strcmp0(g_get_prgname(), "evolution"))
-+                    g_warning("WEBKIT_FORCE_SANDBOX no longer allows disabling the sandbox. Use WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 instead.");
-                 once = true;
-             }
-         }
--- a/SOURCES/evolution-shared-secondary-process.patch
+++ b/SOURCES/evolution-shared-secondary-process.patch
@ -1,14 +0,0 @@
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-index 65cf0eb2b99a..518cc953edca 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-@@ -450,6 +450,9 @@ static void webkitWebContextConstructed(GObject* object)
-     }
-     configuration.setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.span()));
- 
-+    if (!g_strcmp0(g_get_prgname(), "evolution"))
-+        configuration.setUsesSingleWebProcess(true);
-+
- #if !ENABLE(2022_GLIB_API)
-     if (!priv->websiteDataManager)
-         priv->websiteDataManager = adoptGRef(webkit_website_data_manager_new("local-storage-directory", priv->localStorageDirectory.data(), nullptr));
--- a/SOURCES/fix-wasm.patch
+++ b/SOURCES/fix-wasm.patch
@ -0,0 +1,48 @@
+From 9140ce712aa87091613874d802787ab476be0e39 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 14 Aug 2024 14:58:05 -0500
+Subject: [PATCH] Revert "Cherry-pick 272448.770@safari-7618-branch
+ (6d311cd7fefc). https://bugs.webkit.org/show_bug.cgi?id=271175"
+ https://bugs.webkit.org/show_bug.cgi?id=278113
+
+This reverts commit 279c9d7963182cc35cf4e0bfebe87df2d83eaef8.
+
+This broke wasm, and I don't know how to fix it.
+
+Canonical link: https://commits.webkit.org/274313.373@webkitglib/2.44
+---
+ .../stress/many-calls-results-on-stack.js     | 39 -------------------
+ Source/JavaScriptCore/wasm/WasmBBQJIT.cpp     | 19 ---------
+ 2 files changed, 58 deletions(-)
+ delete mode 100644 JSTests/wasm/stress/many-calls-results-on-stack.js
+
+diff --git a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+index 9049865e8ce7..3f142cf5e90f 100644
+--- a/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+++ b/Source/JavaScriptCore/wasm/WasmBBQJIT.cpp
+@@ -3958,25 +3958,6 @@ void BBQJIT::returnValuesFromCall(Vector<Value, N>& results, const FunctionSigna
+                     ASSERT(m_validFPRs.contains(returnLocation.asFPR(), Width::Width128));
+                     m_fprSet.add(returnLocation.asFPR(), Width::Width128);
+                 }
+-            } else {
+-                ASSERT(returnLocation.isStackArgument());
+-                // FIXME: Ideally, we would leave these values where they are but a subsequent call could clobber them before they are used.
+-                // That said, stack results are very rare so this isn't too painful.
+-                // Even if we did leave them where they are, we'd need to flush them to their canonical location at the next branch otherwise
+-                // we could have something like (assume no result regs for simplicity):
+-                // call (result i32 i32) $foo
+-                // if (result i32) // Stack: i32(StackArgument:8) i32(StackArgument:0)
+-                //   // Stack: i32(StackArgument:8)
+-                // else
+-                //   call (result i32 i32) $bar // Stack: i32(StackArgument:8) we have to flush the stack argument to make room for the result of bar
+-                //   drop // Stack: i32(Stack:X) i32(StackArgument:8) i32(StackArgument:0)
+-                //   drop // Stack: i32(Stack:X) i32(StackArgument:8)
+-                // end
+-                // return // Stack i32(*Conflicting locations*)
+-
+-                Location canonicalLocation = canonicalSlot(result);
+-                emitMoveMemory(result.type(), returnLocation, canonicalLocation);
+-                returnLocation = canonicalLocation;
+             }
+         }
+         bind(result, returnLocation);
--- a/SOURCES/glib-2.56.patch
+++ b/SOURCES/glib-2.56.patch
@ -1,482 +0,0 @@
-diff --git a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
-index ef000cd2b910..432c97257048 100644
--- a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
-+++ b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
-@@ -175,11 +175,12 @@ static void featureTreeViewRenderStatusData(GtkTreeViewColumn *column, GtkCellRe
- {
-     g_autoptr(WebKitFeature) feature = NULL;
-     gtk_tree_model_get(model, iter, FEATURES_LIST_COLUMN_FEATURE, &feature, -1);
-    g_autoptr(GEnumClass) enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
-+    GEnumClass *enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
-     g_object_set(renderer,
-                  "markup", NULL,
-                  "text", g_enum_get_value(enumClass, webkit_feature_get_status(feature))->value_nick,
-                  NULL);
-+    g_type_class_unref(enumClass);
- }
- 
- static void featureTreeViewRenderCategoryData(GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
-diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
-index 8be643a54151..ae82b41400b5 100644
--- a/Tools/MiniBrowser/gtk/main.c
-+++ b/Tools/MiniBrowser/gtk/main.c
-@@ -273,7 +273,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
-                 "features, prefixes '-' and '!' disable features. Names are case-insensitive. Example:\n"
-                 "\n    %s --features='!DirPseudo,+WebAnimationsCustomEffects,webgl'\n\n"
-                 "Available features (+/- = enabled/disabled by default):\n\n", g_get_prgname());
-        g_autoptr(GEnumClass) statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
-+        GEnumClass *statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
-         for (gsize i = 0; i < webkit_feature_list_get_length(featureList); i++) {
-             WebKitFeature *feature = webkit_feature_list_get(featureList, i);
-             g_print("  %c %s (%s)",
-@@ -284,6 +284,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
-                 g_print(": %s", webkit_feature_get_name(feature));
-             g_print("\n");
-         }
-+        g_type_class_unref(statusEnum);
-         exit(EXIT_SUCCESS);
-     }
-
-From 4e525b9192df17a80b07188af6b6e7cf6476ff10 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Fri, 4 Apr 2025 13:20:59 -0500
-Subject: [PATCH] Revert "[GLib] Remove all GLIB_CHECK_VERSION conditionals"
-
-This reverts commit 85b637b69f1c3a6242420b198d1c173477ce0f22.
---
- Source/WTF/wtf/URL.h                                |  4 ++--
- Source/WTF/wtf/glib/GRefPtr.cpp                     |  2 ++
- Source/WTF/wtf/glib/GRefPtr.h                       |  3 +++
- Source/WTF/wtf/glib/SocketConnection.cpp            | 13 +++++++++++++
- Source/WTF/wtf/glib/URLGLib.cpp                     |  2 ++
- Source/WebCore/platform/LowPowerModeNotifier.h      |  2 ++
- .../platform/glib/LowPowerModeNotifierGLib.cpp      |  8 ++++++++
- .../platform/network/soup/CertificateInfoSoup.cpp   |  8 ++++++++
- Source/WebKit/NetworkProcess/glib/DNSCache.cpp      | 12 ++++++++++++
- Source/WebKit/NetworkProcess/glib/DNSCache.h        |  2 ++
- .../NetworkProcess/glib/WebKitCachedResolver.cpp    |  6 ++++++
- .../glib/WebKitOverridingResolver.cpp               |  4 ++++
- Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp    |  6 ++++++
- Source/cmake/OptionsGTK.cmake                       | 13 ++++++++++++-
- Source/cmake/OptionsWPE.cmake                       | 13 ++++++++++++-
- 15 files changed, 94 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WTF/wtf/URL.h b/Source/WTF/wtf/URL.h
-index 8a7864508a8e..f065677c68ad 100644
--- a/Source/WTF/wtf/URL.h
-+++ b/Source/WTF/wtf/URL.h
-@@ -27,7 +27,7 @@
- 
- #include <wtf/text/WTFString.h>
- 
-#if USE(GLIB)
-+#if USE(GLIB) && HAVE(GURI)
- #include <wtf/glib/GRefPtr.h>
- #endif
- 
-@@ -237,7 +237,7 @@ public:
-     WTF_EXPORT_PRIVATE operator NSURL *() const;
- #endif
- 
-#if USE(GLIB)
-+#if USE(GLIB) && HAVE(GURI)
-     WTF_EXPORT_PRIVATE URL(GUri*);
-     WTF_EXPORT_PRIVATE GRefPtr<GUri> createGUri() const;
- #endif
-diff --git a/Source/WTF/wtf/glib/GRefPtr.cpp b/Source/WTF/wtf/glib/GRefPtr.cpp
-index 4c15aa9866c0..6faa98b7eab2 100644
--- a/Source/WTF/wtf/glib/GRefPtr.cpp
-+++ b/Source/WTF/wtf/glib/GRefPtr.cpp
-@@ -207,6 +207,7 @@ template <> void derefGPtr(GDBusNodeInfo* ptr)
-         g_dbus_node_info_unref(ptr);
- }
- 
-+#if HAVE(GURI)
- template <> GUri* refGPtr(GUri* ptr)
- {
-     if (ptr)
-@@ -219,6 +220,7 @@ template <> void derefGPtr(GUri* ptr)
-     if (ptr)
-         g_uri_unref(ptr);
- }
-+#endif
- 
- template <>
- GArray* refGPtr(GArray* ptr)
-diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
-index 87a9ef9760bf..d6c71c14a981 100644
--- a/Source/WTF/wtf/glib/GRefPtr.h
-+++ b/Source/WTF/wtf/glib/GRefPtr.h
-@@ -264,8 +264,11 @@ template <> WTF_EXPORT_PRIVATE GArray* refGPtr(GArray*);
- template <> WTF_EXPORT_PRIVATE void derefGPtr(GArray*);
- template <> WTF_EXPORT_PRIVATE GResource* refGPtr(GResource*);
- template <> WTF_EXPORT_PRIVATE void derefGPtr(GResource*);
-+
-+#if HAVE(GURI)
- template <> WTF_EXPORT_PRIVATE GUri* refGPtr(GUri*);
- template <> WTF_EXPORT_PRIVATE void derefGPtr(GUri*);
-+#endif
- 
- template <typename T> inline T* refGPtr(T* ptr)
- {
-diff --git a/Source/WTF/wtf/glib/SocketConnection.cpp b/Source/WTF/wtf/glib/SocketConnection.cpp
-index d1185aeb2d47..80a622b83eba 100644
--- a/Source/WTF/wtf/glib/SocketConnection.cpp
-+++ b/Source/WTF/wtf/glib/SocketConnection.cpp
-@@ -145,7 +145,20 @@ bool SocketConnection::readMessage()
-         if (!it->value.first.isNull()) {
-             GUniquePtr<GVariantType> variantType(g_variant_type_new(it->value.first.data()));
-             size_t parametersSize = bodySize.value() - messageNameLength.value();
-+            // g_variant_new_from_data() requires the memory to be properly aligned for the type being loaded,
-+            // but it's not possible to know the alignment because g_variant_type_info_query() is not public API.
-+            // Since GLib 2.60 g_variant_new_from_data() already checks the alignment and reallocates the buffer
-+            // in aligned memory only if needed. For older versions we can simply ensure the memory is 8 aligned.
-+#if GLIB_CHECK_VERSION(2, 60, 0)
-             parameters = g_variant_new_from_data(variantType.get(), messageData, parametersSize, FALSE, nullptr, nullptr);
-+#else
-+            auto* alignedMemory = fastAlignedMalloc(8, parametersSize);
-+            memcpy(alignedMemory, messageData, parametersSize);
-+            GRefPtr<GBytes> bytes = g_bytes_new_with_free_func(alignedMemory, parametersSize, [](gpointer data) {
-+                fastAlignedFree(data);
-+            }, alignedMemory);
-+            parameters = g_variant_new_from_bytes(variantType.get(), bytes.get(), FALSE);
-+#endif
-             if (messageIsByteSwapped(flags))
-                 parameters = adoptGRef(g_variant_byteswap(parameters.get()));
-         }
-diff --git a/Source/WTF/wtf/glib/URLGLib.cpp b/Source/WTF/wtf/glib/URLGLib.cpp
-index 589dc1b52f8f..f67fe780f333 100644
--- a/Source/WTF/wtf/glib/URLGLib.cpp
-+++ b/Source/WTF/wtf/glib/URLGLib.cpp
-@@ -35,6 +35,7 @@
- 
- namespace WTF {
- 
-+#if HAVE(GURI)
- URL::URL(GUri* uri)
- {
-     if (!uri) {
-@@ -56,6 +57,7 @@ GRefPtr<GUri> URL::createGUri() const
-         static_cast<GUriFlags>(G_URI_FLAGS_HAS_PASSWORD | G_URI_FLAGS_ENCODED_PATH | G_URI_FLAGS_ENCODED_QUERY | G_URI_FLAGS_ENCODED_FRAGMENT | G_URI_FLAGS_SCHEME_NORMALIZE | G_URI_FLAGS_PARSE_RELAXED),
-         nullptr));
- }
-+#endif
- 
- bool URL::hostIsIPAddress(StringView host)
- {
-diff --git a/Source/WebCore/platform/LowPowerModeNotifier.h b/Source/WebCore/platform/LowPowerModeNotifier.h
-index c8f2051d77f6..e2ea0dae3292 100644
--- a/Source/WebCore/platform/LowPowerModeNotifier.h
-+++ b/Source/WebCore/platform/LowPowerModeNotifier.h
-@@ -61,8 +61,10 @@ private:
-     RetainPtr<WebLowPowerModeObserver> m_observer;
-     LowPowerModeChangeCallback m_callback;
- #elif USE(GLIB)
-+#if GLIB_CHECK_VERSION(2, 69, 1)
-     LowPowerModeChangeCallback m_callback;
-     GRefPtr<GPowerProfileMonitor> m_powerProfileMonitor;
-+#endif
-     bool m_lowPowerModeEnabled { false };
- #endif
- };
-diff --git a/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp b/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp
-index e083cc66934e..7c0f55d089e6 100644
--- a/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp
-+++ b/Source/WebCore/platform/glib/LowPowerModeNotifierGLib.cpp
-@@ -28,10 +28,13 @@ namespace WebCore {
- 
- 
- LowPowerModeNotifier::LowPowerModeNotifier(LowPowerModeChangeCallback&& callback)
-+#if GLIB_CHECK_VERSION(2, 69, 1)
-     : m_callback(WTFMove(callback))
-     , m_powerProfileMonitor(adoptGRef(g_power_profile_monitor_dup_default()))
-     , m_lowPowerModeEnabled(g_power_profile_monitor_get_power_saver_enabled(m_powerProfileMonitor.get()))
-+#endif
- {
-+#if GLIB_CHECK_VERSION(2, 69, 1)
-     g_signal_connect_swapped(m_powerProfileMonitor.get(), "notify::power-saver-enabled", G_CALLBACK(+[] (LowPowerModeNotifier* self, GParamSpec*, GPowerProfileMonitor* monitor) {
-         bool powerSaverEnabled = g_power_profile_monitor_get_power_saver_enabled(monitor);
-         if (self->m_lowPowerModeEnabled != powerSaverEnabled) {
-@@ -39,11 +42,16 @@ LowPowerModeNotifier::LowPowerModeNotifier(LowPowerModeChangeCallback&& callback
-             self->m_callback(self->m_lowPowerModeEnabled);
-         }
-     }), this);
-+#else
-+    UNUSED_PARAM(callback);
-+#endif
- }
- 
- LowPowerModeNotifier::~LowPowerModeNotifier()
- {
-+#if GLIB_CHECK_VERSION(2, 69, 1)
-     g_signal_handlers_disconnect_by_data(m_powerProfileMonitor.get(), this);
-+#endif
- }
- 
- bool LowPowerModeNotifier::isLowPowerModeEnabled() const
-diff --git a/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp b/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp
-index f32ecca7a300..e81a5433709d 100644
--- a/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp
-+++ b/Source/WebCore/platform/network/soup/CertificateInfoSoup.cpp
-@@ -73,9 +73,11 @@ CertificateInfo CertificateInfo::isolatedCopy() const
-         certificatesDataList.append(certificateData.release());
-     }
- 
-+#if GLIB_CHECK_VERSION(2, 69, 0)
-     GUniqueOutPtr<char> privateKey;
-     GUniqueOutPtr<char> privateKeyPKCS11Uri;
-     g_object_get(m_certificate.get(), "private-key-pem", &privateKey.outPtr(), "private-key-pkcs11-uri", &privateKeyPKCS11Uri.outPtr(), nullptr);
-+#endif
- 
-     GType certificateType = g_tls_backend_get_certificate_type(g_tls_backend_get_default());
-     GRefPtr<GTlsCertificate> certificate;
-@@ -86,8 +88,10 @@ CertificateInfo CertificateInfo::isolatedCopy() const
-             certificateType, nullptr, nullptr,
-             "certificate-pem", certificateData.get(),
-             "issuer", issuer,
-+#if GLIB_CHECK_VERSION(2, 69, 0)
-             "private-key-pem", certificatesDataList.isEmpty() ? privateKey.get() : nullptr,
-             "private-key-pkcs11-uri", certificatesDataList.isEmpty() ? privateKeyPKCS11Uri.get() : nullptr,
-+#endif
-             nullptr)));
-         RELEASE_ASSERT(certificate);
-         issuer = certificate.get();
-@@ -101,6 +105,7 @@ std::optional<CertificateSummary> CertificateInfo::summary() const
-     if (!m_certificate)
-         return std::nullopt;
- 
-+#if GLIB_CHECK_VERSION(2, 69, 0)
-     CertificateSummary summaryInfo;
- 
-     GRefPtr<GDateTime> validNotBefore;
-@@ -125,6 +130,9 @@ std::optional<CertificateSummary> CertificateInfo::summary() const
-     }
- 
-     return summaryInfo;
-+#else
-+    return std::nullopt;
-+#endif
- }
- 
- } // namespace WebCore
-diff --git a/Source/WebKit/NetworkProcess/glib/DNSCache.cpp b/Source/WebKit/NetworkProcess/glib/DNSCache.cpp
-index db92010baabf..b717b734e8e8 100644
--- a/Source/WebKit/NetworkProcess/glib/DNSCache.cpp
-+++ b/Source/WebKit/NetworkProcess/glib/DNSCache.cpp
-@@ -50,9 +50,17 @@ DNSCache::DNSCacheMap& DNSCache::mapForType(Type type)
-     case Type::Default:
-         return m_dnsMap;
-     case Type::IPv4Only:
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-         return m_ipv4Map;
-+#else
-+        return m_dnsMap;
-+#endif
-     case Type::IPv6Only:
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-         return m_ipv6Map;
-+#else
-+        return m_dnsMap;
-+#endif
-     }
- 
-     RELEASE_ASSERT_NOT_REACHED();
-@@ -118,16 +126,20 @@ void DNSCache::removeExpiredResponsesFired()
- {
-     Locker locker { m_lock };
-     removeExpiredResponsesInMap(m_dnsMap);
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-     removeExpiredResponsesInMap(m_ipv4Map);
-     removeExpiredResponsesInMap(m_ipv6Map);
-+#endif
- }
- 
- void DNSCache::clear()
- {
-     Locker locker { m_lock };
-     m_dnsMap.clear();
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-     m_ipv4Map.clear();
-     m_ipv6Map.clear();
-+#endif
- }
- 
- } // namespace WebKit
-diff --git a/Source/WebKit/NetworkProcess/glib/DNSCache.h b/Source/WebKit/NetworkProcess/glib/DNSCache.h
-index 6aa530f44321..49aded549588 100644
--- a/Source/WebKit/NetworkProcess/glib/DNSCache.h
-+++ b/Source/WebKit/NetworkProcess/glib/DNSCache.h
-@@ -65,8 +65,10 @@ private:
- 
-     Lock m_lock;
-     DNSCacheMap m_dnsMap WTF_GUARDED_BY_LOCK(m_lock);
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-     DNSCacheMap m_ipv4Map;
-     DNSCacheMap m_ipv6Map;
-+#endif
-     RunLoop::Timer m_expiredTimer;
- };
- 
-diff --git a/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp b/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
-index 2752ff9cfc2c..7804e8b7a588 100644
--- a/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
-+++ b/Source/WebKit/NetworkProcess/glib/WebKitCachedResolver.cpp
-@@ -67,7 +67,9 @@ static Vector<GRefPtr<GInetAddress>> addressListGListToVector(GList* addressList
- 
- struct LookupAsyncData {
-     CString hostname;
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-     DNSCache::Type dnsCacheType { DNSCache::Type::Default };
-+#endif
- };
- WEBKIT_DEFINE_ASYNC_DATA_STRUCT(LookupAsyncData)
- 
-@@ -117,6 +119,7 @@ static GList* webkitCachedResolverLookupByNameFinish(GResolver* resolver, GAsync
-     return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
- }
- 
-+#if GLIB_CHECK_VERSION(2, 59, 0)
- static inline DNSCache::Type dnsCacheType(GResolverNameLookupFlags flags)
- {
-     // A cache is kept for each type of response to avoid the overcomplication of combining or filtering results.
-@@ -177,6 +180,7 @@ static GList* webkitCachedResolverLookupByNameWithFlagsFinish(GResolver* resolve
- 
-     return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
- }
-+#endif // GLIB_CHECK_VERSION(2, 59, 0)
- 
- static char* webkitCachedResolverLookupByAddress(GResolver* resolver, GInetAddress* address, GCancellable* cancellable, GError** error)
- {
-@@ -219,9 +223,11 @@ static void webkit_cached_resolver_class_init(WebKitCachedResolverClass* klass)
-     resolverClass->lookup_by_name = webkitCachedResolverLookupByName;
-     resolverClass->lookup_by_name_async = webkitCachedResolverLookupByNameAsync;
-     resolverClass->lookup_by_name_finish = webkitCachedResolverLookupByNameFinish;
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-     resolverClass->lookup_by_name_with_flags = webkitCachedResolverLookupByNameWithFlags;
-     resolverClass->lookup_by_name_with_flags_async = webkitCachedResolverLookupByNameWithFlagsAsync;
-     resolverClass->lookup_by_name_with_flags_finish = webkitCachedResolverLookupByNameWithFlagsFinish;
-+#endif
-     resolverClass->lookup_by_address = webkitCachedResolverLookupByAddress;
-     resolverClass->lookup_by_address_async = webkitCachedResolverLookupByAddressAsync;
-     resolverClass->lookup_by_address_finish = webkitCachedResolverLookupByAddressFinish;
-diff --git a/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp b/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp
-index 150d74ed0296..f461e3c695fe 100644
--- a/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp
-+++ b/Source/WebKit/NetworkProcess/glib/WebKitOverridingResolver.cpp
-@@ -90,6 +90,7 @@ static GList* webkitOverridingResolverLookupByNameFinish(GResolver* resolver, GA
-     return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
- }
- 
-+#if GLIB_CHECK_VERSION(2, 59, 0)
- static GList* createLoobackAddressList(WebKitOverridingResolver* resolver, GResolverNameLookupFlags flags)
- {
-     GList* list = nullptr;
-@@ -129,6 +130,7 @@ static GList* webkitOverridingResolverLookupByNameWithFlagsFinish(GResolver* res
- 
-     return static_cast<GList*>(g_task_propagate_pointer(G_TASK(result), error));
- }
-+#endif // GLIB_CHECK_VERSION(2, 59, 0)
- 
- static char* webkitOverridingResolverLookupByAddress(GResolver* resolver, GInetAddress* address, GCancellable* cancellable, GError** error)
- {
-@@ -166,9 +168,11 @@ static void webkit_overriding_resolver_class_init(WebKitOverridingResolverClass*
-     resolverClass->lookup_by_name = webkitOverridingResolverLookupByName;
-     resolverClass->lookup_by_name_async = webkitOverridingResolverLookupByNameAsync;
-     resolverClass->lookup_by_name_finish = webkitOverridingResolverLookupByNameFinish;
-+#if GLIB_CHECK_VERSION(2, 59, 0)
-     resolverClass->lookup_by_name_with_flags = webkitOverridingResolverLookupByNameWithFlags;
-     resolverClass->lookup_by_name_with_flags_async = webkitOverridingResolverLookupByNameWithFlagsAsync;
-     resolverClass->lookup_by_name_with_flags_finish = webkitOverridingResolverLookupByNameWithFlagsFinish;
-+#endif
-     resolverClass->lookup_by_address = webkitOverridingResolverLookupByAddress;
-     resolverClass->lookup_by_address_async = webkitOverridingResolverLookupByAddressAsync;
-     resolverClass->lookup_by_address_finish = webkitOverridingResolverLookupByAddressFinish;
-diff --git a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
-index a73466be12f1..9ab0cfb6f440 100644
--- a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
-+++ b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
-@@ -121,11 +121,13 @@ void ArgumentCoder<GRefPtr<GTlsCertificate>>::encode(Encoder& encoder, const GRe
- 
-     encoder << certificatesData;
- 
-+#if GLIB_CHECK_VERSION(2, 69, 0)
-     GRefPtr<GByteArray> privateKey;
-     GUniqueOutPtr<char> privateKeyPKCS11Uri;
-     g_object_get(certificate.get(), "private-key", &privateKey.outPtr(), "private-key-pkcs11-uri", &privateKeyPKCS11Uri.outPtr(), nullptr);
-     encoder << privateKey;
-     encoder << CString(privateKeyPKCS11Uri.get());
-+#endif
- }
- 
- std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>::decode(Decoder& decoder)
-@@ -138,6 +140,7 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
-     if (!certificatesData->size())
-         return GRefPtr<GTlsCertificate>();
- 
-+#if GLIB_CHECK_VERSION(2, 69, 0)
-     std::optional<GRefPtr<GByteArray>> privateKey;
-     decoder >> privateKey;
-     if (UNLIKELY(!privateKey))
-@@ -147,6 +150,7 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
-     decoder >> privateKeyPKCS11Uri;
-     if (UNLIKELY(!privateKeyPKCS11Uri))
-         return std::nullopt;
-+#endif
- 
-     GType certificateType = g_tls_backend_get_certificate_type(g_tls_backend_get_default());
-     GRefPtr<GTlsCertificate> certificate;
-@@ -156,8 +160,10 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
-             certificateType, nullptr, nullptr,
-             "certificate", certificateData.get(),
-             "issuer", issuer,
-+#if GLIB_CHECK_VERSION(2, 69, 0)
-             "private-key", i == certificatesData->size() - 1 ? privateKey->get() : nullptr,
-             "private-key-pkcs11-uri", i == certificatesData->size() - 1 ? privateKeyPKCS11Uri->data() : nullptr,
-+#endif
-             nullptr)));
-         issuer = certificate.get();
-     }
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 4a285e849cfd..0aca16c1d25f 100644
--- a/Source/cmake/OptionsGTK.cmake
-+++ b/Source/cmake/OptionsGTK.cmake
-@@ -205,6 +204,13 @@ else ()
-     SET_AND_EXPOSE_TO_BUILD(ENABLE_2022_GLIB_API OFF)
- endif ()
- 
-+if (ENABLE_2022_GLIB_API)
-+    set(GLIB_MINIMUM_VERSION 2.70.0)
-+else ()
-+    set(GLIB_MINIMUM_VERSION 2.56.4)
-+endif ()
-+find_package(GLIB ${GLIB_MINIMUM_VERSION} REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
-+
- EXPOSE_STRING_VARIABLE_TO_BUILD(WEBKITGTK_API_INFIX)
- EXPOSE_STRING_VARIABLE_TO_BUILD(WEBKITGTK_API_VERSION)
- 
-@@ -277,6 +283,11 @@ if (ENABLED_COMPILER_SANITIZERS)
-     set(ENABLE_DOCUMENTATION OFF)
- endif ()
- 
-+# GUri is available in GLib since version 2.66, but we only want to use it if version is >= 2.67.1.
-+if (PC_GLIB_VERSION VERSION_GREATER "2.67.1" OR PC_GLIB_VERSION STREQUAL "2.67.1")
-+    SET_AND_EXPOSE_TO_BUILD(HAVE_GURI 1)
-+endif ()
-+
- if (ENABLE_GAMEPAD)
-     find_package(Manette 0.2.4)
-     if (NOT Manette_FOUND)
-- 
-2.49.0
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 6c39538ba6fc..0a30e0c4c7c1 100644
--- a/Source/cmake/OptionsGTK.cmake
-+++ b/Source/cmake/OptionsGTK.cmake
-@@ -7,7 +7,6 @@ SET_PROJECT_VERSION(2 48 1)
- 
- set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
- 
-find_package(GLIB 2.70.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
- find_package(Cairo 1.14.0 REQUIRED)
- find_package(LibGcrypt 1.7.0 REQUIRED)
- find_package(Libtasn1 REQUIRED)
--- a/SOURCES/gstreamer-1.16.patch
+++ b/SOURCES/gstreamer-1.16.patch
@ -1,448 +0,0 @@
-From 08a5ccf6fc4a998ca1fb5aa13c314640dd95b874 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Fri, 4 Apr 2025 14:00:12 -0500
-Subject: [PATCH] Build against GStreamer 1.16
-
---
- .../AudioSourceProviderGStreamer.cpp          |  3 +-
- .../gstreamer/GLVideoSinkGStreamer.cpp        | 35 ++++-----
- .../gstreamer/GStreamerAudioMixer.cpp         |  2 +-
- .../graphics/gstreamer/GStreamerCommon.cpp    | 77 +++++++++++++------
- .../graphics/gstreamer/GStreamerCommon.h      | 16 ++++
- .../gstreamer/MediaPlayerPrivateGStreamer.cpp | 22 +-----
- .../gstreamer/GStreamerCodecUtilities.cpp     | 39 ++++++----
- .../VideoEncoderPrivateGStreamer.cpp          | 16 ----
- Source/cmake/GStreamerChecks.cmake            |  4 +-
- 9 files changed, 114 insertions(+), 100 deletions(-)
-
-diff --git a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
-index 0abdeb14826e..65763f3cfde3 100644
--- a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
-+++ b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
-@@ -124,7 +124,8 @@ AudioSourceProviderGStreamer::AudioSourceProviderGStreamer(MediaStreamTrackPriva
-     g_signal_connect_swapped(decodebin, "pad-added", G_CALLBACK(+[](AudioSourceProviderGStreamer* provider, GstPad* pad) {
-         auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr));
-         bool isAudio = doCapsHaveType(padCaps.get(), "audio");
-        RELEASE_ASSERT(isAudio);
-+        if (!isAudio)
-+            return;
- 
-         auto sinkPad = adoptGRef(gst_element_get_static_pad(provider->m_audioSinkBin.get(), "sink"));
-         gst_pad_link(pad, sinkPad.get());
-diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
-index 12fed2ed3b21..fe0d6c660f80 100644
--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
-@@ -65,16 +65,7 @@ static bool s_isDMABufDisabled;
- 
- static void initializeDMABufAvailability()
- {
-    static std::once_flag onceFlag;
-    std::call_once(onceFlag, [] {
-        if (!webkitGstCheckVersion(1, 20, 0))
-            return;
-
-        auto value = unsafeSpan(g_getenv("WEBKIT_GST_DMABUF_SINK_DISABLED"));
-        s_isDMABufDisabled = value.data() && (equalLettersIgnoringASCIICase(value, "true"_s) || equalLettersIgnoringASCIICase(value, "1"_s));
-        if (!s_isDMABufDisabled && !DRMDeviceManager::singleton().mainGBMDeviceNode(DRMDeviceManager::NodeType::Render))
-            s_isDMABufDisabled = true;
-    });
-+    s_isDMABufDisabled = true;
- }
- #endif
- 
-@@ -114,7 +105,19 @@ static void webKitGLVideoSinkConstructed(GObject* object)
-     if (!s_isDMABufDisabled)
-         gst_caps_append(caps.get(), buildDMABufCaps().leakRef());
- #endif
-    GRefPtr<GstCaps> glCaps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
-+    // Workaround until we can depend on GStreamer 1.16.2.
-+    // https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/8d32de090554cf29fe359f83aa46000ba658a693
-+    // Forcing a color conversion to RGBA here allows glupload to internally use
-+    // an uploader that adds a VideoMeta, through the TextureUploadMeta caps
-+    // feature, without needing the patch above. However this specific caps
-+    // feature is going to be removed from GStreamer so it is considered a
-+    // short-term workaround. This code path most likely will have a negative
-+    // performance impact on embedded platforms as well. Downstream embedders
-+    // are highly encouraged to cherry-pick the patch linked above in their BSP
-+    // and set the WEBKIT_GST_NO_RGBA_CONVERSION environment variable until
-+    // GStreamer 1.16.2 is released.
-+    // See also https://bugs.webkit.org/show_bug.cgi?id=201422
-+    GRefPtr<GstCaps> glCaps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) RGBA"));
-     gst_caps_set_features(glCaps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
-     gst_caps_append(caps.get(), glCaps.leakRef());
- 
-@@ -172,17 +175,11 @@ static GstStateChangeReturn webKitGLVideoSinkChangeState(GstElement* element, Gs
-     return GST_ELEMENT_CLASS(webkit_gl_video_sink_parent_class)->change_state(element, transition);
- }
- 
-static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GValue* value, GParamSpec* paramSpec)
-+static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GValue*, GParamSpec* paramSpec)
- {
-    WebKitGLVideoSink* sink = WEBKIT_GL_VIDEO_SINK(object);
-
-     switch (propertyId) {
-    case WEBKIT_GL_VIDEO_SINK_PROP_STATS: {
-        GUniqueOutPtr<GstStructure> stats;
-        g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
-        gst_value_set_structure(value, stats.get());
-+    case WEBKIT_GL_VIDEO_SINK_PROP_STATS:
-         break;
-    }
-     default:
-         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, paramSpec);
-         RELEASE_ASSERT_NOT_REACHED();
-diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
-index 8b30e0f14b6a..2d587f68a3b2 100644
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
-@@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY_STATIC(webkit_media_gst_audio_mixer_debug);
- 
- bool GStreamerAudioMixer::isAvailable()
- {
-    return isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer");
-+    return false;
- }
- 
- GStreamerAudioMixer& GStreamerAudioMixer::singleton()
-diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
-index 25c8abd3ec90..5ca712566cbd 100644
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
-@@ -132,6 +132,24 @@ GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTempl
- }
- 
- #if ENABLE(VIDEO)
-+#if !GST_CHECK_VERSION(1, 18, 0)
-+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint plane, gint components[GST_VIDEO_MAX_COMPONENTS])
-+{
-+    guint c, i = 0;
-+
-+    /* Reverse mapping of info->plane. */
-+    for (c = 0; c < GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info); c++) {
-+        if (GST_VIDEO_FORMAT_INFO_PLANE(info, c) == plane) {
-+            components[i] = c;
-+            i++;
-+        }
-+    }
-+
-+    for (c = i; c < GST_VIDEO_MAX_COMPONENTS; c++)
-+        components[c] = -1;
-+}
-+#endif
-+
- bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride)
- {
-     if (!doCapsHaveType(caps, GST_VIDEO_CAPS_TYPE_PREFIX)) {
-@@ -633,31 +651,6 @@ void deinitializeGStreamer()
-     teardownVideoEncoderSingleton();
-     teardownGStreamerImageDecoders();
- #endif
-
-    bool isLeaksTracerActive = false;
-    auto activeTracers = gst_tracing_get_active_tracers();
-    while (activeTracers) {
-        auto tracer = adoptGRef(GST_TRACER_CAST(activeTracers->data));
-        if (!isLeaksTracerActive && !g_strcmp0(G_OBJECT_TYPE_NAME(G_OBJECT(tracer.get())), "GstLeaksTracer"))
-            isLeaksTracerActive = true;
-        activeTracers = g_list_delete_link(activeTracers, activeTracers);
-    }
-
-    if (!isLeaksTracerActive)
-        return;
-
-    // Make sure there is no active pipeline left. Those might trigger deadlocks during gst_deinit().
-    {
-        Locker locker { s_activePipelinesMapLock };
-        for (auto& pipeline : activePipelinesMap().values()) {
-            GST_DEBUG("Pipeline %" GST_PTR_FORMAT " was left running. Forcing clean-up.", pipeline.get());
-            disconnectSimpleBusMessageCallback(pipeline.get());
-            gst_element_set_state(pipeline.get(), GST_STATE_NULL);
-        }
-        activePipelinesMap().clear();
-    }
-
-    gst_deinit();
- }
- 
- unsigned getGstPlayFlag(const char* nick)
-@@ -1358,6 +1351,36 @@ String gstStructureToJSONString(const GstStructure* structure)
-     return value->toJSONString();
- }
- 
-+#if !GST_CHECK_VERSION(1, 18, 0)
-+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement* element)
-+{
-+    g_return_val_if_fail(GST_IS_ELEMENT(element), GST_CLOCK_TIME_NONE);
-+
-+    auto baseTime = gst_element_get_base_time(element);
-+    if (!GST_CLOCK_TIME_IS_VALID(baseTime)) {
-+        GST_DEBUG_OBJECT(element, "Could not determine base time");
-+        return GST_CLOCK_TIME_NONE;
-+    }
-+
-+    auto clock = adoptGRef(gst_element_get_clock(element));
-+    if (!clock) {
-+        GST_DEBUG_OBJECT(element, "Element has no clock");
-+        return GST_CLOCK_TIME_NONE;
-+    }
-+
-+    auto clockTime = gst_clock_get_time(clock.get());
-+    if (!GST_CLOCK_TIME_IS_VALID(clockTime))
-+        return GST_CLOCK_TIME_NONE;
-+
-+    if (clockTime < baseTime) {
-+        GST_DEBUG_OBJECT(element, "Got negative current running time");
-+        return GST_CLOCK_TIME_NONE;
-+    }
-+
-+    return clockTime - baseTime;
-+}
-+#endif
-+
- GstClockTime webkitGstInitTime()
- {
-     return s_webkitGstInitTime;
-@@ -1415,6 +1438,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
-     case GST_VIDEO_TRANSFER_BT709:
-         colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt709;
-         break;
-+#if GST_CHECK_VERSION(1, 18, 0)
-     case GST_VIDEO_TRANSFER_BT601:
-         colorSpace.transfer = PlatformVideoTransferCharacteristics::Smpte170m;
-         break;
-@@ -1427,6 +1451,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
-     case GST_VIDEO_TRANSFER_BT2020_10:
-         colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_10bit;
-         break;
-+#endif
-     case GST_VIDEO_TRANSFER_BT2020_12:
-         colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_12bit;
-         break;
-@@ -1545,6 +1570,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
-         case PlatformVideoTransferCharacteristics::Bt709:
-             GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT709;
-             break;
-+#if GST_CHECK_VERSION(1, 18, 0)
-         case PlatformVideoTransferCharacteristics::Smpte170m:
-             GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT601;
-             break;
-@@ -1557,6 +1583,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
-         case PlatformVideoTransferCharacteristics::Bt2020_10bit:
-             GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
-             break;
-+#endif
-         case PlatformVideoTransferCharacteristics::Bt2020_12bit:
-             GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
-             break;
-diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
-index f332ddd0e040..217132050db0 100644
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
-+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
-@@ -64,6 +64,15 @@ inline bool webkitGstCheckVersion(guint major, guint minor, guint micro)
-     return true;
- }
- 
-+#if !GST_CHECK_VERSION(1, 18, 0)
-+// gst_video_format_info_component() is GStreamer 1.18 API, so for older versions we use a local
-+// vendored copy of the function.
-+#define GST_VIDEO_MAX_COMPONENTS 4
-+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]);
-+#endif
-+
-+#define gst_video_format_info_component webkitGstVideoFormatInfoComponent
-+
- #define GST_VIDEO_CAPS_TYPE_PREFIX  "video/"
- #define GST_AUDIO_CAPS_TYPE_PREFIX  "audio/"
- #define GST_TEXT_CAPS_TYPE_PREFIX   "text/"
-@@ -301,6 +310,13 @@ Vector<T> gstStructureGetArray(const GstStructure*, ASCIILiteral key);
- 
- String gstStructureToJSONString(const GstStructure*);
- 
-+#if !GST_CHECK_VERSION(1, 18, 0)
-+// gst_element_get_current_running_time() is GStreamer 1.18 API, so for older versions we use a local
-+// vendored copy of the function.
-+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement*);
-+#define gst_element_get_current_running_time webkitGstElementGetCurrentRunningTime
-+#endif
-+
- GstClockTime webkitGstInitTime();
- 
- PlatformVideoColorSpace videoColorSpaceFromCaps(const GstCaps*);
-diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-index 80fdb52a342c..30a535eb816b 100644
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-@@ -587,7 +587,6 @@ bool MediaPlayerPrivateGStreamer::doSeek(const SeekTarget& target, float rate)
- 
-     auto seekStart = toGstClockTime(startTime);
-     auto seekStop = toGstClockTime(endTime);
-    GST_DEBUG_OBJECT(pipeline(), "[Seek] Performing actual seek to %" GST_TIMEP_FORMAT " (endTime: %" GST_TIMEP_FORMAT ") at rate %f", &seekStart, &seekStop, rate);
-     return gst_element_seek(m_pipeline.get(), rate, GST_FORMAT_TIME, m_seekFlags, GST_SEEK_TYPE_SET, seekStart, GST_SEEK_TYPE_SET, seekStop);
- }
- 
-@@ -4153,26 +4152,7 @@ void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume
- 
- bool MediaPlayerPrivateGStreamer::updateVideoSinkStatistics()
- {
-    if (!m_videoSink)
-        return false;
-
-    GUniqueOutPtr<GstStructure> stats;
-    g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
-    if (!stats)
-        return false;
-
-    auto totalVideoFrames = gstStructureGet<uint64_t>(stats.get(), "rendered"_s);
-    auto droppedVideoFrames = gstStructureGet<uint64_t>(stats.get(), "dropped"_s);
-
-    if (!totalVideoFrames || !droppedVideoFrames)
-        return false;
-
-    // Caching is required so that metrics queries performed after EOS still return valid values.
-    if (*totalVideoFrames)
-        m_totalVideoFrames = *totalVideoFrames;
-    if (*droppedVideoFrames)
-        m_droppedVideoFrames = *droppedVideoFrames;
-    return true;
-+    return false;
- }
- 
- std::optional<VideoPlaybackQualityMetrics> MediaPlayerPrivateGStreamer::videoPlaybackQualityMetrics()
-diff --git a/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp b/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
-index 870570cf204a..cc41cdf8911c 100644
--- a/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
-+++ b/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
-@@ -256,9 +256,10 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> vpxCapsFromCodecString(cons
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT709;
-     else if (transfer == VPConfigurationTransferCharacteristics::BT_470_7_BG)
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_GAMMA28;
-    else if (transfer == VPConfigurationTransferCharacteristics::BT_601_7)
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT601;
-    else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_240)
-+    else if (transfer == VPConfigurationTransferCharacteristics::BT_601_7) {
-+        GST_WARNING("VPConfigurationTransferCharacteristics::BT_601_7 not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-+    } else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_240)
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE240M;
-     else if (transfer == VPConfigurationTransferCharacteristics::Linear)
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_GAMMA10;
-@@ -271,17 +272,21 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> vpxCapsFromCodecString(cons
-     else if (transfer == VPConfigurationTransferCharacteristics::IEC_61966_2_1) {
-         GST_WARNING("VPConfigurationTransferCharacteristics::IEC_61966_2_1 not supported");
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-    } else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_10bit)
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
-    else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_12bit)
-+    } else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_10bit) {
-+        GST_WARNING("VPConfigurationTransferCharacteristics::BT_2020_10bit not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-+    } else if (transfer == VPConfigurationTransferCharacteristics::BT_2020_12bit)
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
-    else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_2084)
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE2084;
-    else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_428_1) {
-+    else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_2084) {
-+        GST_WARNING("VPConfigurationTransferCharacteristics::SMPTE_ST_2084 not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-+    } else if (transfer == VPConfigurationTransferCharacteristics::SMPTE_ST_428_1) {
-         GST_WARNING("VPConfigurationTransferCharacteristics::SMPTE_ST_428_1 not supported");
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-    } else if (transfer == VPConfigurationTransferCharacteristics::BT_2100_HLG)
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_ARIB_STD_B67;
-+    } else if (transfer == VPConfigurationTransferCharacteristics::BT_2100_HLG) {
-+        GST_WARNING("VPConfigurationTransferCharacteristics::BT_2100_HLG not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-+    }
- 
-     auto matrix = parameters->matrixCoefficients;
-     if (matrix == VPConfigurationMatrixCoefficients::Identity)
-@@ -422,7 +427,8 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> av1CapsFromCodecString(cons
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_GAMMA28;
-         break;
-     case AV1ConfigurationTransferCharacteristics::BT_601_7:
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT601;
-+        GST_WARNING("AV1ConfigurationTransferCharacteristics::BT_601_7 not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-         break;
-     case AV1ConfigurationTransferCharacteristics::SMPTE_ST_240:
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE240M;
-@@ -446,20 +452,23 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> av1CapsFromCodecString(cons
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-         break;
-     case AV1ConfigurationTransferCharacteristics::BT_2020_10bit:
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
-+        GST_WARNING("AV1ConfigurationTransferCharacteristics::BT_2020_10bit not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-         break;
-     case AV1ConfigurationTransferCharacteristics::BT_2020_12bit:
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
-         break;
-     case AV1ConfigurationTransferCharacteristics::SMPTE_ST_2084:
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_SMPTE2084;
-+        GST_WARNING("AV1ConfigurationTransferCharacteristics::SMPTE_ST_2084 not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-         break;
-     case AV1ConfigurationTransferCharacteristics::SMPTE_ST_428_1:
-         GST_WARNING("AV1ConfigurationTransferCharacteristics::SMPTE_ST_428_1 not supported");
-         GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-         break;
-     case AV1ConfigurationTransferCharacteristics::BT_2100_HLG:
-        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_ARIB_STD_B67;
-+        GST_WARNING("AV1ConfigurationTransferCharacteristics::BT_2100_HLG not supported");
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
-         break;
-     };
- 
-diff --git a/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp b/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
-index d21b24cfe1ed..aa7492b14dd7 100644
--- a/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
-+++ b/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
-@@ -898,22 +898,6 @@ static void webkit_video_encoder_class_init(WebKitVideoEncoderClass* klass)
-                 "temporal-scalability-rate-decimator", decimators.get(),
-                 "temporal-scalability-target-bitrate", bitrates.get(), nullptr);
- 
-            if (layerFlags) {
-                GValue layerSyncFlagsValue G_VALUE_INIT;
-
-                g_value_init(&boolValue, G_TYPE_BOOLEAN);
-                gst_value_array_init(&layerSyncFlagsValue, layerSyncFlags.size());
-                for (auto& flag : layerSyncFlags) {
-                    g_value_set_boolean(&boolValue, flag);
-                    gst_value_array_append_value(&layerSyncFlagsValue, &boolValue);
-                }
-
-                g_object_set_property(G_OBJECT(encoder), "temporal-scalability-layer-sync-flags", &layerSyncFlagsValue);
-                g_value_unset(&layerSyncFlagsValue);
-                g_value_unset(&boolValue);
-                gst_util_set_object_arg(G_OBJECT(encoder), "temporal-scalability-layer-flags", layerFlags.characters());
-            }
-
-             ALLOW_DEPRECATED_DECLARATIONS_END;
-         });
- 
-diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
-index 27816a97ff26..94863212aee9 100644
--- a/Source/cmake/GStreamerChecks.cmake
-+++ b/Source/cmake/GStreamerChecks.cmake
-@@ -1,7 +1,7 @@
- if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO OR ENABLE_WEB_CODECS)
-     SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
-       if (USE_GSTREAMER_FULL)
-          find_package(GStreamer 1.18.4 REQUIRED COMPONENTS full)
-+          find_package(GStreamer 1.16.1 REQUIRED COMPONENTS full)
-           if (NOT PC_GSTREAMER_FULL_FOUND)
-               message(FATAL_ERROR "GStreamer static library libgstreamer-full-1.0 not found")
-           else ()
-@@ -25,7 +25,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO OR ENABLE_WEB_CODECS)
-               list(APPEND GSTREAMER_COMPONENTS webrtc)
-           endif ()
- 
-          find_package(GStreamer 1.18.4 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
-+          find_package(GStreamer 1.16.1 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
- 
-           if (ENABLE_WEB_AUDIO)
-               if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
-- 
-2.49.0
-
--- a/SOURCES/harfbuzz-1.7.5.patch
+++ b/SOURCES/harfbuzz-1.7.5.patch
@ -1,48 +0,0 @@
-diff --git a/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp b/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp
-index 8bc21b21976c..68654f602c92 100644
--- a/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp
-+++ b/Source/WebCore/platform/graphics/skia/SkiaHarfBuzzFont.cpp
-@@ -101,9 +101,10 @@ static HbUniquePtr<hb_face_t> createHarfBuzzFace(SkTypeface& typeface)
-             HbUniquePtr<hb_blob_t> blob(hb_blob_create(reinterpret_cast<const char*>(memory), size, HB_MEMORY_MODE_READONLY, stream.release(), [](void* data) {
-                 delete reinterpret_cast<SkStreamAsset*>(data);
-             }));
-            auto faceCount = hb_face_count(blob.get());
-            if (faceCount && static_cast<unsigned>(index) < faceCount)
-                return HbUniquePtr<hb_face_t>(hb_face_create(blob.get(), index));
-+            HbUniquePtr<hb_face_t> result(hb_face_create(blob.get(), index));
-+            HbUniquePtr<hb_face_t> empty(hb_face_get_empty());
-+            if (result.get() != empty.get())
-+                return result;
-         }
-     }
- 
-@@ -126,6 +127,7 @@ SkiaHarfBuzzFont::SkiaHarfBuzzFont(SkTypeface& typeface)
- {
-     auto hbFace = createHarfBuzzFace(typeface);
-     HbUniquePtr<hb_font_t> hbFont(hb_font_create(hbFace.get()));
-+    hb_ot_font_set_funcs(hbFont.get());
- 
-     if (int axisCount = typeface.getVariationDesignPosition(nullptr, 0)) {
-         Vector<SkFontArguments::VariationPosition::Coordinate> axisValues(axisCount);
-diff --git a/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp b/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
-index 065385774422..498994ff7aa7 100644
--- a/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
-+++ b/Source/ThirdParty/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
-@@ -277,13 +277,10 @@ HBFace create_hb_face(const SkTypeface& typeface) {
-         // hb_face_create always succeeds. Check that the format is minimally recognized first.
-         // hb_face_create_for_tables may still create a working hb_face.
-         // See https://github.com/harfbuzz/harfbuzz/issues/248 .
-        unsigned int num_hb_faces = hb_face_count(blob.get());
-        if (0 < num_hb_faces && (unsigned)index < num_hb_faces) {
-            face.reset(hb_face_create(blob.get(), (unsigned)index));
-            // Check the number of glyphs as a basic sanitization step.
-            if (face && hb_face_get_glyph_count(face.get()) == 0) {
-                face.reset();
-            }
-+        face.reset(hb_face_create(blob.get(), (unsigned)index));
-+        // Check the number of glyphs as a basic sanitization step.
-+        if (face && hb_face_get_glyph_count(face.get()) == 0) {
-+            face.reset();
-         }
-     }
-     if (!face) {
--- a/SOURCES/icu60.patch
+++ b/SOURCES/icu60.patch
--- a/SOURCES/s390x-build.patch
+++ b/SOURCES/s390x-build.patch
@ -1,13 +0,0 @@
-diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil.h b/Source/ThirdParty/ANGLE/src/common/mathutil.h
-index 8f4579dc5611..4d981d4427bc 100644
--- a/Source/ThirdParty/ANGLE/src/common/mathutil.h
-+++ b/Source/ThirdParty/ANGLE/src/common/mathutil.h
-@@ -550,7 +550,7 @@ inline R roundToNearest(T input)
- {
-     static_assert(std::is_floating_point<T>::value);
-     static_assert(std::numeric_limits<R>::is_integer);
-#if defined(__aarch64__) || defined(_M_ARM64)
-+#if defined(__aarch64__) || defined(_M_ARM64) || defined(__s390x__)
-     // On armv8, this expression is compiled to a dedicated round-to-nearest instruction
-     return static_cast<R>(std::round(input));
- #else
--- a/SOURCES/webkitgtk-2.44.3.tar.xz.asc
+++ b/SOURCES/webkitgtk-2.44.3.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAma7BpQACgkQbBAJtpOX
+U5PeIxAAhv6cl4WsiFyPuNQdzik1GdxtSuFxpBW9SokOxFPn4zW/sMIkke20q1et
+RhGwKskkuOEgavV/2grC07d8peFbsse6zTeerZECRaB+Saj7ZOWoZQoDbCTxWjzi
+yoxsziwIJA4LDdhqxV8TRSCl3bLy+uFQkUfNX1JJot9bMze+9lUjxJ/hAglCUjP8
+WIJdQ1mE+cJguBHJMfdZbDINLywRjesaLXAvTCmpnn3mn0GXMbCQM+W+GCybwhMB
+1dl8eFEfcvAhUe85mHJNW3WmYRzvquTMuFuLzU8b1U1/6+LQc+IOXAZEpkP9ztSn
+VItLwPnHJ/4g5KY+gUonMxZ1LMhTwiu/ga41Yez0sZftkC6tgIPIldaTY/tjeNLh
+C5GnMSyRTJ7d2ywLJSdzCIGkwhOJ7oHArGxbpzCWft3rrU8SbvQd3dGOMip1iniN
+ewdMyoqZQgzN51BRUklhjoBCaUkcVbgYr6qfLZiU42kR4RWgrTx/s//naCM4peQe
+8vGeRlF9zpsGw3ivCJBNjqk9SrqcPQ2i52lgKs28DkVy13duuQwKEMa+/Tv7eH60
+wNdKSRjeA81DLZkuyX5yJOEJ1pru1HiS4sdP112dPb1HajVhOehZJc7a8b9ohOH5
+go2lIxnJjZOXRHM/JwtTcLKsnfna1m6yzNGdOHNcLKPJodHcpXY=
+=jHOh
+-----END PGP SIGNATURE-----
--- a/SOURCES/webkitgtk-2.48.1.tar.xz.asc
+++ b/SOURCES/webkitgtk-2.48.1.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmftAf8ACgkQbBAJtpOX
-U5PdBg//TpfUIuSwl5OgwqsB8WNvrtCdGGwrYa3k9E9pp57KHLvlqNeDmToy/U9t
-gAOIUIyIxgVBRgJQrcQW/NfPx49jd3ISt9h54A0c/MgIb4+4vsvoRz3pwX407+QR
-7rZA72GA1im3u5+IWTGeeWzTGNQtvGbd1DzA6OpdvC0MRS2JAfYvgDHyAzaQu0Of
-JZdMrZlwoaMeZDTKI+qV/ZY2mZ59xiD0ltRU6X1B7/YS2MEsqztO7FFWO/xuhdps
-qIZF/jwuVfcGrI5JPVZzsf0V2RHmgF4j9rNEZwSxP8BkWfYQ+BjZI6gzKjVgDYED
-6D70tf0+q9UqSSYaX0Wk2+IqaNiO09md4nYZJ1I6VLz8sm6AZTB2XXiWxB3hEuFO
-j7Dk11I4DKPJjBHIQN/3kqutvRG5plyi4HIL2BzvnVstxrlTAocIFvhey1GOiLSu
-UfX97ruyNECpwMIafxCsqOVAjg4wkf6df0yCJVokNRBunnsQPABjDXfhS7dDvE3B
-6u2BIVudba2xEeMqqHZBrFAy4UXLcfJYnvvsBbPGFHibooCIuwd5VrTIVUE7bsI1
-QqEAlryx1grnyDN77aHri2bBK44aHMIix19kRgwdK8wcT3iz1vdUcgigcDYbD2Sc
-0LGzxB5OY+jd7zvSczqNCX6Ll7W7dIgjR60nuVl4+yYNnzSM+EM=
-=6kwl
-----END PGP SIGNATURE-----
--- a/SPECS/webkit2gtk3.spec
+++ b/SPECS/webkit2gtk3.spec
@ -3,14 +3,16 @@
 ## directory names (from the source tree) as prefixes for the files.
 %global add_to_license_files() \
        mkdir -p _license_files ; \
-        cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')-
+        cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')

-# There is a special buildroot required to build this package:
-# $ rhpkg build --target rhel-8.10.0-z-webkitgtk-stack-gate
+# No libmanette in RHEL
+%if !0%{?rhel}
+%global with_gamepad 1
+%endif

 Name:           webkit2gtk3
-Version:        2.48.1
-Release:        1%{?dist}
+Version:        2.44.3
+Release:        2%{?dist}
 Summary:        GTK Web content engine library

 License:        LGPLv2
@ -22,40 +24,14 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg

-##
-## Patches to support older build toolchain
-##
-
-Patch100:       compiler-flags.patch
-Patch101:       s390x-build.patch
-
-##
-## Patches to support older or missing build dependencies
-##
-
-Patch200:       cairo-1.15.patch
-Patch201:       glib-2.56.patch
-Patch202:       gstreamer-1.16.patch
-Patch203:       harfbuzz-1.7.5.patch
-Patch204:       icu60.patch
-
-##
-## Patches to support older Evolution
-##
-
-Patch300:       evolution-shared-secondary-process.patch
-Patch301:       evolution-sandbox-warning.patch
-
-##
-## Upstream patches to remove, hopefully after next update
-##
-
-Patch:          denormal-disabler-build.patch
+# https://bugs.webkit.org/show_bug.cgi?id=278113
+Patch0:         fix-wasm.patch

 BuildRequires:  bison
-BuildRequires:  clang
+BuildRequires:  bubblewrap
 BuildRequires:  cmake
 BuildRequires:  flex
+BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  git
 BuildRequires:  gnupg2
@ -73,16 +49,12 @@ BuildRequires:  ruby
 BuildRequires:  rubygems
 BuildRequires:  rubygem-json
 BuildRequires:  unifdef
+BuildRequires:  xdg-dbus-proxy

 BuildRequires:  pkgconfig(atspi-2)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(egl)
-%ifarch aarch64 s390x
-# On aarch64 and s390x enchant-2 is not available (gnome-less)
-BuildRequires:  pkgconfig(enchant)
-%else
 BuildRequires:  pkgconfig(enchant-2)
-%endif
 BuildRequires:  pkgconfig(epoxy)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
@ -97,6 +69,7 @@ BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libpcre)
@ -109,6 +82,9 @@ BuildRequires:  pkgconfig(libtasn1)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
+%if 0%{?with_gamepad}
+BuildRequires:  pkgconfig(manette-0.2)
+%endif
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
@ -117,6 +93,10 @@ BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(xt)

+# These are hard requirements of WebKit's bubblewrap sandbox.
+Requires:       bubblewrap
+Requires:       xdg-dbus-proxy
+
 # libepoxy will crash when WebKit tries using GLES2 if it's not installed.
 Requires:       libGLES

@ -127,6 +107,11 @@ Recommends:     geoclue2
 Recommends:     gstreamer1-plugins-bad-free
 Recommends:     gstreamer1-plugins-good

+# If no xdg-desktop-portal backend is installed, many features will be broken
+# inside the sandbox. In particular, the -gtk backend has to be installed for
+# desktop settings access, including font settings.
+Recommends:     xdg-desktop-portal-gtk
+
 # Obsolete libwebkit2gtk from the webkitgtk3 package
 Obsoletes:      libwebkit2gtk < 2.5.0
 Provides:       libwebkit2gtk = %{version}-%{release}
@ -138,8 +123,6 @@ Provides:       webkitgtk4 = %{version}-%{release}
 # GTK+ 2 plugins support was removed in 2.25.3
 Obsoletes:      webkit2gtk3-plugin-process-gtk2 < %{version}-%{release}
 Provides:       webkit2gtk3-plugin-process-gtk2 = %{version}-%{release}
-Obsoletes:      webkitgtk4-plugin-process-gtk2 < %{version}-%{release}
-Provides:       webkitgtk4-plugin-process-gtk2 = %{version}-%{release}

 # Don't build documentation anymore to avoid gi-docgen dependency
 Obsoletes:      webkit2gtk3-doc < %{version}-%{release}
@ -148,8 +131,6 @@ Provides:       webkit2gtk3-doc = %{version}-%{release}
 # We're supposed to specify versions here, but these libraries don't do
 # normal releases. Accordingly, they're not suitable to be system libs.
 Provides:       bundled(angle)
-Provides:       bundled(pdfjs)
-Provides:       bundled(skia)
 Provides:       bundled(xdgmime)

 # Require the jsc subpackage
@ -180,8 +161,6 @@ files for developing applications that use %{name}.
 Summary:        JavaScript engine from %{name}
 Obsoletes:      webkitgtk4-jsc < %{version}-%{release}
 Provides:       webkitgtk4-jsc = %{version}-%{release}
-Provides:       bundled(simde)
-Provides:       bundled(simdutf)

 %description    jsc
 This package contains JavaScript engine from %{name}.
@ -221,28 +200,29 @@ rm -rf Source/ThirdParty/qunit/
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif

-# -DUSE_SYSTEM_MALLOC=ON is really bad for security, but libpas requires
-# __atomic_compare_exchange_16 which is not available in RHEL 8.
+# Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to
+# support 64 KB page sizes until the *builders* use RHEL 9. This means we still
+# have to disable JIT and bmalloc, even though this disables important heap
+# security features. We can't simply disable them only during this build,
+# because gobject-introspection will crash when building anything that depends
+# on WebKitGTK, because it calls each object's get_type() function, which will
+# initialize bmalloc and JIT.
+
 %cmake \
  -GNinja \
  -DPORT=GTK \
  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_C_COMPILER=clang \
-  -DCMAKE_CXX_COMPILER=clang++ \
-  -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
-  -DENABLE_DOCUMENTATION=OFF \
-  -DENABLE_GAMEPAD=OFF \
  -DENABLE_JIT=OFF \
-  -DENABLE_SPEECH_SYNTHESIS=OFF \
-  -DENABLE_WEB_CODECS=OFF \
-  -DUSE_AVIF=OFF \
-  -DUSE_GSTREAMER_TRANSCODER=OFF \
  -DUSE_GTK4=OFF \
+  -DUSE_SOUP2=ON \
+  -DUSE_AVIF=OFF \
+  -DENABLE_DOCUMENTATION=OFF \
+  -DUSE_GSTREAMER_TRANSCODER=OFF \
  -DUSE_JPEGXL=OFF \
  -DUSE_LIBBACKTRACE=OFF \
-  -DUSE_SOUP2=ON \
-  -DUSE_SYSTEM_MALLOC=ON \
-  -DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \
+%if !0%{?with_gamepad}
+  -DENABLE_GAMEPAD=OFF \
+%endif
 %if 0%{?rhel}
 %ifarch aarch64
  -DUSE_64KB_PAGE_BLOCK=ON \
@ -317,271 +297,480 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir

 %changelog
-* Fri Apr 11 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.48.1-1
- Update to 2.48.1
+* Thu Aug 15 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.3-2
+- Add patch to fix WebAssembly
+  Resolves: RHEL-32578

-* Thu Mar 13 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.6-2
- Add patch for CVE-2025-24201
+* Tue Aug 13 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.3-1
+- Update to 2.44.3
+  Resolves: RHEL-32578

-* Tue Feb 25 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.6-1
- Update to 2.46.6
+* Thu May 16 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.2-1
+- Update to 2.44.2
+  Resolves: RHEL-32578

-* Wed Dec 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.5-1
- Update to 2.46.5
-
-* Mon Nov 25 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-2
- Add patch for CVE-2024-44309
-
-* Fri Nov 08 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-1
- Update to 2.46.3
+* Thu Apr 11 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.44.1-1
+- Update to 2.44.1
+  Resolves: RHEL-32578
+  Resolves: RHEL-29637 

 * Mon Feb 05 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.5-1
 - Update to 2.42.5
-  Resolves: RHEL-3961
+  Resolves: RHEL-3960

 * Fri Dec 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.4-1
 - Update to 2.42.4
-  Resolves: RHEL-3961
-  Resolves: RHEL-19365
+  Resolves: RHEL-3960
+  Resolves: RHEL-19366

 * Tue Dec 05 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.3-1
 - Update to 2.42.3
-  Resolves: RHEL-3961
+  Resolves: RHEL-3960

 * Fri Nov 10 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.2-1
 - Update to 2.42.2
-  Resolves: RHEL-3961
+  Resolves: RHEL-3960

 * Wed Sep 27 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.1-1
 - Update to 2.42.1
-  Resolves: RHEL-3961
+  Resolves: RHEL-3960

-* Wed Sep 20 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.0-1
+* Mon Sep 18 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.0-1
 - Upgrade to 2.42.0
-  Resolves: RHEL-3961
+  Resolves: RHEL-3960

 * Tue Aug 01 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.5-1
- Upgrade to 2.40.5. Also, disable JIT
-  Resolves: #2176269
-  Resolves: #2185742
-  Resolves: #2209728
-  Resolves: #2209745
-  Resolves: #2218649
-  Resolves: #2218651
-  Resolves: #2224611
+- Update to 2.40.5
+  Related: #2176270

-* Thu May 25 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.4
- Add patch for CVE-2023-28204
-  Resolves: #2209744
- Add patch for CVE-2023-32373
-  Resolves: #2209727
+* Fri Jul 21 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.4-1
+- Update to 2.40.4
+  Related: #2176270

-* Fri Apr 14 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.3
- Restore libwpe and wpebackend-fdo dependencies
-  Related: #2185741 (sort of)
+* Tue Jul 11 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.3-2
+- Disable JIT
+  Related: #2176270

-* Wed Apr 12 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.2
- Disable libwpe and wpebackend-fdo dependencies
-  Related: #2185741 (sort of)
+* Wed Jun 28 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.3-1
+- Update to 2.40.3
+  Related: #2176270

-* Tue Apr 11 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.1
- Add patch for CVE-2023-28205
-  Resolves: #2185741
+* Tue May 30 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.2-1
+- Update to 2.40.2
+  Related: #2176270
+
+* Thu May 04 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.1-1
+- Upgrade to 2.40.1
+  Resolves: #2176270

 * Wed Feb 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1
 - Update to 2.38.5
-  Related: #2127468
+  Related: #2127467

 * Thu Feb 02 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.4-1
 - Update to 2.38.4
-  Related: #2127468
+  Related: #2127467

 * Thu Dec 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.3-1
 - Update to 2.38.3
-  Related: #2127468
+  Related: #2127467

 * Fri Nov 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-1
 - Update to 2.38.2
-  Related: #2127468
+  Related: #2127467

-* Wed Nov 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-2
- Fix crashes on aarch64
-  Enable WPE renderer
-  Related: #2127468
+* Mon Oct 31 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-2
+- Fix use with aarch64 64 KiB page size
+  Related: #2127467

-* Thu Oct 27 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-1
+* Mon Oct 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-1
 - Update to 2.38.1
-  Related: #2127468
+  Resolves: #2127467

 * Wed Aug 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.7-1
 - Update to 2.36.7
-  Related: #2061994
+  Related: #2061996

 * Tue Aug 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.6-1
 - Update to 2.36.6
-  Related: #2061994
+  Related: #2061996

 * Tue Aug 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-2
 - Fix Eclipse after update to 2.36.5
-  Related: #2061994
+  Related: #2061996

 * Thu Jul 28 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-1
 - Update to 2.36.5
-  Related: #2061994
-  Resolves: #2099334
+  Related: #2061996

 * Tue Jul 05 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.4-1
 - Update to 2.36.4
-  Related: #2061994
+  Related: #2061996

 * Thu Jun 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.3-1
 - Update to 2.36.3
- Related: #2061994
- Resolves: #2092748
+- Related: #2061996
+- Resolves: #2092749

 * Wed May 18 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.2-1
 - Update to 2.36.2
-  Related: #2061994
+  Related: #2061996

 * Thu Apr 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.1-1
 - Update to 2.36.1
-  Related: #2061994
- Resolves: #2075492
- Resolves: #2075494
- Resolves: #2075496
+  Related: #2061996
+- Resolves: #2075493
+- Resolves: #2075495
+- Resolves: #2075497

 * Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
 - Update to 2.34.6
-  Related: #1985042
+  Related: #1985041
+- Resolves: #2037016
+- Resolves: #2037269

 * Wed Feb 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.5-1
 - Update to 2.34.5
- Related: #1985042
+  Related: #1985041

 * Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.4-1
 - Update to 2.34.4
- Resolves: #1985042
+  Related: #1985041

-* Tue Sep 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.4-1
- Update to 2.32.4
- Related: #1985042
- Resolves: #2006429
+* Wed Nov 24 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.2-1
+- Update to 2.34.2
+  Related: #1985041
+
+* Tue Oct 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.1-1
+- Update to 2.34.1
+  Related: #1985041
+
+* Wed Sep 29 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.0-1
+- Update to 2.34.0
+  Related: #1985041
+  Resolves: #2006423
+- Enable LTO
+  Resolves: #1990111
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.32.3-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

 * Fri Jul 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.3-1
 - Update to 2.32.3
- Related: #1937416
+- Related: #1947884
+
+* Fri Jul 16 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.2-2
+- Add missing GStreamer recommends
+  Resolves: #1972375

 * Tue Jul 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.2-1
 - Update to 2.32.2
- Related: #1937416
+  Related: #1947884

-* Mon May 10 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.1-1
+* Tue May 11 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.1-1
 - Update to 2.32.1
- Related: #1937416
+  Related: #1947884

-* Fri Apr 30 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-1
+* Wed May 05 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-4
+- Fix aarch64
+  Resolves: #1957265
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.32.0-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 2.32.0-2
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Fri Mar 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-1
 - Update to 2.32.0
- Related: #1937416
+
+* Fri Mar 12 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.91-1
+- Update to 2.31.91
+
+* Tue Mar 02 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.90-1
+- Update to 2.31.90
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 14 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-3
+- Fix multilib conflict in gir files
+
+* Wed Jan 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-2
+- Disable gamepad support in RHEL
+
+* Tue Jan 12 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-1
+- Update to 2.31.1

 * Tue Dec 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-1
 - Update to 2.30.4
- Related: #1883304

-* Wed Nov 25 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
+* Tue Nov 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
 - Update to 2.30.3
- Related: #1883304

-* Thu Oct 29 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-2
- Try to fix coverity build by disabling docs (thanks to Kamil Dudka <kdudka@redhat.com>!)
- Related: #1883304
+* Wed Nov 11 2020 Jeff Law <law@redhat.com> - 2.30.2-2
+- Fix bogus volatile caught by gcc-11

 * Mon Oct 26 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-1
 - Update to 2.30.2
- Related: #1883304

-* Tue Oct 20 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.1-1
+* Mon Sep 21 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.1-1
 - Update to 2.30.1
- Related: #1883304

-* Mon Aug 03 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.4-1
- Update to 2.28.4
- Related: #1817143
+* Fri Sep 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.0-1
+- Update to 2.30.0. Add patch for libwpe#59.

-* Thu May 21 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-2
- Related: rhbz#1817143 Properly remove webkit2gtk3-plugin-process-gtk2 package
+* Fri Sep 04 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.92-1
+- Update to 2.29.92

-* Thu May 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-1
- Resolves: rhbz#1817143 Update to 2.28.2
+* Mon Aug 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.91-1
+- Update to 2.29.91

-* Mon Oct 14 2019 Eike Rathke <erack@redhat.com> - 2.24.4-3
- Related: rhbz#1748890 Bump NVR
+* Wed Jul 29 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.4-1
+- Update to 2.29.4

-* Fri Sep 27 2019 Eike Rathke <erack@redhat.com> - 2.24.4-1
- Resolves: rhbz#1748890 Update to 2.24.4
+* Tue Jul 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.3-2
+- Drop some Requires to Recommends

-* Tue Jul 09 2019 Eike Rathke <erack@redhat.com> - 2.24.3-1
- Resolves: rhbz#1728277 Update to 2.24.3
+* Wed Jul 08 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.3-1
+- Update to 2.29.3

-* Wed May 22 2019 Eike Rathke <erack@redhat.com> - 2.24.2-2
- Related: rhbz#1696708 Use enchant instead of enchant-2 on aarch64 and s390x
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 2.29.2-2
+- Disable LTO

-* Tue May 21 2019 Eike Rathke <erack@redhat.com> - 2.24.2-1
- Resolves: rhbz#1696708 Rebase to 2.24.2
- Resolves: rhbz#1592271 Switch to Python 3 for build
+* Wed Jun 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.2-1
+- Update to 2.29.2

-* Tue Feb 12 2019 Eike Rathke <erack@redhat.com> - 2.22.6-1
- Resolves: rhbz#1676489 Update to 2.22.6
+* Mon May 18 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.1-1
+- Update to 2.29.1

-* Fri Jan 25 2019 Eike Rathke <erack@redhat.com> - 2.22.5-2
- Resolves: rhbz#1666984 Fix gigacage
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 2.28.2-3
+- Rebuild for ICU 67

-* Tue Dec 18 2018 Eike Rathke <erack@redhat.com> - 2.22.5-1
- Update to 2.22.5
+* Fri May 08 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-2
+- Fix garbage collection on ppc64le and s390x after upgrade to 2.28

-* Tue Oct 30 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-1
+* Fri Apr 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-1
+- Update to 2.28.2
+
+* Fri Apr 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-4
+- Actually reenable WPE renderer.
+
+* Fri Apr 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-3
+- Fix and reenable WPE renderer. Fix popup menus in X11.
+
+* Wed Apr 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-2
+- Disable WPE renderer again.
+
+* Mon Apr 13 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
+* Thu Apr 09 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-9
+- Reenable WPE renderer, seems to have mysteriously fixed itself.
+- Second attempt to fix ppc64le.
+
+* Tue Mar 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-8
+- Fix accelerated compositing mode with bubblewrap sandbox enabled
+- Fix JavaScriptCore on ppc64le
+
+* Mon Mar 16 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-7
+- Disable WPE renderer since it's busted, rhbz#1813993.
+- Use perl() syntax to denote perl dependencies.
+- Bump revision to maintain upgrade path
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-3
+- BuildRequires: perl-English
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-2
+- Rebuild with koji hopefully not broken this time?
+- Add perl-FindBin BuildRequires
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
+* Thu Feb 27 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
+* Mon Feb 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.90-2
+- Add GPG verification during prep
+
+* Mon Feb 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
+* Mon Feb 10 2020 Eike Rathke <erack@redhat.com> - 2.27.4-3
+- Resolves: rhbz#1800249 Fix FTBFS
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 10 2020 Eike Rathke <erack@redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
+* Wed Dec 04 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.27.3-2
+- Fix minor file and directory ownership issues, rhbz#1779754 and rhbz#1779772
+
+* Tue Nov 26 2019 Eike Rathke <erack@redhat.com> - 2.27.3-1
+- Resolves: rhbz#1776825 Update to 2.27.3
+
+* Sat Nov 02 2019 Pete Walter <pwalter@fedoraproject.org> - 2.27.2-2
+- Rebuild for ICU 65
+
+* Tue Oct 22 2019 Eike Rathke <erack@redhat.com> - 2.27.2-1
+- Resolves: rhbz#1764135 Update to 2.27.2
+
+* Fri Oct 04 2019 Eike Rathke <erack@redhat.com> - 2.27.1-1
+- Resolves: rhbz#1758590 Update to 2.27.1
+
+* Thu Sep 26 2019 Eike Rathke <erack@redhat.com> - 2.26.1-1
+- Resolves: rhbz#1754472 Update to 2.26.1
+
+* Thu Sep 19 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.26.0-3
+- Enable WPE renderer, resolves rhbz#1753730
+
+* Tue Sep 17 2019 Tomas Popela <tpopela@redhat.com> - 2.26.0-2
+- Backport fix for a crash when closing the view and HW acceleration is enabled
+- Resolves: rhbz#1750345
+- Backport fix for EGL_BAD_ALLOC
+- Resolves: rhbz#1751936
+
+* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 2.26.0-1
+- Update to 2.26.0
+
+* Wed Sep 04 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.25.92-2
+- Add patch to fix startup in X11 when not using gdm
+
+* Tue Sep 03 2019 Eike Rathke <erack@redhat.com> - 2.25.92-1
+- Resolves: rhbz#1748305 Update to 2.25.92
+
+* Fri Aug 02 2019 Eike Rathke <erack@redhat.com> - 2.25.4-1
+- Update to 2.25.4
+
+* Fri Jul 26 2019 Tomas Popela <tpopela@redhat.com> - 2.25.3-2
+- Follow-up fixes for the GTK2 plugins support removal
+- Fixes: rhbz#1733436
+
+* Tue Jul 23 2019 Eike Rathke <erack@redhat.com> - 2.25.3-1
+- Update to 2.25.3
+- This removes support for GTK 2 based NPAPI plugins (such as Adobe Flash)
+
+* Wed Jul 17 2019 Adam Williamson <awilliam@redhat.com> - 2.25.2-2
+- Backport fix for crasher that affects Evolution (bwo#199621)
+
+* Mon Jun 24 2019 Eike Rathke <erack@redhat.com> - 2.25.2-1
+- Update to 2.25.2
+
+* Thu Jun 06 2019 Eike Rathke <erack@redhat.com> - 2.25.1-1
+- Update to 2.25.1
+
+* Fri May 17 2019 Eike Rathke <erack@redhat.com> - 2.24.2-1
+- Update to 2.24.2
+
+* Tue Apr 09 2019 Eike Rathke <erack@redhat.com> - 2.24.1-1
+- Update to 2.24.1
+
+* Wed Mar 13 2019 Tomas Popela <tpopela@redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
+* Fri Mar 08 2019 Tomas Popela <tpopela@redhat.com> - 2.23.92-1
+- Update to 2.23.92
+- Switch to python3
+
+* Wed Feb 20 2019 Eike Rathke <erack@redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
+* Mon Feb 18 2019 Eike Rathke <erack@redhat.com> - 2.23.90-1
+- Update to 2.23.90
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.23.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 24 2019 Pete Walter <pwalter@fedoraproject.org> - 2.23.3-2
+- Rebuild for ICU 63
+
+* Mon Jan 14 2019 Eike Rathke <erack@redhat.com> - 2.23.3-1
+- Update to 2.23.3
+
+* Tue Nov 27 2018 Eike Rathke <erack@redhat.com> - 2.23.1-1
+- Update to 2.23.1
+
+* Thu Nov 22 2018 Tomáš Popela <tpopela@redhat.com> - 2.22.4-1
+- Update to 2.22.4
+
+* Thu Nov 01 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-2
+- Switch to using pkgconfig build requires
+- Switch to enchant-2
+- Resolves: rhbz#1631486
+
+* Mon Oct 29 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-1
 - Update to 2.22.3
- Resolves: rhbz#1641009

-* Mon Sep 24 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-1
+* Fri Oct 19 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-3
+- Fix WebProcess crash while printing
+- Resolves: rhbz#1639754
+
+* Tue Sep 25 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-2
+- Switch to Ninja:
+  -7 minutes on the x86_64
+  -11 minutes on ppc64le
+  -13 minutes on i686
+  -13 minutes on s390x
+  -10 minutes on armv7hl
+  -19 minutes on aarch64
+
+* Sun Sep 23 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-1
 - Update to 2.22.2
- Resolves: rhbz#1625602

 * Thu Sep 20 2018 Tomas Popela <tpopela@redhat.com> - 2.22.1-1
 - Update to 2.22.1
- Resolves: rhbz#1625602

-* Tue Sep 11 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-2
- Backport patches from RHEL 7
- Resolves: rhbz#1625602
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-3
+- Rebuilt against fixed atk (#1626575)

-* Wed Sep 05 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-1
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-2
+- Rebuilt for GNOME 3.30.0 megaupdate
+
+* Mon Sep 03 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-1
 - Update to 2.22.0
- Resolves: rhbz#1625602

-* Tue Jul 17 2018 Tomas Popela <tpopela@redhat.com> - 2.20.3-3
- Update the python2 patch
+* Thu Aug 30 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-2
+- Update the JSC build fix patch

-* Mon Jun 18 2018 Tomas Popela <tpopela@redhat.com> - 2.20.3-3
- Export the python2 env variable
- Resolves: rhbz#1592264
+* Wed Aug 29 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-1
+- Update to 2.21.92

-* Mon Jun 11 2018 Tomas Popela <tpopela@redhat.com> - 2.20.3-1
- Update to 2.20.3
+* Thu Aug 16 2018 Tomas Popela <tpopela@redhat.com> - 2.21.91-1
+- Update to 2.21.91

-* Thu May 24 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-4
+* Fri Jul 20 2018 Tomas Popela <tpopela@redhat.com> - 2.21.5-1
+- Update to 2.21.5
+
+* Mon Jul 16 2018 Tomas Popela <tpopela@redhat.com> - 2.21.4-4
+- Fix the broken build due to python2 changes
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 2.21.4-2
+- Rebuild for ICU 62
+
+* Tue Jun 12 2018 Tomas Popela <tpopela@redhat.com> - 2.21.4-1
+- Update to 2.21.4
+
+* Mon May 28 2018 Tomas Popela <tpopela@redhat.com> - 2.21.3-1
+- Update to 2.21.3
+
+* Thu May 24 2018 Tomas Popela <tpopela@redhat.com> - 2.21.2-2
 - Explicitly specify python2 over python and add python2 to BR

-* Tue May 22 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-3
- aarch64 on RHEL 8 does have a 64kb page size
- Resolves: rhbz#1578576
+* Mon May 21 2018 Tomas Popela <tpopela@redhat.com> - 2.21.2-1
+- Update to 2.21.2

-* Tue May 22 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-2
- Temporary disable JIT and BMalloc on aarch64 due to Gigacage problems
- Resolves: rhbz#1578576
+* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 2.21.1-2
+- Rebuild for ICU 61.1

-* Tue May 15 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-1
- Update to 2.20.2
- Resolves: rhbz#1577388
+* Wed Apr 18 2018 Tomas Popela <tpopela@redhat.com> - 2.21.1-1
+- Update to 2.21.1

 * Tue Apr 10 2018 Tomas Popela <tpopela@redhat.com> - 2.20.1-1
 - Update to 2.20.1