.gitignore

@@ -1,2 +1,75 @@
-SOURCES/webkitgtk-2.46.5.tar.xz
+/webkitgtk-2.19.5.tar.xz
-SOURCES/webkitgtk-keys.gpg
+/webkitgtk-2.19.6.tar.xz
+/webkitgtk-2.19.90.tar.xz
+/webkitgtk-2.19.91.tar.xz
+/webkitgtk-2.19.92.tar.xz
+/webkitgtk-2.20.0.tar.xz
+/webkitgtk-2.20.1.tar.xz
+/webkitgtk-2.20.2.tar.xz
+/webkitgtk-2.20.3.tar.xz
+/webkitgtk-2.22.0.tar.xz
+/webkitgtk-2.22.1.tar.xz
+/webkitgtk-2.22.2.tar.xz
+/webkitgtk-2.22.3.tar.xz
+/webkitgtk-2.22.5.tar.xz
+/webkitgtk-2.22.6.tar.xz
+/webkitgtk-2.24.2.tar.xz
+/webkitgtk-2.24.3.tar.xz
+/webkitgtk-2.24.4.tar.xz
+/webkitgtk-2.28.2.tar.xz
+/webkitgtk-2.28.4.tar.xz
+/webkitgtk-2.30.1.tar.xz
+/webkitgtk-2.30.2.tar.xz
+/webkitgtk-2.30.3.tar.xz
+/webkitgtk-2.30.4.tar.xz
+/webkitgtk-2.32.0.tar.xz
+/webkitgtk-2.32.1.tar.xz
+/webkitgtk-2.32.2.tar.xz
+/webkitgtk-2.32.3.tar.xz
+/webkitgtk-2.32.4.tar.xz
+/webkitgtk-2.34.4.tar.xz
+/webkitgtk-2.34.4.tar.xz.asc
+/webkitgtk-2.34.5.tar.xz
+/webkitgtk-2.34.5.tar.xz.asc
+/webkitgtk-2.34.6.tar.xz
+/webkitgtk-2.34.6.tar.xz.asc
+/webkitgtk-2.36.1.tar.xz
+/webkitgtk-2.36.1.tar.xz.asc
+/webkitgtk-2.36.2.tar.xz
+/webkitgtk-2.36.2.tar.xz.asc
+/webkitgtk-2.36.3.tar.xz
+/webkitgtk-2.36.3.tar.xz.asc
+/webkitgtk-2.36.4.tar.xz
+/webkitgtk-2.36.4.tar.xz.asc
+/webkitgtk-2.36.5.tar.xz
+/webkitgtk-2.36.5.tar.xz.asc
+/webkitgtk-2.36.6.tar.xz
+/webkitgtk-2.36.6.tar.xz.asc
+/webkitgtk-2.36.7.tar.xz
+/webkitgtk-2.36.7.tar.xz.asc
+/webkitgtk-2.38.1.tar.xz
+/webkitgtk-2.38.1.tar.xz.asc
+/webkitgtk-2.38.2.tar.xz
+/webkitgtk-2.38.2.tar.xz.asc
+/webkitgtk-2.38.3.tar.xz
+/webkitgtk-2.38.3.tar.xz.asc
+/webkitgtk-2.38.4.tar.xz
+/webkitgtk-2.38.4.tar.xz.asc
+/webkitgtk-2.38.5.tar.xz
+/webkitgtk-2.38.5.tar.xz.asc
+/webkitgtk-2.40.4.tar.xz
+/webkitgtk-2.40.4.tar.xz.asc
+/webkitgtk-2.40.5.tar.xz
+/webkitgtk-2.40.5.tar.xz.asc
+/webkitgtk-2.42.0.tar.xz
+/webkitgtk-2.42.0.tar.xz.asc
+/webkitgtk-2.42.1.tar.xz
+/webkitgtk-2.42.1.tar.xz.asc
+/webkitgtk-2.42.2.tar.xz
+/webkitgtk-2.42.2.tar.xz.asc
+/webkitgtk-2.42.3.tar.xz
+/webkitgtk-2.42.3.tar.xz.asc
+/webkitgtk-2.42.4.tar.xz.asc
+/webkitgtk-2.42.4.tar.xz
+/webkitgtk-2.42.5.tar.xz
+/webkitgtk-2.42.5.tar.xz.asc

.webkit2gtk3.metadata

@@ -1,2 +0,0 @@
-98f9cbfd8e801d74d0d2b69c3bdd59b017cf05fe SOURCES/webkitgtk-2.46.5.tar.xz
-04b10b8a486542c4551269c20b18b5c1c6cb4f94 SOURCES/webkitgtk-keys.gpg

SOURCES/cairo-1.15.patch

@@ -1,22 +0,0 @@
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 523177737358..9e714851a503 100644
---- a/Source/cmake/OptionsGTK.cmake
-+++ b/Source/cmake/OptionsGTK.cmake
-@@ -7,7 +7,7 @@ SET_PROJECT_VERSION(2 46 3)
- 
- set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
- 
--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 1.4.2 REQUIRED COMPONENTS ICU)
-@@ -142,7 +142,7 @@ 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_SPEECH_SYNTHESIS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
--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})

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 ()

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;
-             }
-         }

SOURCES/gstreamer-1.16.patch

