Skip to content

Commit 061358d

Browse files
shr-projectRaphael Kubo da Costa
authored andcommitted
firefox: fix build with wayland-1.20
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 parent cb79ef0 commit 061358d

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 1e1233344a23135c51acf1250c5bd6a408b6d131 Mon Sep 17 00:00:00 2001
2+
From: Martin Jansa <Martin.Jansa@gmail.com>
3+
Date: Sat, 12 Mar 2022 11:50:53 +0100
4+
Subject: [PATCH] Bug 1745560 - Add missing stub for wl_proxy_marshal_flags
5+
6+
Upstream-Status: Backport [Bug 1745560 - Add missing stub for wl_proxy_marshal_flags]
7+
8+
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9+
---
10+
widget/gtk/mozwayland/mozwayland.c | 7 +++++++
11+
1 file changed, 7 insertions(+)
12+
13+
diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
14+
index 73a9a76..2de3bc2 100644
15+
--- a/widget/gtk/mozwayland/mozwayland.c
16+
+++ b/widget/gtk/mozwayland/mozwayland.c
17+
@@ -184,3 +184,10 @@ MOZ_EXPORT void wl_egl_window_destroy(struct wl_egl_window* egl_window) {}
18+
19+
MOZ_EXPORT void wl_egl_window_resize(struct wl_egl_window* egl_window,
20+
int width, int height, int dx, int dy) {}
21+
+
22+
+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
23+
+ struct wl_proxy* proxy, uint32_t opcode,
24+
+ const struct wl_interface* interface, uint32_t version, uint32_t flags,
25+
+ ...) {
26+
+ return NULL;
27+
+}

meta-firefox/recipes-browser/firefox/firefox_68.9.0esr.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ SRC_URI = "https://ftp.mozilla.org/pub/firefox/releases/${PV}/source/firefox-${P
5353
file://debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch \
5454
file://debian-hacks/Use-build-id-as-langpack-version-for-reproducibility.patch \
5555
file://wayland/bug1451816-workaround-for-grabbing-popup.patch \
56+
file://wayland/0001-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch \
5657
file://wayland/egl/bug1571603-Disable-eglQueryString-nullptr-EGL_EXTENSIONS.patch \
5758
file://wayland/egl/0001-GLLibraryLoader-Use-given-symbol-lookup-function-fir.patch \
5859
file://wayland/egl/0001-Mark-GLFeature-framebuffer_multisample-as-unsupporte.patch \

0 commit comments

Comments
 (0)