summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-10-03 08:48:52 -0700
committerKhem Raj <raj.khem@gmail.com>2024-11-19 13:13:27 -0800
commit2a73f135d4073e8b787bc25356bc32e0a3b65391 (patch)
treeb9ac46c958179748641d2e8e8c17eed966f328ca
parent61ba32cee6a0fe3ad25eef62c973607ac561ab19 (diff)
downloadmeta-openembedded-2a73f135d4073e8b787bc25356bc32e0a3b65391.tar.gz
webkitgtk3: Fix build break with latest gir
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>
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch33
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb1
2 files changed, 34 insertions, 0 deletions
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 @@
1From fff1b1773bff2ef7c3b867ab019d69faa36c010d Mon Sep 17 00:00:00 2001
2From: Michael Catanzaro <mcatanzaro@redhat.com>
3Date: Wed, 3 Jul 2024 13:36:54 -0700
4Subject: [PATCH] WebKitDOMEventTarget.h:95: Warning: WebKit2WebExtension:
5 invalid "scope" annotation: only valid on callback parameters
6 https://bugs.webkit.org/show_bug.cgi?id=276180
7
8Unreviewed build fix.
9
10Emmanuele recommends using (type gpointer) for the GCallback parameter
11of webkit_dom_event_target_remove_event_listener, since it won't be
12called and is therefore not functioning as a callback.
13
14* Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h:
15
16Canonical link: https://commits.webkit.org/280639@main
17Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/fff1b1773bff2ef7c3b867ab019d69faa36c010d]
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 .../InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
24+++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h
25@@ -92,7 +92,7 @@ WEBKIT_DEPRECATED gboolean webkit_dom_e
26 * webkit_dom_event_target_remove_event_listener:
27 * @target: A #WebKitDOMEventTarget
28 * @event_name: A #gchar
29- * @handler: (scope call): A #GCallback
30+ * @handler: (type gpointer): A #GCallback
31 * @use_capture: A #gboolean
32 *
33 * 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 \
16 file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ 16 file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \
17 file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ 17 file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
18 file://0001-Fix-build-issues-with-latest-Clang.patch \ 18 file://0001-Fix-build-issues-with-latest-Clang.patch \
19 file://fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch \
19 " 20 "
20SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" 21SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54"
21 22