@@ -1,448 +0,0 @@
-diff --git a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
-index 51547b0226c0..2ab2d0c8688c 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/DMABufUtilities.h b/Source/WebCore/platform/graphics/gstreamer/DMABufUtilities.h
-index da16adf3b556..7a78145f6228 100644
---- a/Source/WebCore/platform/graphics/gstreamer/DMABufUtilities.h
-+++ b/Source/WebCore/platform/graphics/gstreamer/DMABufUtilities.h
-@@ -53,12 +53,6 @@ inline uint32_t dmaBufFourccValue(GstVideoFormat format)
-         return uint32_t(DMABufFormat::FourCC::BGRA8888);
-     case GST_VIDEO_FORMAT_ABGR:
-         return uint32_t(DMABufFormat::FourCC::RGBA8888);
--    case GST_VIDEO_FORMAT_P010_10LE:
--    case GST_VIDEO_FORMAT_P010_10BE:
--        return uint32_t(DMABufFormat::FourCC::P010);
--    case GST_VIDEO_FORMAT_P016_LE:
--    case GST_VIDEO_FORMAT_P016_BE:
--        return uint32_t(DMABufFormat::FourCC::P016);
-     default:
-         break;
-     }
-diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
-index f8840e3e31e0..ce209d21fb69 100644
---- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
-@@ -88,7 +88,19 @@ static void webKitGLVideoSinkConstructed(GObject* object)
-     ASSERT(colorconvert);
-     gst_bin_add_many(GST_BIN_CAST(sink), upload, colorconvert, sink->priv->appSink.get(), nullptr);
- 
--    GRefPtr<GstCaps> caps = 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> caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) RGBA"));
-     gst_caps_set_features(caps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
-     g_object_set(sink->priv->appSink.get(), "caps", caps.get(), nullptr);
- 
-@@ -186,12 +198,8 @@ static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GVal
-     WebKitGLVideoSink* sink = WEBKIT_GL_VIDEO_SINK(object);
- 
-     switch (propertyId) {
--    case PROP_STATS: {
--        GUniqueOutPtr<GstStructure> stats;
--        g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
--        gst_value_set_structure(value, stats.get());
-+    case 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 a7392908eabd..4171e640de22 100644
---- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
-@@ -117,6 +117,24 @@ GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTempl
-     return pad;
- }
- 
-+#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
-+
- #if ENABLE(VIDEO)
- bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride)
- {
-@@ -566,31 +584,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)
-@@ -1239,6 +1232,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;
-@@ -1296,6 +1319,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;
-@@ -1308,6 +1332,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;
-@@ -1426,6 +1451,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;
-@@ -1438,6 +1464,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 f9f42a940a58..766ebaf45b38 100644
---- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
-+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
-@@ -57,6 +57,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/"
-@@ -287,6 +296,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 9b30c5cfac68..012241d680e3 100644
---- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-@@ -604,7 +604,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);
- }
- 
-@@ -4369,7 +4368,27 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
-         g_signal_connect_swapped(m_videoSink.get(), "repaint-cancelled", G_CALLBACK(repaintCancelledCallback), this);
-     }
- 
--    return m_videoSink.get();
-+    GstElement* videoSink = nullptr;
-+    m_fpsSink = makeGStreamerElement("fpsdisplaysink", "sink");
-+    if (m_fpsSink) {
-+        g_object_set(m_fpsSink.get(), "silent", TRUE , nullptr);
-+
-+        // Turn off text overlay unless tracing is enabled.
-+        if (gst_debug_category_get_threshold(webkit_media_player_debug) < GST_LEVEL_TRACE)
-+            g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
-+
-+        if (gstObjectHasProperty(m_fpsSink.get(), "video-sink")) {
-+            g_object_set(m_fpsSink.get(), "video-sink", m_videoSink.get(), nullptr);
-+            videoSink = m_fpsSink.get();
-+        } else
-+            m_fpsSink = nullptr;
-+    }
-+
-+    if (!m_fpsSink)
-+        videoSink = m_videoSink.get();
-+
-+    ASSERT(videoSink);
-+    return videoSink;
- }
- 
- void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume)
-@@ -4399,25 +4418,18 @@ 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)
-+    if (!m_videoSink || !m_fpsSink)
-         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;
-+    unsigned totalVideoFrames = 0;
-+    unsigned droppedVideoFrames = 0;
-+    g_object_get(m_fpsSink.get(), "frames-rendered", &totalVideoFrames, "frames-dropped", &droppedVideoFrames, nullptr);
- 
-     // Caching is required so that metrics queries performed after EOS still return valid values.
--    if (*totalVideoFrames)
--        m_totalVideoFrames = *totalVideoFrames;
--    if (*droppedVideoFrames)
--        m_droppedVideoFrames = *droppedVideoFrames;
-+    if (totalVideoFrames)
-+        m_totalVideoFrames = totalVideoFrames;
-+    if (droppedVideoFrames)
-+        m_droppedVideoFrames = droppedVideoFrames;
-     return true;
- }
- 
-diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
-index 687bb4648aef..53f1f7ab3dc9 100644
---- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
-+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
-@@ -637,6 +637,7 @@ private:
-     uint64_t m_networkReadPosition { 0 };
-     mutable uint64_t m_readPositionAtLastDidLoadingProgress { 0 };
- 
-+    GRefPtr<GstElement> m_fpsSink { nullptr };
-     uint64_t m_totalVideoFrames { 0 };
-     uint64_t m_droppedVideoFrames { 0 };
-     uint64_t m_decodedVideoFrames { 0 };
-diff --git a/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp b/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
-index c701a84d2316..ec4c4b24347c 100644
---- a/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
-+++ b/Source/WebCore/platform/gstreamer/GStreamerCodecUtilities.cpp
-@@ -256,7 +256,7 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> vpxCapsFromCodecString(cons
-     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;
-+        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)
-@@ -271,16 +271,16 @@ static std::pair<GRefPtr<GstCaps>, GRefPtr<GstCaps>> vpxCapsFromCodecString(cons
-         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;
-+        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;
-+        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;
-+        GST_VIDEO_INFO_COLORIMETRY(&info).transfer = GST_VIDEO_TRANSFER_UNKNOWN;
- 
-     auto matrix = parameters->matrixCoefficients;
-     if (matrix == VPConfigurationMatrixCoefficients::Identity)
-@@ -421,7 +421,7 @@ 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_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;
-@@ -445,20 +445,20 @@ 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_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_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_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 655115564aa2..82204d5ff6d4 100644
---- a/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
-+++ b/Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp
-@@ -754,7 +754,9 @@ static void webkit_video_encoder_class_init(WebKitVideoEncoderClass* klass)
-                 gst_util_set_object_arg(G_OBJECT(encoder), "end-usage", "cq");
-                 break;
-             };
--        }, [](GstElement* encoder, const WebKitVideoEncoderBitRateAllocation& bitRateAllocation) {
-+        }
-+#if 0
-+            , [](GstElement* encoder, const WebKitVideoEncoderBitRateAllocation& bitRateAllocation) {
-             // Allow usage of deprecated GValueArray API.
-             ALLOW_DEPRECATED_DECLARATIONS_BEGIN;
-             GUniquePtr<GValueArray> bitrates(g_value_array_new(3));
-@@ -887,7 +889,9 @@ static void webkit_video_encoder_class_init(WebKitVideoEncoderClass* klass)
-             }
- 
-             ALLOW_DEPRECATED_DECLARATIONS_END;
--        });
-+        }
-+#endif
-+    );
- 
-     Encoders::registerEncoder(Vp9, "vp9enc"_s, nullptr, "video/x-vp9"_s, nullptr,
-         [&](WebKitVideoEncoder* self) {
-diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
-index 63f183fa6e30..f26a924e9d02 100644
---- a/Source/cmake/GStreamerChecks.cmake
-+++ b/Source/cmake/GStreamerChecks.cmake
-@@ -1,7 +1,7 @@
- if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
-     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)
-               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)

