Submitted By: Pierre Labastie Date: 2026-06-09 Initial Package Version: 1.13.2 Upstream Status: applied Origin: Upstream Description: A new file tools/info.c has been added in 1.13.2 It lacks #ifdef's, and fails to build with the BLFS instructions (it's not limited to MacOS)... From 75b7da3f8698b3482ba6b11f3835561a3efb6a29 Mon Sep 17 00:00:00 2001 From: Pierre Le Marre Date: Thu, 12 Mar 2026 13:01:16 +0100 Subject: [PATCH] tools: Fix info on macOS --- tools/info.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/info.c b/tools/info.c index faf0cf754..4c4f0aaa2 100644 --- a/tools/info.c +++ b/tools/info.c @@ -86,8 +86,20 @@ main(int argc, char **argv) { "XKB_CONFIG_ROOT", DFLT_XKB_CONFIG_ROOT }, { "XKB_CONFIG_LEGACY_ROOT", DFLT_XKB_LEGACY_ROOT }, { "XKB_CONFIG_EXTRA_PATH", DFLT_XKB_CONFIG_EXTRA_PATH }, - { "XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH", DFLT_XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH }, - { "XKB_CONFIG_VERSIONED_EXTENSIONS_PATH", DFLT_XKB_CONFIG_VERSIONED_EXTENSIONS_PATH }, + { "XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH", +#ifdef DFLT_XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH + DFLT_XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH +#else + "" +#endif + }, + { "XKB_CONFIG_VERSIONED_EXTENSIONS_PATH", +#ifdef DFLT_XKB_CONFIG_UNVERSIONED_EXTENSIONS_PATH + DFLT_XKB_CONFIG_VERSIONED_EXTENSIONS_PATH +#else + "" +#endif + }, { "XKB_DEFAULT_RULES", DEFAULT_XKB_RULES }, { "XKB_DEFAULT_MODEL", DEFAULT_XKB_MODEL }, { "XKB_DEFAULT_LAYOUT", DEFAULT_XKB_LAYOUT },