1745560 - Firefox 91.4 fails to build against wayland 1.20

Status: RESOLVED FIXED

(Core :: Widget: Gtk, defect, P3)

Description

[Kevin Daudt]

Firefox 91.4.0 fails to build after the upgrade of wayland to 1.20:

43:40.87 /usr/bin/ld: /home/buildozer/aports/community/firefox-esr/src/firefox-91.4.0/obj-powerpc64le-unknown-linux-musl/toolkit/library/build/../../../gfx/gl/Unified_cpp_gfx_gl0.o: in function `wl_surface_destroy(wl_surface*)':
43:40.87 /usr/include/wayland-client-protocol.h:3672: undefined reference to `wl_proxy_marshal_flags'
43:40.87 /usr/bin/ld: /home/buildozer/aports/community/firefox-esr/src/firefox-91.4.0/obj-powerpc64le-unknown-linux-musl/toolkit/library/build/../../../gfx/gl/Unified_cpp_gfx_gl0.o: in function `wl_compositor_create_surface(wl_compositor*)':
43:40.87 /usr/include/wayland-client-protocol.h:1291: undefined reference to `wl_proxy_marshal_flags'
43:46.60 /usr/bin/ld: /home/buildozer/aports/community/firefox-esr/src/firefox-91.4.0/obj-powerpc64le-unknown-linux-musl/toolkit/library/build/../../../gfx/layers/Unified_cpp_gfx_layers1.o: in function `wl_surface_commit(wl_surface*)':
43:46.60 /usr/include/wayland-client-protocol.h:3914: undefined reference to `wl_proxy_marshal_flags'
43:46.60 /usr/bin/ld: /home/buildozer/aports/community/firefox-esr/src/firefox-91.4.0/obj-powerpc64le-unknown-linux-musl/toolkit/library/build/../../../gfx/layers/Unified_cpp_gfx_layers1.o: in function `wl_subsurface_place_below(wl_subsurface*, wl_surface*)':
43:46.60 /usr/include/wayland-client-protocol.h:5996: undefined reference to `wl_proxy_marshal_flags'
43:46.60 /usr/bin/ld: /home/buildozer/aports/community/firefox-esr/src/firefox-91.4.0/obj-powerpc64le-unknown-linux-musl/toolkit/library/build/../../../gfx/layers/Unified_cpp_gfx_layers1.o: in function `wl_subsurface_place_above(wl_subsurface*, wl_surface*)':
43:46.60 /usr/include/wayland-client-protocol.h:5983: undefined reference to `wl_proxy_marshal_flags'
43:46.60 /usr/bin/ld: /home/buildozer/aports/community/firefox-esr/src/firefox-91.4.0/obj-powerpc64le-unknown-linux-musl/toolkit/library/build/../../../gfx/layers/Unified_cpp_gfx_layers1.o:/usr/include/wayland-client-protocol.h:5983: more undefined references to `wl_proxy_marshal_flags' follow

The following patch seems to fix it:

diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
index 7a448e6..7792581 100644
--- a/widget/gtk/mozwayland/mozwayland.c
+++ b/widget/gtk/mozwayland/mozwayland.c
@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }

 MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
                                     struct wl_list* other) {}
+
+MOZ_EXPORT struct wl_proxy *
+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode,
+                      const struct wl_interface *interface, uint32_t version,
+                      uint32_t flags, ...) { return NULL; }

This affect Alpine Linux, and apparently also gentoo

Comment 1

[BugBot [:suhaib / :marco/ :calixte]]

The Bugbug bot thinks this bug should belong to the 'Core::Graphics' component, and is moving the bug to that component. Please revert this change in case you think the bot is wrong.

Comment 2

[Martin Stránský [:stransky] (ni? me)]

Do you mind to submit the patch via phabricator?
https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html
Thanks.

Comment 3

[Kevin Daudt]

Attachment: Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, r=stransky

Comment 4

[Kevin Daudt]

Patch submitted

Comment 5

[Martin Stránský [:stransky] (ni? me)]

Do I understand correctly that you want to backport it to 91 ESR line?

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/f7e2cf808d30
Add missing stub for wl_proxy_marshal_flags, r=stransky

Comment 7

[Sandor Molnar[:smolnar]]

https://hg.mozilla.org/mozilla-central/rev/f7e2cf808d30

Comment 8

[Martin Stránský [:stransky] (ni? me)]

I'd like to submit this one for FF96 as it breaks building FF when Wayland 1.20 headers are present.

Comment 9

[Martin Stránský [:stransky] (ni? me)]

Comment on attachment 9254937 [details]
Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, r=stransky

Beta/Release Uplift Approval Request

• User impact if declined: Firefox fails to build when wayland-1.20 headers are present.
• Is this code covered by automated tests?: No
• Has the fix been verified in Nightly?: No
• Needs manual test from QE?: No
• If yes, steps to reproduce: Build FF in wayland-1.2o environment (Fedora 36 for instance).
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Low risk, adds a function placeholder.
• String changes made/needed:

Comment 10

[Dianna Smith [:diannaS]]

Comment on attachment 9254937 [details]
Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, r=stransky

Approved for 96.0b9

Comment 11

[Dianna Smith [:diannaS]]

https://hg.mozilla.org/releases/mozilla-beta/rev/9868f275bf47

Comment 12

[Ryan VanderMeulen [:RyanVM]]

Do we need this on ESR also?

Comment 13

[Martin Stránský [:stransky] (ni? me)]

Comment on attachment 9254937 [details]
Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, r=stransky

ESR Uplift Approval Request

• If this is not a sec:{high,crit} bug, please state case for ESR consideration: Firefox fails to build when wayland-1.20 headers are present.
• User impact if declined:
• Fix Landed on Version: 96
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Low risk, adds a function placeholder.

Comment 14

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9254937 [details]
Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, r=stransky

Approved for 91.6esr.

Comment 15

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-esr91/rev/2ed1b3cb869b