SOURCES/harfbuzz-1.7.5.patch

@@ -1,26 +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);

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

SOURCES/webkitgtk-2.46.5.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmdil6QACgkQbBAJtpOX
-U5Nthg//RtCZwZ0GMb77nKhX+4lkb3aEghkx0Lug4akvISFIVZavgK3VWPHObV+T
-rA0OqDnlTWEDGkOCLvlmSBk0y9wpT5kdqr2vSNhcPPaZtE2dYLbSirWurkPVpq5u
-bsLlkp6Yf6/MGEt3sSbH9OVIfu++hkMrx136wuKe9NU/gP0NTiNz5T3Yn9OvtcaF
-g2FX2tAgiBXhXPvKGAWz4HiQBEEjhTtksxhQkC3gHkGXINpPTxH3wj2Tn0gJOb1u
-FBLZoEFKD0eklspl0Z0PyWReyn/WvEHTy41kCRENWACekZZUM4DS5fPW3lrEY5iu
-260NfK1cQ/T+RcBj3/btm0852PgWdUH81lQjKI0iDTdgvjEQQqkgC8LH4w2GW/V8
-TpkT/dghgqrVmlL2ZDrDcFurcieaOEkATqavuUzAWmsLQrh/+4HF1Djoz5yDakhT
-gogjkzV53Nj8e2atDoMA+vMLXYIXM0hRQ/MGyJF2lfMzTEgkfGtMfOTwMvFaLhGr
-PcwGMWDH2W6glQj3/gdJwr0tn4nHsLpxL60i/aaP3yHbncj/tkqY9rhA76kHVj1M
-Z7uSwspFG6J3ZtYT9kv1MbNeODdOw0q2erZhE5BpDMJuJ4m1qbsE3TqiED5C6jSg
-IMpYfteEZ4CSQYMmzFl8LrHU71lRyjeTfsJTA0CvHBBGLHsoz4o=
-=uvXQ
------END PGP SIGNATURE-----

cairo-1.15.patch

@@ -0,0 +1,36 @@
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index 526fe7cfe0cf..7650ea1bade2 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -13,7 +13,7 @@ endif ()
+ 
+ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
+ 
+-find_package(Cairo 1.16.0 REQUIRED)
++find_package(Cairo 1.14.0 REQUIRED)
+ find_package(Fontconfig 2.13.0 REQUIRED)
+ find_package(Freetype 2.9.0 REQUIRED)
+ find_package(LibGcrypt 1.6.0 REQUIRED)
+@@ -91,6 +91,14 @@ else ()
+     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
+ endif ()
+ 
++# Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
++if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
++    AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
++    AND ("${FREETYPE_VERSION_STRING}" VERSION_GREATER "2.9.0" OR "${FREETYPE_VERSION_STRING}" STREQUAL "2.9.0")
++    AND ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "1.4.2" OR "${PC_HARFBUZZ_VERSION}" STREQUAL "1.4.2"))
++    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
++endif ()
++
+ # Public options shared with other WebKit ports. Do not add any options here
+ # without approval from a GTK reviewer. There must be strong reason to support
+ # changing the value of the option.
+@@ -149,7 +157,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})

evolution-shared-secondary-process.patch

@@ -1,10 +1,10 @@
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-index 65cf0eb2b99a..518cc953edca 100644
+index a30f5b13be26..72ad006cde21 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)
+@@ -438,6 +438,9 @@ static void webkitWebContextConstructed(GObject* object)
      }
-     configuration.setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.span()));
+     configuration.setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.data(), priv->timeZoneOverride.length()));
  
 +    if (!g_strcmp0(g_get_prgname(), "evolution"))
 +        configuration.setUsesSingleWebProcess(true);

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

gstreamer-1.16.1.patch

