From: Alexander Kanavin <[email protected]> Backport a patch to address no-x11 failures.
Signed-off-by: Alexander Kanavin <[email protected]> --- .../0001-tools-Fix-info-on-macOS.patch | 40 +++++++++++++++++++ ...ommon_1.13.1.bb => libxkbcommon_1.13.2.bb} | 6 ++- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon/0001-tools-Fix-info-on-macOS.patch rename meta/recipes-graphics/xorg-lib/{libxkbcommon_1.13.1.bb => libxkbcommon_1.13.2.bb} (90%) diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon/0001-tools-Fix-info-on-macOS.patch b/meta/recipes-graphics/xorg-lib/libxkbcommon/0001-tools-Fix-info-on-macOS.patch new file mode 100644 index 0000000000..f63a5c7364 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon/0001-tools-Fix-info-on-macOS.patch @@ -0,0 +1,40 @@ +From c34f1edf1a22b584a8d554117a9b64985ddc04b0 Mon Sep 17 00:00:00 2001 +From: Pierre Le Marre <[email protected]> +Date: Thu, 12 Mar 2026 13:01:16 +0100 +Subject: [PATCH] tools: Fix info on macOS + +Alex: this also fixes failures on no-x11 builds. + +Upstream-Status: Backport [https://github.com/xkbcommon/libxkbcommon/commit/75b7da3f8698b3482ba6b11f3835561a3efb6a29] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + tools/info.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/tools/info.c b/tools/info.c +index faf0cf75..4c4f0aaa 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 }, diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.13.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.13.2.bb similarity index 90% rename from meta/recipes-graphics/xorg-lib/libxkbcommon_1.13.1.bb rename to meta/recipes-graphics/xorg-lib/libxkbcommon_1.13.2.bb index 42e6458090..ac02ad87c8 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.13.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.13.2.bb @@ -7,9 +7,11 @@ LICENSE = "MIT & MIT-open-group & HPND & HPND-sell-variant & X11" DEPENDS = "flex-native bison-native" -SRC_URI = "git://github.com/xkbcommon/libxkbcommon;protocol=https;branch=releases/v1.13;tag=xkbcommon-${PV}" +SRC_URI = "git://github.com/xkbcommon/libxkbcommon;protocol=https;branch=releases/v1.13;tag=xkbcommon-${PV} \ + file://0001-tools-Fix-info-on-macOS.patch \ + " -SRCREV = "6f76d19db72b5d450e927b41e1e96cbe3252aba8" +SRCREV = "d1442aaa6b635551182e83c3b55037f4c118c962" inherit meson pkgconfig bash-completion -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#238937): https://lists.openembedded.org/g/openembedded-core/message/238937 Mute This Topic: https://lists.openembedded.org/mt/119839173/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
