CVS commit: pkgsrc/x11/libxkbcommon

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May 20 10:01:48 UTC 2024

Modified Files:
        pkgsrc/x11/libxkbcommon: Makefile

Log Message:
libxkbcommon: fix dead keys support with native X

Tested by pin@

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/libxkbcommon/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libxkbcommon/Makefile
diff -u pkgsrc/x11/libxkbcommon/Makefile:1.48 pkgsrc/x11/libxkbcommon/Makefile:1.49
--- pkgsrc/x11/libxkbcommon/Makefile:1.48       Fri Apr  5 10:36:19 2024
+++ pkgsrc/x11/libxkbcommon/Makefile    Mon May 20 10:01:48 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2024/04/05 10:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2024/05/20 10:01:48 wiz Exp $
 
 DISTNAME=      libxkbcommon-1.7.0
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  https://xkbcommon.org/download/
 EXTRACT_SUFX=  .tar.xz
@@ -22,6 +23,13 @@ PKGCONFIG_OVERRIDE+=         output/meson-priva
 PKGCONFIG_OVERRIDE+=           output/meson-private/xkbcommon-x11.pc
 PKGCONFIG_OVERRIDE_STAGE=      post-configure
 
+.include "../../mk/bsd.prefs.mk"
+
+# native X has a different locale path (lib) than modular X (share)
+.if ${X11_TYPE} == native
+MESON_ARGS+=   -Dx-locale-root=${X11BASE}/lib/X11/locale
+.endif
+
 .include "options.mk"
 
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"