diff mbox series

[meta-oe,styhead,72/90] webkitgtk3: Fix build break with latest gir

Message ID 20241105143638.2301245-73-akuster808@gmail.com
State New
Headers show
Series Patch review | expand

Commit Message

akuster808 Nov. 5, 2024, 2:35 p.m. UTC 
From: Khem Raj <raj.khem@gmail.com>

Reported with clang-19

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 7be0d59669f9bc102895bc0596c30805be0eda23)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...b1773bff2ef7c3b867ab019d69faa36c010d.patch | 33 +++++++++++++++++++
 .../webkitgtk/webkitgtk3_2.44.3.bb            |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch
diff mbox series

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 <mcatanzaro@redhat.com>
+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 <raj.khem@gmail.com>
+---
+ .../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"