From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 12/30] libxkbcommon: upgrade 1.13.1 -> 1.13.2
Date: Tue, 16 Jun 2026 21:16:08 +0200 [thread overview]
Message-ID: <20260616191628.2014553-12-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20260616191628.2014553-1-alex.kanavin@gmail.com>
From: Alexander Kanavin <alex@linutronix.de>
Backport a patch to address no-x11 failures.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
.../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 <dev@wismill.eu>
+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 <alex@linutronix.de>
+---
+ 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
next prev parent reply other threads:[~2026-06-16 19:16 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-16 19:15 [PATCH 01/30] gstreamer1.0: disable an intermittently failing test Alexander Kanavin
2026-06-16 19:15 ` [PATCH 02/30] gstreamer1.0: upgrade 1.28.2 -> 1.28.4 (the remaining pieces) Alexander Kanavin
2026-06-17 17:07 ` [OE-core] " Mathieu Dubois-Briand
2026-06-17 17:15 ` Alexander Kanavin
2026-06-16 19:15 ` [PATCH 03/30] glslang: upgrade 1.4.341.0 -> 1.4.350.0 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 04/30] vulkan-validation-layers: " Alexander Kanavin
2026-06-16 19:16 ` [PATCH 05/30] spirv-tools: " Alexander Kanavin
2026-06-16 19:16 ` [PATCH 06/30] vulkan-tools: " Alexander Kanavin
2026-06-16 19:16 ` [PATCH 07/30] vulkan-loader: " Alexander Kanavin
2026-06-16 19:16 ` [PATCH 08/30] vulkan-utility-libraries: " Alexander Kanavin
2026-06-16 19:16 ` [PATCH 09/30] gn: upgrade to latest revision Alexander Kanavin
2026-06-16 19:16 ` [PATCH 10/30] libmd: upgrade 1.1.0 -> 1.2.0 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 11/30] libslirp: upgrade 4.9.1 -> 4.9.3 Alexander Kanavin
2026-06-16 19:16 ` Alexander Kanavin [this message]
2026-06-16 19:16 ` [PATCH 13/30] minicom: upgrade 2.10 -> 2.11.1 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 14/30] wget: disable NTLM support Alexander Kanavin
2026-06-16 19:16 ` [PATCH 15/30] nettle: upgrade 3.10.2 -> 4.0 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 16/30] python3-shacl2code: upgrade 1.0.1 -> 1.1.0 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 17/30] which: upgrade 2.23 -> 2.25 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 18/30] dtc: upgrade 1.7.2 -> 1.8.1 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 19/30] jansson: add a recipe from meta-oe Alexander Kanavin
2026-06-16 19:16 ` [PATCH 20/30] igt-gpu-tools: upgrade 2.3 -> 2.4 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 21/30] libcap-ng: upgrade 0.9.1 -> 0.9.3 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 22/30] libfyaml: upgrade 0.9.4 -> 0.9.6 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 23/30] ltp: upgrade 20260130 -> 20260529 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 24/30] neard: upgrade 0.19 -> 0.20 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 25/30] perl: upgrade 5.42.0 -> 5.42.2 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 26/30] ppp: upgrade 2.5.2 -> 2.5.3 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 27/30] python3-dtc: upgrade 1.7.2 -> 1.8.1 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 28/30] tcf-agent: upgrade 1.9.0 -> 1.11.0 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 29/30] virglrenderer: upgrade 1.2.0 -> 1.3.0 Alexander Kanavin
2026-06-16 19:16 ` [PATCH 30/30] strace: remove skip-bpf.patch Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260616191628.2014553-12-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=alex@linutronix.de \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox