.gitignore

@@ -1,2 +1 @@
-SOURCES/webkitgtk-2.46.5.tar.xz
-SOURCES/webkitgtk-keys.gpg
+SOURCES/webkitgtk-2.34.2.tar.xz

.webkit2gtk3.metadata

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

SOURCES/aarch64-page-size.patch

@@ -0,0 +1,16 @@
+diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
+index 8ff8443d0e25..2fa880a97d1d 100644
+--- a/Source/WTF/wtf/PageBlock.h
++++ b/Source/WTF/wtf/PageBlock.h
+@@ -46,9 +46,9 @@ namespace WTF {
+ // Use 64 KiB for any unknown CPUs to be conservative.
+ #if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64)
+ constexpr size_t CeilingOnPageSize = 16 * KB;
+-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
++#elif CPU(ARM64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
+ constexpr size_t CeilingOnPageSize = 64 * KB;
+-#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64)
++#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64)
+ constexpr size_t CeilingOnPageSize = 4 * KB;
+ #else
+ #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!

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/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));

SOURCES/glib-2.56.patch

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

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/icu60.patch

@@ -1,203 +0,0 @@
-diff --git a/Source/JavaScriptCore/runtime/IntlCache.cpp b/Source/JavaScriptCore/runtime/IntlCache.cpp
-index 0941a7278e2a..75134587adbb 100644
---- a/Source/JavaScriptCore/runtime/IntlCache.cpp
-+++ b/Source/JavaScriptCore/runtime/IntlCache.cpp
-@@ -26,6 +26,7 @@
- #include "config.h"
- #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::
-     return patternBuffer;
- }
- 
-+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
- 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
-         return { };
-     return buffer;
- }
-+#endif
- 
- } // namespace JSC
-diff --git a/Source/JavaScriptCore/runtime/IntlCache.h b/Source/JavaScriptCore/runtime/IntlCache.h
-index 4c818fd59424..2c7e464a6955 100644
---- a/Source/JavaScriptCore/runtime/IntlCache.h
-+++ b/Source/JavaScriptCore/runtime/IntlCache.h
-@@ -25,6 +25,7 @@
- 
- #pragma once
- 
-+#include "IntlDisplayNames.h"
- #include <unicode/udatpg.h>
- #include <wtf/Noncopyable.h>
- #include <wtf/TZoneMalloc.h>
-@@ -40,7 +41,9 @@ public:
-     IntlCache() = default;
- 
-     Vector<UChar, 32> getBestDateTimePattern(const CString& locale, std::span<const UChar> skeleton, UErrorCode&);
-+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
-     Vector<UChar, 32> getFieldDisplayName(const CString& locale, UDateTimePatternField, UDateTimePGDisplayWidth, UErrorCode&);
-+#endif
- 
- 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
---- a/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
-+++ b/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
-@@ -104,6 +104,7 @@ void IntlDisplayNames::initializeDisplayNames(JSGlobalObject* globalObject, JSVa
-     m_languageDisplay = intlOption<LanguageDisplay>(globalObject, options, vm.propertyNames->languageDisplay, { { "dialect"_s, LanguageDisplay::Dialect }, { "standard"_s, LanguageDisplay::Standard } }, "languageDisplay must be either \"dialect\" or \"standard\""_s, LanguageDisplay::Dialect);
-     RETURN_IF_EXCEPTION(scope, void());
- 
-+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
-     UErrorCode status = U_ZERO_ERROR;
- 
-     UDisplayContext contexts[] = {
-@@ -131,6 +132,10 @@ void IntlDisplayNames::initializeDisplayNames(JSGlobalObject* globalObject, JSVa
-         throwTypeError(globalObject, scope, "failed to initialize DisplayNames"_s);
-         return;
-     }
-+#else
-+    throwTypeError(globalObject, scope, "failed to initialize Intl.DisplayNames since feature is not supported by the ICU version"_s);
-+    return;
-+#endif
- }
- 
- // https://tc39.es/proposal-intl-displaynames/#sec-Intl.DisplayNames.prototype.of
-@@ -140,6 +145,7 @@ JSValue IntlDisplayNames::of(JSGlobalObject* globalObject, JSValue codeValue) co
-     VM& vm = globalObject->vm();
-     auto scope = DECLARE_THROW_SCOPE(vm);
- 
-+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
-     ASSERT(m_displayNames);
-     auto code = codeValue.toWTFString(globalObject);
-     RETURN_IF_EXCEPTION(scope, { });
-@@ -344,6 +350,11 @@ JSValue IntlDisplayNames::of(JSGlobalObject* globalObject, JSValue codeValue) co
-         return throwTypeError(globalObject, scope, "Failed to query a display name."_s);
-     }
-     return jsString(vm, String(WTFMove(buffer)));
-+#else
-+    UNUSED_PARAM(codeValue);
-+    throwTypeError(globalObject, scope, "failed to initialize Intl.DisplayNames since feature is not supported by the ICU version"_s);
-+    return { };
-+#endif
- }
- 
- // https://tc39.es/proposal-intl-displaynames/#sec-Intl.DisplayNames.prototype.resolvedOptions
-diff --git a/Source/JavaScriptCore/runtime/IntlDisplayNames.h b/Source/JavaScriptCore/runtime/IntlDisplayNames.h
-index 2101c342865e..87a95a26f55c 100644
---- a/Source/JavaScriptCore/runtime/IntlDisplayNames.h
-+++ b/Source/JavaScriptCore/runtime/IntlDisplayNames.h
-@@ -29,6 +29,13 @@
- #include <unicode/uldnames.h>
- #include <wtf/unicode/icu/ICUHelpers.h>
- 
-+#if !defined(HAVE_ICU_U_LOCALE_DISPLAY_NAMES)
-+// We need 61 or later since part of implementation uses UCURR_NARROW_SYMBOL_NAME.
-+#if U_ICU_VERSION_MAJOR_NUM >= 61
-+#define HAVE_ICU_U_LOCALE_DISPLAY_NAMES 1
-+#endif
-+#endif
-+
- namespace JSC {
- 
- enum class RelevantExtensionKey : uint8_t;
-diff --git a/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp b/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
-index 1423760a9593..d15f4db69c47 100644
---- a/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
-+++ b/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
-@@ -42,7 +42,6 @@
- #endif
- #endif
- #include <unicode/ulistformatter.h>
--#include <unicode/unumberformatter.h>
- #include <unicode/ures.h>
- #if HAVE(ICU_U_LIST_FORMATTER)
- #define U_HIDE_DRAFT_API 1
-@@ -50,6 +49,7 @@
- 
- #if HAVE(ICU_U_LIST_FORMATTER)
- #include <unicode/uformattedvalue.h>
-+#include <unicode/unumberformatter.h>
- #endif
- 
- namespace JSC {
-diff --git a/Source/JavaScriptCore/runtime/IntlObject.cpp b/Source/JavaScriptCore/runtime/IntlObject.cpp
-index 5850a14d8876..ca4f8b3ca79a 100644
---- a/Source/JavaScriptCore/runtime/IntlObject.cpp
-+++ b/Source/JavaScriptCore/runtime/IntlObject.cpp
-@@ -166,7 +166,6 @@ namespace JSC {
-   supportedValuesOf     intlObjectFuncSupportedValuesOf              DontEnum|Function 1
-   Collator              createCollatorConstructor                    DontEnum|PropertyCallback
-   DateTimeFormat        createDateTimeFormatConstructor              DontEnum|PropertyCallback
--  DisplayNames          createDisplayNamesConstructor                DontEnum|PropertyCallback
-   Locale                createLocaleConstructor                      DontEnum|PropertyCallback
-   NumberFormat          createNumberFormatConstructor                DontEnum|PropertyCallback
-   PluralRules           createPluralRulesConstructor                 DontEnum|PropertyCallback
-@@ -254,6 +253,11 @@ void IntlObject::finishCreation(VM& vm, JSGlobalObject*)
-     Base::finishCreation(vm);
-     ASSERT(inherits(info()));
-     JSC_TO_STRING_TAG_WITHOUT_TRANSITION();
-+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
-+    putDirectWithoutTransition(vm, vm.propertyNames->DisplayNames, createDisplayNamesConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
-+#else
-+    UNUSED_PARAM(&createDisplayNamesConstructor);
-+#endif
- #if HAVE(ICU_U_LIST_FORMATTER)
-     putDirectWithoutTransition(vm, vm.propertyNames->DurationFormat, createDurationFormatConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
-     putDirectWithoutTransition(vm, vm.propertyNames->ListFormat, createListFormatConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 523177737358..3606076882f3 100644
---- a/Source/cmake/OptionsGTK.cmake
-+++ b/Source/cmake/OptionsGTK.cmake
-@@ -11,7 +11,7 @@ find_package(Cairo 1.16.0 REQUIRED)
- find_package(LibGcrypt 1.7.0 REQUIRED)
- find_package(Libtasn1 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(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;
- }
-

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.34.2.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYZ4NMgAKCRDz0yLQ7EWC
+w8dDAJ0XlodXEOu4mMkcTEkMi4zbGIvsmgCfdFSkmaAmrr+hSSh5/975VJzhj4M=
+=zndL
+-----END PGP SIGNATURE-----

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

SPECS/webkit2gtk3.spec

@@ -5,95 +5,76 @@
         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
+# No libmanette in RHEL
+%if !0%{?rhel}
+%global with_gamepad 1
+%endif
+
+# Build documentation by default (use `rpmbuild --without docs` to override it).
+# This is used by Coverity. Coverity injects custom compiler warnings, but
+# any warning during WebKit docs build is fatal!
+%bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.46.5
-Release:        1%{?dist}
+Version:        2.34.2
+Release:        1%{?dist}.alma
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
 URL:            https://www.webkitgtk.org/
 Source0:        https://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
-Source2:        webkitgtk-keys.gpg
+# Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3
+Source2:        https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.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
+# https://bugs.webkit.org/show_bug.cgi?id=217989
+# https://bugs.webkit.org/show_bug.cgi?id=227905
+Patch0:         aarch64-page-size.patch
 
 BuildRequires:  bison
+BuildRequires:  bubblewrap
 BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  gcc-c++
-BuildRequires:  gcc-toolset-14
 BuildRequires:  gettext
 BuildRequires:  git
 BuildRequires:  gnupg2
 BuildRequires:  gperf
+BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
-BuildRequires:  openssl-devel
-BuildRequires:  perl(bigint)
 BuildRequires:  perl(English)
+BuildRequires:  perl(File::Copy::Recursive)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(JSON::PP)
+BuildRequires:  perl(Switch)
 BuildRequires:  python3
 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)
-BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gstreamer-1.0)
-BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libopenjp2)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
@@ -104,24 +85,35 @@ 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)
 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)
+BuildRequires:  pkgconfig(wayland-protocols)
 
-# libepoxy will crash when WebKit tries using GLES2 if it's not installed.
-Requires:       libGLES
+# These are hard requirements of WebKit's bubblewrap sandbox.
+Requires:       bubblewrap
+Requires:       xdg-dbus-proxy
 
 # If Geoclue is not running, the geolocation API will not work.
 Recommends:     geoclue2
 
 # Needed for various GStreamer elements.
-Recommends:     gstreamer1-plugins-bad-free
+Recommends:     gstreamer1-plugins-bad-freeworld
 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}
@@ -133,18 +125,10 @@ 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}
-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
@@ -171,12 +155,22 @@ Provides:       webkitgtk4-devel = %{version}-%{release}
 The %{name}-devel package contains libraries, build data, and header
 files for developing applications that use %{name}.
 
