From 2a73f135d4073e8b787bc25356bc32e0a3b65391 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 3 Oct 2024 08:48:52 -0700 Subject: webkitgtk3: Fix build break with latest gir Reported with clang-19 Signed-off-by: Khem Raj (cherry picked from commit 7be0d59669f9bc102895bc0596c30805be0eda23) Signed-off-by: Armin Kuster --- .../fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch | 33 ++++++++++++++++++++++ .../recipes-support/webkitgtk/webkitgtk3_2.44.3.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch new file mode 100644 index 0000000000..3d76aa4e4d --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch @@ -0,0 +1,33 @@ +From fff1b1773bff2ef7c3b867ab019d69faa36c010d Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Wed, 3 Jul 2024 13:36:54 -0700 +Subject: [PATCH] WebKitDOMEventTarget.h:95: Warning: WebKit2WebExtension: + invalid "scope" annotation: only valid on callback parameters + https://bugs.webkit.org/show_bug.cgi?id=276180 + +Unreviewed build fix. + +Emmanuele recommends using (type gpointer) for the GCallback parameter +of webkit_dom_event_target_remove_event_listener, since it won't be +called and is therefore not functioning as a callback. + +* Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h: + +Canonical link: https://commits.webkit.org/280639@main +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/fff1b1773bff2ef7c3b867ab019d69faa36c010d] +Signed-off-by: Khem Raj +--- + .../InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h ++++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h +@@ -92,7 +92,7 @@ WEBKIT_DEPRECATED gboolean webkit_dom_e + * webkit_dom_event_target_remove_event_listener: + * @target: A #WebKitDOMEventTarget + * @event_name: A #gchar +- * @handler: (scope call): A #GCallback ++ * @handler: (type gpointer): A #GCallback + * @use_capture: A #gboolean + * + * Returns: a #gboolean diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb index 0dadf570e2..01eefe13de 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb @@ -16,6 +16,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ file://0001-Fix-build-issues-with-latest-Clang.patch \ + file://fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch \ " SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" -- cgit v1.2.3-54-g00ecf