278858 2024-08-29 07:46:39 -0700 [GTK] [2.45.91] Fails to build in armhf: expected identifier before numeric constant 2025-02-26 02:11:45 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 berto webkit-unassigned bugs-noreply cgarcia dpino mcatanzaro oldest_to_newest 2056258 0 berto 2024-08-29 07:46:39 -0700 This is the error message: In file included from /usr/include/X11/Xlib.h:44, from Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp:32: build-soup3/bmalloc/Headers/bmalloc/EligibilityResult.h:35:5: error: expected identifier before numeric constant 35 | Success, | ^~~~~~~ build-soup3/bmalloc/Headers/bmalloc/EligibilityResult.h:35:5: error: expected ‘}’ before numeric constant I think that the 'Success' macro in X11/X.h conflicts with the same value in the EligibilityKind enum: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/blob/xorgproto-2024.1/include/X11/X.h?ref_type=tags#L350 https://github.com/WebKit/WebKit/blob/webkitgtk-2.45.91/Source/bmalloc/bmalloc/EligibilityResult.h#L35 I haven't investigated yet why this is not happening in other architectures. 2056545 1 berto 2024-08-30 06:58:52 -0700 FWIW I can work around this by using the system malloc in this build. 2061455 2 berto 2024-09-19 07:43:15 -0700 Disabling bmalloc seems to be causing problems on armhf, see bug 279883 I managed to fix the build by changing the order of the Xlib.h include, but I still haven't checked why other architectures are not affected: --- a/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp +++ b/Source/WebKit/UIProcess/gtk/PointerLockManagerX11.cpp @@ -29,10 +29,10 @@ #if PLATFORM(X11) #include "WebPageProxy.h" -#include <X11/Xlib.h> #include <gtk/gtk.h> #include <wtf/TZoneMallocInlines.h> #include <wtf/glib/GRefPtr.h> +#include <X11/Xlib.h> #if USE(GTK4) #include <gdk/x11/gdkx.h> 2061461 3 berto 2024-09-19 08:01:21 -0700 And this is almost certainly the commit that introduced this build failure: https://commits.webkit.org/282294@main (the changes to PointerLockManagerX11.cpp) 2064163 4 dpino 2024-09-29 23:44:49 -0700 This a common error that happens when a header defining 'Success' collides with 'Xlib.h', which includes 'X11/X.h' which defines Success. One way of solving is undefining 'Success' before including 'Xlib.h': ``` #ifdef Success #undef Success #endif ``` Another way of solving it is by adding the .c source file that triggers the inclusion of headers until the collide happens as no-unify. In this case, the file would be 'UIProcess/gtk/PointerLockManagerX11.cpp', but that file is already marked as no-unify: https://github.com/webkit/webkit/blob/main/Source/WebKit/SourcesGTK.txt#L283, so this solution won't work in your case. It seems that right now there's no code in WebKit codebase that uses the former solution (undefining Success). So, if rearranging the order of the header fixes the issue I would go for that solution. Perhaps adding a comment explaining why 'Xlib.h' has to go after 'TZoneMallocInlines.h'. 2070032 5 473016 berto 2024-10-23 03:30:46 -0700 Created attachment 473016 Patch FYI this is the patch that I'm using downstream in Debian, I don't have time to create a merge request right now but feel free to take this patch if you think it's appropriate. 2098192 6 berto 2025-02-26 02:11:45 -0800 This doesn't seem to be necessary anymore in 2.47.90, so we can close this issue. 473016 2024-10-23 03:30:46 -0700 2024-10-23 03:30:46 -0700 Patch 278858.diff text/plain 672 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9Qb2ludGVyTG9ja01hbmFn ZXJYMTEuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1BvaW50ZXJMb2NrTWFuYWdl clgxMS5jcHAKaW5kZXggZTFkMzVkNGEzODA4Li5iMzZhNTQxN2RhYmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9Qb2ludGVyTG9ja01hbmFnZXJYMTEuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9Qb2ludGVyTG9ja01hbmFnZXJYMTEuY3BwCkBA IC0yOSwxMSArMjksMTQgQEAKICNpZiBQTEFURk9STShYMTEpCiAKICNpbmNsdWRlICJXZWJQYWdl UHJveHkuaCIKLSNpbmNsdWRlIDxYMTEvWGxpYi5oPgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KICNp bmNsdWRlIDx3dGYvVFpvbmVNYWxsb2NJbmxpbmVzLmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIvR1Jl ZlB0ci5oPgogCisvLyBTb21lIG9mIHRoZSBtYWNyb3MgaW4gWDExL1guaCBjb25mbGljdCB3aXRo IGRlZmluaXRpb25zIGluIHRoZQorLy8gYm1hbGxvYyBjb2RlIHNvIHRoaXMgaW5jbHVkZSBtdXN0 IGNvbWUgYWZ0ZXIgdGhlbSAoIzI3ODg1OCkuCisjaW5jbHVkZSA8WDExL1hsaWIuaD4KKwogI2lm IFVTRShHVEs0KQogI2luY2x1ZGUgPGdkay94MTEvZ2RreC5oPgogI2Vsc2UK