diff --git a/0001-unbreak-script-message-received.patch b/0001-unbreak-script-message-received.patch deleted file mode 100644 index df91be88b6e9e6a701b0520f01f47f8f56105151..0000000000000000000000000000000000000000 --- a/0001-unbreak-script-message-received.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7bcb97382f2f347dc348c3c31416ae7fd760ce6b Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 17 Mar 2023 15:39:52 -0500 -Subject: [PATCH] REGRESSION(261320@main): [GLib] Broke - WebKitUserContentManager::script-message-received - https://bugs.webkit.org/show_bug.cgi?id=254089 - -Reviewed by NOBODY (OOPS!). - -I forgot to update the marshaller used by -WebKitUserContentManager::script-message-received. It worked perfectly -fine in my development environment for whatever reason, but was broken -in at least Ephy Tech Preview. - -* Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp: ---- - Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp -index af2d963bb3b3..f778b19bc816 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp -@@ -106,7 +106,11 @@ static void webkit_user_content_manager_class_init(WebKitUserContentManagerClass - G_TYPE_FROM_CLASS(gObjectClass), - static_cast(G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED), - 0, nullptr, nullptr, -+#if ENABLE(2022_GLIB_API) -+ g_cclosure_marshal_VOID__OBJECT, -+#else - g_cclosure_marshal_VOID__BOXED, -+#endif - G_TYPE_NONE, 1, - #if ENABLE(2022_GLIB_API) - JSC_TYPE_VALUE); diff --git a/webkitgtk-2.40.0.tar.xz b/webkitgtk-2.40.1.tar.xz similarity index 77% rename from webkitgtk-2.40.0.tar.xz rename to webkitgtk-2.40.1.tar.xz index ea229c98efa33ff973923dcbf3e1ee8fb69b64ed..acada2cae5fca3d6f3e5896cc0b0c3c4ac52352d 100644 Binary files a/webkitgtk-2.40.0.tar.xz and b/webkitgtk-2.40.1.tar.xz differ diff --git a/webkitgtk.spec b/webkitgtk.spec index 65cc7ca1ea660d45011dd33717913ff90aa04352..5ea0f1e94a6145ee5ef2ec8aa5d2bd8600c1fa03 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their ## directory names (from the source tree) as prefixes for the files. @@ -11,7 +11,7 @@ %global with_gamepad 0 Name: webkitgtk -Version: 2.40.0 +Version: 2.40.1 Release: %{anolis_release}%{?dist} Summary: GTK Web content engine library @@ -19,8 +19,6 @@ License: LGPLv2 URL: https://www.webkitgtk.org/ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -Patch0: 0001-unbreak-script-message-received.patch - BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -565,6 +563,9 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %endif %changelog +* Thu Apr 20 2023 Funda Wang - 2.40.1-1 +- New version 2.40.1 + * Fri Mar 24 2023 yuanhui - 2.40.0-2 - Add version restrictions to buildrequires - Rebuild with libavif-0.11.1