1776724 - fatal error: 'mozilla/gfx/XlibDisplay.h' file not found when trying to build wayland-only

Status: RESOLVED FIXED

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

Description

[Joonas Niilola]

Attachment: build.log.xz

Steps to reproduce:

Try to build wayland-only firefox-102.0 by passing --enable-default-toolkit=cairo-gtk3-wayland-only

Actual results:

2:47.43 gfx/angle/targets/angle_common/PoolAlloc.o
2:47.51 In file included from /var/tmp/portage/www-client/firefox-102.0/work/firefox-102.0/gfx/gl/GLContextProviderGLX.cpp:34:
2:47.51 /var/tmp/portage/www-client/firefox-102.0/work/firefox-102.0/gfx/gl/GLXLibrary.h:12:10: fatal error: 'mozilla/gfx/XlibDisplay.h' file not found
2:47.51 #include "mozilla/gfx/XlibDisplay.h"
2:47.51 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
2:47.53 BUILDSTATUS OBJECT_FILE Unified_cpp_dom_xul1.o

Expected results:

Build should pass and provide a wayland-only version of Firefox. Note that this worked on 101.0.1.

Current patches: bugs:
1772719
1772721
1772513

Build.log attached as compressed file (since it's 9 MB).

Comment 1

[Joonas Niilola]

Attachment: firefox-102-patches-01tmpj.tar.xz

Patches included. The relevant ones are
0041-p01-bmo-1772719-build-wayland-only.patch
0042-p02-bmo-1772721-build-wayland-only-D148496fixed.patch
0043-p02-bmo-1772721-build-wayland-only.patch
0044-p03-bmo-1772513-build-wayland-only-D148256.patch
0045-p04-bmo-1772513-build-wayland-only-D148257.patch

Comment 2

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

Please submit the patches via phabricator.services.mozilla.com
Thanks.

Comment 3

[Joonas Niilola]

Hey,

sorry for being unclear. I'm not aware of a patch that fixes this, I just wanted to list what wayland-related patches I applied in case they'd break something in the build system. Basically these are applied on top of 102.0:
https://hg.mozilla.org/mozilla-central/rev/2e739b8c44c7
https://hg.mozilla.org/integration/autoland/rev/71f770d93407
https://hg.mozilla.org/mozilla-central/rev/a600bcea00c1
https://hg.mozilla.org/mozilla-central/rev/60aa55fa4489
https://hg.mozilla.org/mozilla-central/rev/0e7aea0696f7

But I tried to compile firefox-102.0 without applying any of those aforementioned patches and it basically fails to the same issue anyway. Although if I remember correctly it handles X dep somehow automatically without (set) of those patches.

Both --enable-default-toolkit=cairo-gtk3-x11-wayland and --enable-default-toolkit=cairo-gtk3 work, so there seems to be some sort of an issue with --enable-default-toolkit=cairo-gtk3-x11-wayland where it may try to enable X functionality if it finds some deps? Or just some other way new code added between 101.0.1 -> 102.0 that isn't guarded like https://hg.mozilla.org/mozilla-central/rev/2e739b8c44c7 this.

Comment 4

[Joonas Niilola]

Following
https://hg.mozilla.org/mozilla-central/log/tip/gfx/gl/GLContextProvider.h

This looks suspicious,
https://hg.mozilla.org/mozilla-central/rev/177273d61850201b8e6de0e545013f3181228a41

I remember seeing this being worked on somewhere,
https://hg.mozilla.org/mozilla-central/rev/27059949874a6d80ffe07e46f708d69256a09ae9
#if defined(MOZ_WIDGET_GTK) but my memory says this "fix" wasn't merged. So I may be missing some commit needed to fix this on 102.0... (if you have an idea)

Comment 5

[Joonas Niilola]

https://hg.mozilla.org/mozilla-central/rev/177273d61850201b8e6de0e545013f3181228a41 or this coming from bug https://bugzilla.mozilla.org/show_bug.cgi?id=1769710

Comment 6

[Owen Rafferty]

Attachment: Bug 1776724 - fix wayland-only build

Comment 7

[Owen Rafferty]

This patch has worked for me with --enable-default-toolkit=cairo-gtk3-wayland-only since 102.0b7.

Comment 8

[Joonas Niilola]

Indeed that patch made it compile! And other toolkit-variants works too.

The reviewbot says it had some errors, but how crucial those are? I think I'm going with this for now, but does it need to be worked on for 102esr?

Thanks a lot either way!

Comment 9

[Owen Rafferty]

The same GL refactoring is also in 102esr, so it should work (to the extent that it does in 102), but I'm not certain.

Comment 10

[Owen Rafferty]

Martin, can this be landed?

Comment 11

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

(In reply to Owen Rafferty from comment #10)

Martin, can this be landed?

Yes, you need to add 'checkin-needed' tag to the revision at https://phabricator.services.mozilla.com/differential/revision/edit/150485/ (I did that for you).

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/4838310f6e6c
fix wayland-only build r=jgilbert

Comment 13

[Marian-Vasile Laza]

https://hg.mozilla.org/mozilla-central/rev/4838310f6e6c