@@ -0,0 +1,483 @@
+diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+index 77a0d6507240..353fb87900ba 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+@@ -479,7 +479,6 @@ bool MediaPlayerPrivateGStreamer::doSeek(const MediaTime& position, 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);
+ }
+ 
+@@ -3296,9 +3295,6 @@ static uint32_t fourccValue(GstVideoFormat format)
+     case GST_VIDEO_FORMAT_P010_10LE:
+     case GST_VIDEO_FORMAT_P010_10BE:
+         return uint32_t(DMABufFormat::FourCC::P010);
+-    case GST_VIDEO_FORMAT_P016_LE:
+-    case GST_VIDEO_FORMAT_P016_BE:
+-        return uint32_t(DMABufFormat::FourCC::P016);
+     default:
+         break;
+     }
+
+From bbc469a2b43531275243850693af65f5f7d11bc6 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 20 Sep 2023 13:07:44 -0500
+Subject: [PATCH 1/2] Revert GStreamer 1.18 dependency
+
+This reverts https://commits.webkit.org/263218@main
+---
+ .../AudioSourceProviderGStreamer.cpp          |  5 +-
+ .../gstreamer/GLVideoSinkGStreamer.cpp        | 11 ++--
+ .../gstreamer/GStreamerAudioMixer.cpp         |  2 +-
+ .../graphics/gstreamer/GStreamerCommon.cpp    | 52 +++++++++++++++++++
+ .../graphics/gstreamer/GStreamerCommon.h      | 16 ++++++
+ .../gstreamer/GStreamerRegistryScanner.cpp    |  9 +++-
+ .../gstreamer/MediaPlayerPrivateGStreamer.cpp | 46 +++++++++++++---
+ .../gstreamer/MediaPlayerPrivateGStreamer.h   |  1 +
+ Source/cmake/GStreamerChecks.cmake            |  2 +-
+ 9 files changed, 127 insertions(+), 17 deletions(-)
+
+diff --git a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
+index a97e6431802c..d8b1a1f4bd8b 100644
+--- a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
++++ b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
+@@ -122,7 +122,10 @@ 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 (webkitGstCheckVersion(1, 18, 0))
++            RELEASE_ASSERT(isAudio);
++        else 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 1a7480828861..f3a51be68534 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
+@@ -186,12 +186,13 @@ static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GVal
+     WebKitGLVideoSink* sink = WEBKIT_GL_VIDEO_SINK(object);
+ 
+     switch (propertyId) {
+-    case PROP_STATS: {
+-        GUniqueOutPtr<GstStructure> stats;
+-        g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
+-        gst_value_set_structure(value, stats.get());
++    case PROP_STATS:
++        if (webkitGstCheckVersion(1, 18, 0)) {
++            GUniqueOutPtr<GstStructure> stats;
++            g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
++            gst_value_set_structure(value, stats.get());
++        }
+         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 ad4b1ae3f77e..fb7e617b5d56 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 webkitGstCheckVersion(1, 18, 0) && isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer");
+ }
+ 
+ GStreamerAudioMixer& GStreamerAudioMixer::singleton()
+diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
+index 794beaa6932a..5f6b3826f182 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
+@@ -105,6 +105,24 @@ GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTempl
+     return pad;
+ }
+ 
++#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
++
+ #if ENABLE(VIDEO)
+ bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride)
+ {
+@@ -748,6 +766,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;
+@@ -805,6 +853,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;
+@@ -817,6 +866,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;
+@@ -935,6 +985,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;
+@@ -947,6 +998,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 fae7ef96d6c5..65ef4bfefdaa 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
++++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
+@@ -56,6 +56,15 @@ inline bool webkitGstCheckVersion(guint major, guint minor, guint micro)
+     return true;
+ }
+ 
++// gst_video_format_info_component() is GStreamer 1.18 API, so for older versions we use a local
++// vendored copy of the function.
++#if !GST_CHECK_VERSION(1, 18, 0)
++#define GST_VIDEO_MAX_COMPONENTS 4
++void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]);
++
++#define gst_video_format_info_component webkitGstVideoFormatInfoComponent
++#endif
++
+ #define GST_VIDEO_CAPS_TYPE_PREFIX  "video/"
+ #define GST_AUDIO_CAPS_TYPE_PREFIX  "audio/"
+ #define GST_TEXT_CAPS_TYPE_PREFIX   "text/"
+@@ -323,6 +332,13 @@ GstElement* makeGStreamerBin(const char* description, bool ghostUnlinkedPads);
+ 
+ String gstStructureToJSONString(const GstStructure*);
+ 
++// gst_element_get_current_running_time() is GStreamer 1.18 API, so for older versions we use a local
++// vendored copy of the function.
++#if !GST_CHECK_VERSION(1, 18, 0)
++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/GStreamerRegistryScanner.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
+index 7cd1926e6d15..032f086b43c0 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
+@@ -900,8 +900,13 @@ GStreamerRegistryScanner::CodecLookupResult GStreamerRegistryScanner::isAVC1Code
+         return checkH264Caps(makeString("video/x-h264, level=(string)", maxLevelString).utf8().data());
+     }
+ 
+-    GST_DEBUG("Checking video decoders for constrained caps");
+-    return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data());
++    if (webkitGstCheckVersion(1, 18, 0)) {
++        GST_DEBUG("Checking video decoders for constrained caps");
++        return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data());
++    }
++
++    GST_DEBUG("Falling back to unconstrained caps");
++    return checkH264Caps("video/x-h264");
+ }
+ 
+ const char* GStreamerRegistryScanner::configurationNameForLogging(Configuration configuration) const
+diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+index aad2c0bc432b..77a0d6507240 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+@@ -4114,7 +4114,29 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
+         g_signal_connect_swapped(m_videoSink.get(), "repaint-cancelled", G_CALLBACK(repaintCancelledCallback), this);
+     }
+ 
+-    return m_videoSink.get();
++    GstElement* videoSink = nullptr;
++    if (!webkitGstCheckVersion(1, 18, 0)) {
++        m_fpsSink = makeGStreamerElement("fpsdisplaysink", "sink");
++        if (m_fpsSink) {
++            g_object_set(m_fpsSink.get(), "silent", TRUE , nullptr);
++
++            // Turn off text overlay unless tracing is enabled.
++            if (gst_debug_category_get_threshold(webkit_media_player_debug) < GST_LEVEL_TRACE)
++                g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
++
++            if (gstObjectHasProperty(m_fpsSink.get(), "video-sink")) {
++                g_object_set(m_fpsSink.get(), "video-sink", m_videoSink.get(), nullptr);
++                videoSink = m_fpsSink.get();
++            } else
++                m_fpsSink = nullptr;
++        }
++    }
++
++    if (!m_fpsSink)
++        videoSink = m_videoSink.get();
++
++    ASSERT(videoSink);
++    return videoSink;
+ }
+ 
+ void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume)
+@@ -4147,16 +4169,26 @@ bool MediaPlayerPrivateGStreamer::updateVideoSinkStatistics()
+     if (!m_videoSink)
+         return false;
+ 
++    if (!webkitGstCheckVersion(1, 18, 0) && !m_fpsSink)
++        return false;
++
+     uint64_t totalVideoFrames = 0;
+     uint64_t droppedVideoFrames = 0;
+-    GUniqueOutPtr<GstStructure> stats;
+-    g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
++    if (webkitGstCheckVersion(1, 18, 0)) {
++        GUniqueOutPtr<GstStructure> stats;
++        g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
+ 
+-    if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames))
+-        return false;
++        if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames))
++            return false;
+ 
+-    if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames))
+-        return false;
++        if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames))
++            return false;
++    } else if (m_fpsSink) {
++        unsigned renderedFrames, droppedFrames;
++        g_object_get(m_fpsSink.get(), "frames-rendered", &renderedFrames, "frames-dropped", &droppedFrames, nullptr);
++        totalVideoFrames = renderedFrames;
++        droppedVideoFrames = droppedFrames;
++    }
+ 
+     // Caching is required so that metrics queries performed after EOS still return valid values.
+     if (totalVideoFrames)
+diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
+index e0cdb0a2d01f..f33a674481e1 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
+@@ -578,6 +578,7 @@ private:
+     uint64_t m_networkReadPosition { 0 };
+     mutable uint64_t m_readPositionAtLastDidLoadingProgress { 0 };
+ 
++    GRefPtr<GstElement> m_fpsSink { nullptr };
+     uint64_t m_totalVideoFrames { 0 };
+     uint64_t m_droppedVideoFrames { 0 };
+     uint64_t m_decodedVideoFrames { 0 };
+diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
+index 5380617afc9c..8774f1d2aca8 100644
+--- a/Source/cmake/GStreamerChecks.cmake
++++ b/Source/cmake/GStreamerChecks.cmake
+@@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
+               list(APPEND GSTREAMER_COMPONENTS webrtc)
+           endif ()
+ 
+-          find_package(GStreamer 1.18.4 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
++          find_package(GStreamer 1.16.2 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
+ 
+           if (ENABLE_WEB_AUDIO)
+               if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
+-- 
+2.41.0
+
+From 9046961d80cc168aab253e3e0eda2268bd956293 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Wed, 20 Sep 2023 13:09:28 -0500
+Subject: [PATCH 2/2] Revert GStreamer 1.16 dependency
+
+This (mostly) reverts https://commits.webkit.org/256284@main
+---
+ .../gstreamer/GLVideoSinkGStreamer.cpp        | 20 ++++++++++++++++++-
+ .../gstreamer/eme/GStreamerEMEUtilities.h     | 10 ++++++++++
+ ...bKitCommonEncryptionDecryptorGStreamer.cpp |  7 +++++--
+ Source/cmake/GStreamerChecks.cmake            |  2 +-
+ 4 files changed, 35 insertions(+), 4 deletions(-)
+
+diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
+index f3a51be68534..bf8ebeda1725 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
+@@ -88,7 +88,25 @@ static void webKitGLVideoSinkConstructed(GObject* object)
+     ASSERT(colorconvert);
+     gst_bin_add_many(GST_BIN_CAST(sink), upload, colorconvert, sink->priv->appSink.get(), nullptr);
+ 
+-    GRefPtr<GstCaps> caps = 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> caps;
++    if (webkitGstCheckVersion(1, 16, 2) || getenv("WEBKIT_GST_NO_RGBA_CONVERSION"))
++        caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
++    else {
++        GST_INFO_OBJECT(sink, "Forcing RGBA as GStreamer is not new enough.");
++        caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) RGBA"));
++    }
+     gst_caps_set_features(caps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
+     g_object_set(sink->priv->appSink.get(), "caps", caps.get(), nullptr);
+ 
+diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
+index 6dbf6a67dfd1..184c5c3e5f77 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
++++ b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
+@@ -61,8 +61,10 @@ public:
+     const String& systemId() const { return m_systemId; }
+     String payloadContainerType() const
+     {
++#if GST_CHECK_VERSION(1, 16, 0)
+         if (m_systemId == GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s)
+             return "webm"_s;
++#endif
+         return "cenc"_s;
+     }
+ 
+@@ -111,8 +113,10 @@ public:
+     static constexpr auto s_WidevineKeySystem = "com.widevine.alpha"_s;
+     static constexpr auto s_PlayReadyUUID = WEBCORE_GSTREAMER_EME_UTILITIES_PLAYREADY_UUID ""_s;
+     static constexpr std::array<ASCIILiteral, 2> s_PlayReadyKeySystems = { "com.microsoft.playready"_s,  "com.youtube.playready"_s };
++#if GST_CHECK_VERSION(1, 16, 0)
+     static constexpr auto s_unspecifiedUUID = GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s;
+     static constexpr auto s_unspecifiedKeySystem = GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s;
++#endif
+ 
+     static bool isClearKeyKeySystem(const String& keySystem)
+     {
+@@ -144,6 +148,7 @@ public:
+         return equalIgnoringASCIICase(uuid, s_PlayReadyUUID);
+     }
+ 
++#if GST_CHECK_VERSION(1, 16, 0)
+     static bool isUnspecifiedKeySystem(const String& keySystem)
+     {
+         return equalIgnoringASCIICase(keySystem, s_unspecifiedKeySystem);
+@@ -153,6 +158,7 @@ public:
+     {
+         return equalIgnoringASCIICase(uuid, s_unspecifiedUUID);
+     }
++#endif
+ 
+     static const char* keySystemToUuid(const String& keySystem)
+     {
+@@ -165,8 +171,10 @@ public:
+         if (isPlayReadyKeySystem(keySystem))
+             return s_PlayReadyUUID;
+ 
++#if GST_CHECK_VERSION(1, 16, 0)
+         if (isUnspecifiedKeySystem(keySystem))
+             return s_unspecifiedUUID;
++#endif
+ 
+         ASSERT_NOT_REACHED();
+         return { };
+@@ -183,8 +191,10 @@ public:
+         if (isPlayReadyUUID(uuid))
+             return s_PlayReadyKeySystems[0];
+ 
++#if GST_CHECK_VERSION(1, 16, 0)
+         if (isUnspecifiedUUID(uuid))
+             return s_unspecifiedKeySystem;
++#endif
+ 
+         ASSERT_NOT_REACHED();
+         return ""_s;
+diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
+index 0cde37e1f83f..a7bbf7fc569c 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
+@@ -171,8 +171,11 @@ static GstCaps* transformCaps(GstBaseTransform* base, GstPadDirection direction,
+ 
+                 // GST_PROTECTION_UNSPECIFIED_SYSTEM_ID was added in the GStreamer
+                 // developement git master which will ship as version 1.16.0.
+-                gst_structure_set_name(outgoingStructure.get(), !g_strcmp0(klass->protectionSystemId(self),
+-                    GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) ? "application/x-webm-enc" : "application/x-cenc");
++                gst_structure_set_name(outgoingStructure.get(),
++#if GST_CHECK_VERSION(1, 16, 0)
++                    !g_strcmp0(klass->protectionSystemId(self), GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) ? "application/x-webm-enc" :
++#endif
++                    "application/x-cenc");
+             }
+         }
+ 
+diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
+index 8774f1d2aca8..d43093ec7824 100644
+--- a/Source/cmake/GStreamerChecks.cmake
++++ b/Source/cmake/GStreamerChecks.cmake
+@@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
+               list(APPEND GSTREAMER_COMPONENTS webrtc)
+           endif ()
+ 
+-          find_package(GStreamer 1.16.2 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
++          find_package(GStreamer 1.14.0 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
+ 
+           if (ENABLE_WEB_AUDIO)
+               if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
+-- 
+2.41.0
+

i686-build.patch

@@ -0,0 +1,16 @@
+From: Alberto Garcia <berto@igalia.com>
+Subject: Fix FTBFS in i386
+Bug: https://bugs.webkit.org/show_bug.cgi?id=268739
+Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+===================================================================
+--- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
++++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc
+     UNUSED_VARIABLE(t2);
+     UNUSED_VARIABLE(t3);
+     UNUSED_VARIABLE(t5);
+-    UNUSED_VARIABLE(t6);
+-    UNUSED_VARIABLE(t7);
+ 
+     struct StackPointerScope {
+         StackPointerScope(CLoopStack& stack)

icu60.patch

@@ -1,5 +1,5 @@
 diff --git a/Source/JavaScriptCore/runtime/IntlCache.cpp b/Source/JavaScriptCore/runtime/IntlCache.cpp
-index 0941a7278e2a..75134587adbb 100644
+index b17d7340df56..94a5474059b6 100644
 --- a/Source/JavaScriptCore/runtime/IntlCache.cpp
 +++ b/Source/JavaScriptCore/runtime/IntlCache.cpp
 @@ -26,6 +26,7 @@
@@ -7,10 +7,10 @@ index 0941a7278e2a..75134587adbb 100644
  #include "IntlCache.h"
  
 +#include "IntlDisplayNames.h"
- #include <wtf/TZoneMallocInlines.h>
  #include <wtf/Vector.h>
  
-@@ -56,6 +57,7 @@ Vector<UChar, 32> IntlCache::getBestDateTimePattern(const CString& locale, std::
+ namespace JSC {
+@@ -53,6 +54,7 @@ Vector<UChar, 32> IntlCache::getBestDateTimePattern(const CString& locale, const
      return patternBuffer;
  }
  
@@ -18,7 +18,7 @@ index 0941a7278e2a..75134587adbb 100644
  Vector<UChar, 32> IntlCache::getFieldDisplayName(const CString& locale, UDateTimePatternField field, UDateTimePGDisplayWidth width, UErrorCode& status)
  {
      auto sharedGenerator = getSharedPatternGenerator(locale, status);
-@@ -67,5 +69,6 @@ Vector<UChar, 32> IntlCache::getFieldDisplayName(const CString& locale, UDateTim
+@@ -64,5 +66,6 @@ Vector<UChar, 32> IntlCache::getFieldDisplayName(const CString& locale, UDateTim
          return { };
      return buffer;
  }
@@ -26,7 +26,7 @@ index 0941a7278e2a..75134587adbb 100644
  
  } // namespace JSC
 diff --git a/Source/JavaScriptCore/runtime/IntlCache.h b/Source/JavaScriptCore/runtime/IntlCache.h
-index 4c818fd59424..2c7e464a6955 100644
+index 058b2423786d..e7a8c82f392b 100644
 --- a/Source/JavaScriptCore/runtime/IntlCache.h
 +++ b/Source/JavaScriptCore/runtime/IntlCache.h
 @@ -25,6 +25,7 @@
@@ -36,11 +36,11 @@ index 4c818fd59424..2c7e464a6955 100644
 +#include "IntlDisplayNames.h"
  #include <unicode/udatpg.h>
  #include <wtf/Noncopyable.h>
- #include <wtf/TZoneMalloc.h>
+ #include <wtf/text/CString.h>
-@@ -40,7 +41,9 @@ public:
+@@ -39,7 +40,9 @@ public:
      IntlCache() = default;
  
-     Vector<UChar, 32> getBestDateTimePattern(const CString& locale, std::span<const UChar> skeleton, UErrorCode&);
+     Vector<UChar, 32> getBestDateTimePattern(const CString& locale, const UChar* skeleton, unsigned skeletonSize, UErrorCode&);
 +#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
      Vector<UChar, 32> getFieldDisplayName(const CString& locale, UDateTimePatternField, UDateTimePGDisplayWidth, UErrorCode&);
 +#endif
@@ -48,7 +48,7 @@ index 4c818fd59424..2c7e464a6955 100644
  private:
      UDateTimePatternGenerator* getSharedPatternGenerator(const CString& locale, UErrorCode& status)
 diff --git a/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp b/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
-index 2af8cdd5cfa9..c78c94e5e054 100644
+index ed8dd34fdf44..9ec789b65413 100644
 --- a/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
 +++ b/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
 @@ -104,6 +104,7 @@ void IntlDisplayNames::initializeDisplayNames(JSGlobalObject* globalObject, JSVa
@@ -109,10 +109,10 @@ index 2101c342865e..87a95a26f55c 100644
  
  enum class RelevantExtensionKey : uint8_t;
 diff --git a/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp b/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
-index 1423760a9593..d15f4db69c47 100644
+index fdcaa71f2011..f6aa1b0e3def 100644
 --- a/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
 +++ b/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
-@@ -42,7 +42,6 @@
+@@ -41,7 +41,6 @@
  #endif
  #endif
  #include <unicode/ulistformatter.h>
@@ -120,7 +120,7 @@ index 1423760a9593..d15f4db69c47 100644
  #include <unicode/ures.h>
  #if HAVE(ICU_U_LIST_FORMATTER)
  #define U_HIDE_DRAFT_API 1
-@@ -50,6 +49,7 @@
+@@ -49,6 +48,7 @@
  
  #if HAVE(ICU_U_LIST_FORMATTER)
  #include <unicode/uformattedvalue.h>
@@ -129,10 +129,10 @@ index 1423760a9593..d15f4db69c47 100644
  
  namespace JSC {
 diff --git a/Source/JavaScriptCore/runtime/IntlObject.cpp b/Source/JavaScriptCore/runtime/IntlObject.cpp
-index 5850a14d8876..ca4f8b3ca79a 100644
+index cba15c79bc45..9553eb6b263b 100644
 --- a/Source/JavaScriptCore/runtime/IntlObject.cpp
 +++ b/Source/JavaScriptCore/runtime/IntlObject.cpp
-@@ -166,7 +166,6 @@ namespace JSC {
+@@ -165,7 +165,6 @@ namespace JSC {
    supportedValuesOf     intlObjectFuncSupportedValuesOf              DontEnum|Function 1
    Collator              createCollatorConstructor                    DontEnum|PropertyCallback
    DateTimeFormat        createDateTimeFormatConstructor              DontEnum|PropertyCallback
@@ -140,7 +140,7 @@ index 5850a14d8876..ca4f8b3ca79a 100644
    Locale                createLocaleConstructor                      DontEnum|PropertyCallback
    NumberFormat          createNumberFormatConstructor                DontEnum|PropertyCallback
    PluralRules           createPluralRulesConstructor                 DontEnum|PropertyCallback
-@@ -254,6 +253,11 @@ void IntlObject::finishCreation(VM& vm, JSGlobalObject*)
+@@ -253,6 +252,11 @@ void IntlObject::finishCreation(VM& vm, JSGlobalObject*)
      Base::finishCreation(vm);
      ASSERT(inherits(info()));
      JSC_TO_STRING_TAG_WITHOUT_TRANSITION();
@@ -150,54 +150,18 @@ index 5850a14d8876..ca4f8b3ca79a 100644
 +    UNUSED_PARAM(&createDisplayNamesConstructor);
 +#endif
  #if HAVE(ICU_U_LIST_FORMATTER)
-     putDirectWithoutTransition(vm, vm.propertyNames->DurationFormat, createDurationFormatConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
+     if (Options::useIntlDurationFormat())
-     putDirectWithoutTransition(vm, vm.propertyNames->ListFormat, createListFormatConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
+         putDirectWithoutTransition(vm, vm.propertyNames->DurationFormat, createDurationFormatConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
 diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 523177737358..3606076882f3 100644
+index 526fe7cfe0cf..7b057f87b67e 100644
 --- a/Source/cmake/OptionsGTK.cmake
 +++ b/Source/cmake/OptionsGTK.cmake
-@@ -11,7 +11,7 @@ find_package(Cairo 1.16.0 REQUIRED)
+@@ -18,7 +18,7 @@ find_package(Fontconfig 2.13.0 REQUIRED)
- find_package(LibGcrypt 1.7.0 REQUIRED)
+ find_package(Freetype 2.9.0 REQUIRED)
- find_package(Libtasn1 REQUIRED)
+ find_package(LibGcrypt 1.6.0 REQUIRED)
  find_package(HarfBuzz 1.4.2 REQUIRED COMPONENTS ICU)
 -find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
 +find_package(ICU 60 REQUIRED COMPONENTS data i18n uc)
  find_package(JPEG REQUIRED)
- find_package(Epoxy 1.5.4 REQUIRED)
+ find_package(LibEpoxy 1.4.0 REQUIRED)
  find_package(LibXml2 2.8.0 REQUIRED)
-diff --git a/Source/WTF/wtf/unicode/UTF8Conversion.cpp b/Source/WTF/wtf/unicode/UTF8Conversion.cpp
-index f903eb1038c2..1014974bd8ae 100644
---- a/Source/WTF/wtf/unicode/UTF8Conversion.cpp
-+++ b/Source/WTF/wtf/unicode/UTF8Conversion.cpp
-@@ -49,14 +49,18 @@ template<> char32_t next<Replacement::None, LChar>(std::span<const LChar> charac
- template<> char32_t next<Replacement::None, char8_t>(std::span<const char8_t> characters, size_t& offset)
- {
-     char32_t character;
--    U8_NEXT(characters, offset, characters.size(), character);
-+    int32_t narrowedOffset = offset;
-+    U8_NEXT(characters.data(), narrowedOffset, static_cast<int32_t>(characters.size()), character);
-+    offset = narrowedOffset;
-     return U_IS_SURROGATE(character) ? sentinelCodePoint : character;
- }
- 
- template<> char32_t next<Replacement::ReplaceInvalidSequences, char8_t>(std::span<const char8_t> characters, size_t& offset)
- {
-     char32_t character;
--    U8_NEXT_OR_FFFD(characters, offset, characters.size(), character);
-+    int32_t narrowedOffset = offset;
-+    U8_NEXT_OR_FFFD(characters.data(), narrowedOffset, static_cast<int32_t>(characters.size()), character);
-+    offset = narrowedOffset;
-     return character;
- }
- 
-@@ -77,7 +81,9 @@ template<> char32_t next<Replacement::ReplaceInvalidSequences, char16_t>(std::sp
- template<> bool append<Replacement::None, char8_t>(std::span<char8_t> characters, size_t& offset, char32_t character)
- {
-     UBool sawError = false;
--    U8_APPEND(characters, offset, characters.size(), character, sawError);
-+    int32_t narrowedOffset = offset;
-+    U8_APPEND((uint8_t*)characters.data(), narrowedOffset, static_cast<int32_t>(characters.size()), character, sawError);
-+    offset = narrowedOffset;
-     return sawError;
- }
-

rpminspect.yaml

@@ -0,0 +1,6 @@
+---
+inspections:
+    abidiff: off
+    changedfiles: off
+    filesize: off
+    lostpayload: off

sources

@@ -0,0 +1,2 @@
+SHA512 (webkitgtk-2.42.5.tar.xz) = 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0
+SHA512 (webkitgtk-2.42.5.tar.xz.asc) = 9de7c3f7c75319e7d9a37cdf4929e392adb770a65acfdbb48e4288af66e1f6ef7372379e0d08f952b9a184a324e27e73fd64c5b7635aeef785cc3c8bdf4775a7

webkit2gtk3.spec

@@ -5,68 +5,58 @@
         mkdir -p _license_files ; \
         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
-
 Name:           webkit2gtk3
-Version:        2.46.5
+Version:        2.42.5
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
-URL:            https://www.webkitgtk.org/
+URL:            http://www.webkitgtk.org/
-Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
+Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # Use the keys from https://webkitgtk.org/verifying.html
 # $ gpg --import aperez.key carlosgc.key
-# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
+# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
-##
+# https://bugs.webkit.org/show_bug.cgi?id=193749
-## Patches to support older build toolchain
+Patch0:         evolution-shared-secondary-process.patch
-##
 
-Patch100:       compiler-flags.patch
+# https://bugs.webkit.org/show_bug.cgi?id=235367
-Patch101:       s390x-build.patch
+Patch1:         icu60.patch
 
-##
+# Partial revert of https://commits.webkit.org/256284@main
-## Patches to support older or missing build dependencies
+Patch2:         gstreamer-1.16.1.patch
-##
 
-Patch200:       cairo-1.15.patch
+# Partial revert of https://commits.webkit.org/260744@main
-Patch201:       glib-2.56.patch
+Patch3:         cairo-1.15.patch
-Patch202:       gstreamer-1.16.patch
-Patch203:       harfbuzz-1.7.5.patch
-Patch204:       icu60.patch
 
-##
+# Avoid dependency on GEnumClass_autoptr
-## Patches to support older Evolution
+Patch4:         glib-2.56.patch
-##
 
-Patch300:       evolution-shared-secondary-process.patch
+# https://bugs.webkit.org/show_bug.cgi?id=268739
-Patch301:       evolution-sandbox-warning.patch
+Patch5:          i686-build.patch
 
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  gcc-c++
-BuildRequires:  gcc-toolset-14
+BuildRequires:  gcc-toolset-13
 BuildRequires:  gettext
 BuildRequires:  git
-BuildRequires:  gnupg2
 BuildRequires:  gperf
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
 BuildRequires:  openssl-devel
-BuildRequires:  perl(bigint)
 BuildRequires:  perl(English)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(JSON::PP)
 BuildRequires:  python3
 BuildRequires:  ruby
-BuildRequires:  rubygems
 BuildRequires:  rubygem-json
+BuildRequires:  rubygems
+BuildRequires:  shadow-utils
 BuildRequires:  unifdef
 
 BuildRequires:  pkgconfig(atspi-2)
@@ -94,6 +84,7 @@ BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libopenjp2)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
@@ -110,6 +101,8 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wpe-1.0)
+BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
 BuildRequires:  pkgconfig(xt)
 
 # libepoxy will crash when WebKit tries using GLES2 if it's not installed.
@@ -143,8 +136,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
@@ -175,8 +166,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}.
@@ -193,7 +182,7 @@ files for developing applications that use JavaScript engine from %{name}.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1 -n webkitgtk-%{version}
+%autosetup -p1 -n webkitgtk-%{version} -S git
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/gtest/
@@ -216,44 +205,42 @@ rm -rf Source/ThirdParty/qunit/
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
-# FIXME: Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers
+# The system GCC is too old to build WebKit, so use a GCC Toolset instead.
-# But we aren't using it in RHEL 9 because it's broken there: https://issues.redhat.com/browse/RHEL-59586
+# This prints warnings complaining that it should not be used except in
-# In RHEL 8, I haven't yet figured out whether we can use LLVM Toolset to build.
+# SCL scriplets, but I can't figure out any other way to make it work.
-# So for now we'll use GCC instead.
+source scl_source enable gcc-toolset-13
-%enable_devtoolset14
 
 # -DUSE_SYSTEM_MALLOC=ON is really bad for security, but libpas requires
-# __atomic_compare_exchange_16 which is not available in RHEL 8.
+# __atomic_compare_exchange_16 which does not seem to be available.
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
 %cmake \
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
-  -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
-  -DENABLE_DOCUMENTATION=OFF \
-  -DENABLE_GAMEPAD=OFF \
-  -DENABLE_JIT=OFF \
-  -DENABLE_WEB_CODECS=OFF \
-  -DUSE_AVIF=OFF \
-  -DUSE_GSTREAMER_TRANSCODER=OFF \
-  -DUSE_GTK4=OFF \
-  -DUSE_JPEGXL=OFF \
-  -DUSE_LIBBACKTRACE=OFF \
-  -DUSE_SOUP2=ON \
   -DUSE_SYSTEM_MALLOC=ON \
-  -DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \
+  -DENABLE_JIT=OFF \
+  -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
+  -DUSE_SOUP2=ON \
+  -DUSE_AVIF=OFF \
+  -DENABLE_DOCUMENTATION=OFF \
+  -DUSE_GSTREAMER_TRANSCODER=OFF \
+  -DUSE_JPEGXL=OFF \
+  -DENABLE_GAMEPAD=OFF \
 %if 0%{?rhel}
 %ifarch aarch64
   -DUSE_64KB_PAGE_BLOCK=ON \
 %endif
 %endif
-  %{nil}
+  ..
+popd
 
 # Show the build time in the status
 export NINJA_STATUS="[%f/%t][%e] "
-%cmake_build
+%ninja_build -C %{_target_platform}
 
 %install
-%cmake_install
+%ninja_install -C %{_target_platform}
 
 %find_lang WebKitGTK-4.0
 
@@ -315,15 +302,6 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
 %changelog
-* 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
-
 * Mon Feb 05 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.5-1
 - Update to 2.42.5
   Resolves: RHEL-3961