+%if %{with docs}
+%package        doc
+Summary:        Documentation files for %{name}
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Obsoletes:      webkitgtk4-doc < %{version}-%{release}
+Provides:       webkitgtk4-doc = %{version}-%{release}
+
+%description    doc
+This package contains developer documentation for %{name}.
+%endif
+
 %package        jsc
 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}.
@@ -216,34 +210,25 @@ 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
-# But we aren't using it in RHEL 9 because it's broken there: https://issues.redhat.com/browse/RHEL-59586
-# In RHEL 8, I haven't yet figured out whether we can use LLVM Toolset to build.
-# So for now we'll use GCC instead.
-%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.
 %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 \
+  -DENABLE_MINIBROWSER=ON \
   -DUSE_SOUP2=ON \
-  -DUSE_SYSTEM_MALLOC=ON \
-  -DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \
+%if %{with docs}
+  -DENABLE_GTKDOC=ON \
+%endif
+%if !0%{?with_gamepad}
+  -DENABLE_GAMEPAD=OFF \
+%endif
+%if 0%{?fedora}
+  -DUSER_AGENT_BRANDING="Fedora" \
+%endif
 %if 0%{?rhel}
 %ifarch aarch64
-  -DUSE_64KB_PAGE_BLOCK=ON \
+  -DENABLE_JIT=OFF \
+  -DUSE_SYSTEM_MALLOC=ON \
 %endif
 %endif
   %{nil}
