diff --git a/.gitignore b/.gitignore index d9e307e..b5abd4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.48.3.tar.xz +SOURCES/webkitgtk-2.48.5.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 4fdaa21..b2c76d0 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -36faf2c30967db57175caf88cefd3d25781ae6d7 SOURCES/webkitgtk-2.48.3.tar.xz +5c8b55b9081c75e12d44583d4296fd7a84abc7b1 SOURCES/webkitgtk-2.48.5.tar.xz 04b10b8a486542c4551269c20b18b5c1c6cb4f94 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/glib-2-68.patch b/SOURCES/glib-2-68.patch index 9e44d69..51d6320 100644 --- a/SOURCES/glib-2-68.patch +++ b/SOURCES/glib-2-68.patch @@ -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 -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>::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 certificate; -@@ -156,8 +160,10 @@ std::optional> ArgumentCoder>: +@@ -157,8 +161,10 @@ std::optional> ArgumentCoder>: 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 diff --git a/SOURCES/webkitgtk-2.48.3.tar.xz.asc b/SOURCES/webkitgtk-2.48.3.tar.xz.asc deleted file mode 100644 index 663f521..0000000 --- a/SOURCES/webkitgtk-2.48.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmg26CoACgkQbBAJtpOX -U5N7Ng/9HAO3gM/ND9M8WW5/OChxZCZ7Xe88UBDd3ncNeDvIEsq/A3WeVId7yXpr -ta1ynsZM3ws/3zaEWNIXHoCDgDXeca0tYCiJN0VkFxXZqDpbgM8IaEZbF0HibdJA -/lX4YyF5mTvM1h0lTrdHpDHUxdqKRRNKX5VdlDdRSZyNAkJsP+ryeGudUW62MvP4 -VBXvK2ZSLdBFTY+ddc02MOaGKg6ToVo2PMQtDMJd4ujjQZ+F2H66Cbp4lthdx8JA -skcfHbVjsqLsUwBPtmYIEueIYn0x8mwyxS9ZIkVtsC2sMS9KyLOv5Tzig7VDaGJy -YcrVWUWc5OSKa23QZrCWqIkYyhlTGlhmcVHgO3C9mXjmAt8EGycrSW4HWFMeq6d6 -pz7otK0ZGWqaJVybpJcJ4QtLn5i+qf4wEIotQIBwOnb3EZiJ4aKpy5B+auS9q+xl -xpHP7eEl8r+R0CywwWYHFVRJn22jYSzcD5rF8lp3B4vj2Pn8sWN95ineUHICp9um -8Z4DRDjhwmOgtg4Fsnp0ZOLCqsYua7psJQ24RZ8MTxzReGbX7kOlE9l2IvsPoiR/ -9ENPaYChpeChaIlv1RsyvX785wl8mFxZLrxGG3JXf0kcDLd5SQ1xv2W0n4zqrzvO -zj2Yozkv/BdXPXiWuhCIF69qIlgxs2UM6f8AJfJ5/StDoPpY2aQ= -=3Phy ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.48.5.tar.xz.asc b/SOURCES/webkitgtk-2.48.5.tar.xz.asc new file mode 100644 index 0000000..f7337db --- /dev/null +++ b/SOURCES/webkitgtk-2.48.5.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmiMe7UACgkQbBAJtpOX +U5MrwA//TJ0W7S9Nbs2p4OIs6lQv+ntLrTVZAKFu+AUYJ/r3sUp9awGGivS37ZC8 +gh33JDqzt9pm1sVXGNTB8NmEcRUu9QfsEsJUUEnk7n6dLmQr8Cb7aXK8b4ma8Mgo +zLpuU5rHPtZ5Cx7Y3wXw0mNBf2ZcvHrFfVhDrrgziIMUu9dcuOVI3inEvfh8CKcO +a+j+j1qNvxLGgPOfkXZH/cvGckCLxJuQ+/aX0k/3Top6mSHJTeMxtU7K2bSkgQmC +GoSoRqOFLPBp2UxAKWYcgr8kh7wjt5mov3NtNyMmCC6bjwtwX3ClLjgQfHekS5Iu +niPm9Q/FoF1JSbiXrpPf8KZVTUg9D1lzQFvJYHl9w5gWGE6wgjxX7TM1ooYvW0Gr +v9FBDIXGlXid+hBx8j0igRQW/V6sH5uSt690m5ElZj4KkJ6+uhLkIMcSGc6HYWhI +vtCNytTGd9wsAB97bYvcJv/qEW94hnGSdE0HvarAcdZbO52oljOAtqzaYi7Hw111 +expNG3FU98UTWX0LHsv1c5/z9ph7x5EFyipkBML5J9LT8KV/+IrXPBkXQ45yaf3D +s+KpRlkxFGj9uFhRgl4OLR4UrSfgEkrAPnVud2zrIik+A4mHgX9y8FKmktFioJhU +faiEXzPzrHgMeEtlJW8vvWVoO9ZgIsYKma9sOn8aU/f7yjFak4I= +=KRFp +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 606fa1c..0a3a5d2 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -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 - 2.48.5-1 +- Update to 2.48.5 + * Fri May 30 2025 Michael Catanzaro - 2.48.3-1 - Update to 2.48.3