qemu fails to build

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

hello
in HEAD qemu fails to build (not related to the recent 8.0.2 update, it
did fail with 8.0.0 in the same way):
[5880/6893] Generating pc-bios/keymaps/bepo with a custom command
FAILED: pc-bios/keymaps/bepo 
/usr/tmp/emulators/qemu/work/qemu-8.0.2/build/qemu-keymap -f pc-bios/keymaps/bep
o -l fr -v dvorak
xkbcommon: ERROR: failed to add default include path /usr/X11R7/share/X11/xkb
[...]
/usr/tmp/emulators/qemu/work/qemu-8.0.2/build/qemu-keymap -f pc-bios/keymaps/ar -l ar
xkbcommon: ERROR: failed to add default include path /usr/X11R7/share/X11/xkb
[5883/6893] Generating pc-bios/edk2-x86_64-secure-code.fd with a custom command (wrapped by meson to capture output)
ninja: build stopped: subcommand failed.
*** Error code 1

indeed the correct path is /usr/X11R7/lib/X11/xkb

I tracked it down to x11/libxkbcommon not using the correct path.
The attached patch fixes it for me, allowing qemu to build.
Any comment ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxkbcommon/Makefile,v
retrieving revision 1.44
diff -u -p -u -r1.44 Makefile
--- Makefile	19 Apr 2023 08:11:54 -0000	1.44
+++ Makefile	7 Jun 2023 11:39:40 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.44 2023/04/19 08:11:54 adam Exp $
 
 DISTNAME=	libxkbcommon-1.5.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 EXTRACT_SUFX=	.tar.xz
@@ -15,6 +15,13 @@ USE_TOOLS+=	bison pkg-config
 
 MESON_ARGS+=	-Denable-wayland=false
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} == "native" &&  ${OPSYS} == "NetBSD"
+MESON_ARGS+=	-Dxkb-config-root=${X11BASE:Q}/lib/X11/xkb
+MESON_ARGS+=	-Dx-locale-root=${X11BASE:Q}/lib/X11/locale
+.endif
+
 MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output
 
 PYTHON_FOR_BUILD_ONLY=	tool