Update to 2.48.5

Resolves: RHEL-107434
Resolves: RHEL-107422
Resolves: RHEL-107398
Resolves: RHEL-107386
Resolves: RHEL-107374
Resolves: RHEL-107361
Resolves: RHEL-107349
Resolves: RHEL-107337
Resolves: RHEL-107325
This commit is contained in:
Michael Catanzaro 2025-08-08 10:16:24 -05:00
parent 8715ce47fb
commit 4ad878e56b
3 changed files with 14 additions and 11 deletions

View File

@ -1,6 +1,6 @@
From 1fbf677e9c702b0c2fc14f9bb0311d9b10825cc6 Mon Sep 17 00:00:00 2001
From 05efb0544d81e8d4bd1a9ee7d7224b2ec35812ee Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Mon, 24 Mar 2025 16:10:25 -0500
Date: Fri, 8 Aug 2025 10:55:54 -0500
Subject: [PATCH] Revert "[GLib] Remove all GLIB_CHECK_VERSION conditionals"
This reverts commit 85b637b69f1c3a6242420b198d1c173477ce0f22.
@ -353,7 +353,7 @@ index 150d74ed0296..f461e3c695fe 100644
resolverClass->lookup_by_address_async = webkitOverridingResolverLookupByAddressAsync;
resolverClass->lookup_by_address_finish = webkitOverridingResolverLookupByAddressFinish;
diff --git a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
index a73466be12f1..9ab0cfb6f440 100644
index 1bf17f0f9b67..ef9f5c2e45f0 100644
--- a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
+++ b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp
@@ -121,11 +121,13 @@ void ArgumentCoder<GRefPtr<GTlsCertificate>>::encode(Encoder& encoder, const GRe
@ -386,7 +386,7 @@ index a73466be12f1..9ab0cfb6f440 100644
GType certificateType = g_tls_backend_get_certificate_type(g_tls_backend_get_default());
GRefPtr<GTlsCertificate> certificate;
@@ -156,8 +160,10 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
@@ -157,8 +161,10 @@ std::optional<GRefPtr<GTlsCertificate>> ArgumentCoder<GRefPtr<GTlsCertificate>>:
certificateType, nullptr, nullptr,
"certificate", certificateData.get(),
"issuer", issuer,
@ -396,12 +396,12 @@ index a73466be12f1..9ab0cfb6f440 100644
+#endif
nullptr)));
issuer = certificate.get();
}
i++;
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 60b385861a7c..677ab4e49155 100644
index 9c8241ec34fd..62af15d02e3a 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -7,7 +7,6 @@ SET_PROJECT_VERSION(2 48 0)
@@ -7,7 +7,6 @@ SET_PROJECT_VERSION(2 48 5)
set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
@ -436,5 +436,5 @@ index 60b385861a7c..677ab4e49155 100644
find_package(Manette 0.2.4)
if (NOT Manette_FOUND)
--
2.49.0
2.50.1

View File

@ -1,2 +1,2 @@
SHA512 (webkitgtk-2.48.3.tar.xz) = 0724e0d22403552409d0f621d9ed3a6404813ca63d445b9ac8f99682a544c95a3cf8108ac880cb3bcadc0ecd5a772db40e68f753c286700ffc7f2851bba12e84
SHA512 (webkitgtk-2.48.3.tar.xz.asc) = 6f5d0b78fe0a3c7f56fbbcc99d63cbe22bc978cb52c8e04263c6c88a5063a6ebf68d87bdf9aca088f19ac21676ba3e37c5261ded6cf7fc17bdcc008592dc845b
SHA512 (webkitgtk-2.48.5.tar.xz) = 70ee8f58a354cf6d0b1345954ed07c1e49d886f353d4fab945a3d2fc03116726af05454d4b5460f0fe4f5c3d042bb921fc5b43a85474624545afd9acc1c0fc8d
SHA512 (webkitgtk-2.48.5.tar.xz.asc) = bf499cb07d863adb6694030d29b8482db9986ce5fdb3426fd8497512ebd4583fbacc51c29b28631c00ee5089188733b94fbb475e06b69b400fdfb3b88b920377

View File

@ -20,7 +20,7 @@
%endif
Name: webkit2gtk3
Version: 2.48.3
Version: 2.48.5
Release: 1%{?dist}
Summary: GTK Web content engine library
@ -326,6 +326,9 @@ export NINJA_STATUS="[%f/%t][%e] "
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
%changelog
* Fri Aug 08 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.48.5-1
- Update to 2.48.5
* Fri May 30 2025 Michael Catanzaro <mcatanzaro@redhat.com> - 2.48.3-1
- Update to 2.48.3