@@ -255,11 +240,13 @@ export NINJA_STATUS="[%f/%t][%e] "
 %install
 %cmake_install
 
-%find_lang WebKitGTK-4.0
+%find_lang WebKit2GTK-4.0
 
 # Finally, copy over and rename various files for %%license inclusion
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
 %add_to_license_files Source/ThirdParty/ANGLE/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
@@ -271,7 +258,7 @@ export NINJA_STATUS="[%f/%t][%e] "
 %add_to_license_files Source/WTF/wtf/dtoa/COPYING
 %add_to_license_files Source/WTF/wtf/dtoa/LICENSE
 
-%files -f WebKitGTK-4.0.lang
+%files -f WebKit2GTK-4.0.lang
 %license _license_files/*ThirdParty*
 %license _license_files/*WebCore*
 %license _license_files/*WebInspectorUI*
@@ -314,263 +301,353 @@ export NINJA_STATUS="[%f/%t][%e] "
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
+%if %{with docs}
+%files doc
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/jsc-glib-4.0/
+%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
+%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
+%endif
+
 %changelog
-* Wed Dec 18 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.5-1
-- Update to 2.46.5
+* Fri Feb 25 2022 Eduard Abdullin <eabdullin@almalinux.org> - 2.34.2-1.alma
+- Add wayland-protocols to BR
 
-* Mon Nov 25 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-2
-- Add patch for CVE-2024-44309
+* Wed Nov 24 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.2-1
+- Update to 2.34.2
+  Related: #1985041
 
-* Fri Nov 08 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.3-1
-- Update to 2.46.3
+* Tue Oct 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.1-1
+- Update to 2.34.1
+  Related: #1985041
 
-* Mon Feb 05 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.5-1
-- Update to 2.42.5
-  Resolves: RHEL-3961
+* 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
 
-* Fri Dec 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.4-1
-- Update to 2.42.4
-  Resolves: RHEL-3961
-  Resolves: RHEL-19365
-
-* Tue Dec 05 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.3-1
-- Update to 2.42.3
-  Resolves: RHEL-3961
-
-* Fri Nov 10 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.2-1
-- Update to 2.42.2
-  Resolves: RHEL-3961
-
-* Wed Sep 27 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.1-1
-- Update to 2.42.1
-  Resolves: RHEL-3961
-
-* Wed Sep 20 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.0-1
-- Upgrade to 2.42.0
-  Resolves: RHEL-3961
-
-* 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
-
-* 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 Apr 14 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.3
-- Restore libwpe and wpebackend-fdo dependencies
-  Related: #2185741 (sort of)
-
-* Wed Apr 12 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.2
-- Disable libwpe and wpebackend-fdo dependencies
-  Related: #2185741 (sort of)
-
-* Tue Apr 11 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.1
-- Add patch for CVE-2023-28205
-  Resolves: #2185741
-
-* Wed Feb 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1
-- Update to 2.38.5
-  Related: #2127468
-
-* Thu Feb 02 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.4-1
-- Update to 2.38.4
-  Related: #2127468
-
-* Thu Dec 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.3-1
-- Update to 2.38.3
-  Related: #2127468
-
-* Fri Nov 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-1
-- Update to 2.38.2
-  Related: #2127468
-
-* Wed Nov 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-2
-- Fix crashes on aarch64
-  Enable WPE renderer
-  Related: #2127468
-
-* Thu Oct 27 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-1
-- Update to 2.38.1
-  Related: #2127468
-
-* Wed Aug 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.7-1
-- Update to 2.36.7
-  Related: #2061994
-
-* Tue Aug 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.6-1
-- Update to 2.36.6
-  Related: #2061994
-
-* Tue Aug 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-2
-- Fix Eclipse after update to 2.36.5
-  Related: #2061994
-
-* Thu Jul 28 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-1
-- Update to 2.36.5
-  Related: #2061994
-  Resolves: #2099334
-
-* Tue Jul 05 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.4-1
-- Update to 2.36.4
-  Related: #2061994
-
-* Thu Jun 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.3-1
-- Update to 2.36.3
-- Related: #2061994
-- Resolves: #2092748
-
-* Wed May 18 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.2-1
-- Update to 2.36.2
-  Related: #2061994
-
-* 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
-
-* Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
-- Update to 2.34.6
-  Related: #1985042
-
-* Wed Feb 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.5-1
-- Update to 2.34.5
-- Related: #1985042
-
-* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.4-1
-- Update to 2.34.4
-- Resolves: #1985042
-
-* Tue Sep 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.4-1
-- Update to 2.32.4
-- Related: #1985042
-- Resolves: #2006429
+* 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