libxkbcommon: update to version 1.13.2

Pass the xkb-config extensions path options explicitly: 1.13.2 adds
versioned and unversioned extensions directories, and tools/info.c
references DFLT_XKB_CONFIG_*_EXTENSIONS_PATH unconditionally while meson
only defines them when an xkeyboard-config root is detected, which broke
the build otherwise. Refresh 100-no-python.patch for the new source.

https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-1.13.2/NEWS.md
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2026-06-09 08:38:08 +01:00
parent f3270beefa
commit a5e8aecf2b
2 changed files with 7 additions and 5 deletions
+6 -4
View File
@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libxkbcommon
PKG_VERSION:=1.13.1
PKG_RELEASE:=2
PKG_VERSION:=1.13.2
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=xkbcommon-$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/xkbcommon/$(PKG_NAME).git
PKG_MIRROR_HASH:=aa1e7c8746054a1294129eb8f22b8e378c75361571079ee0cef97d1890632e75
PKG_MIRROR_HASH:=84d08ef1896ca5eb84d29d6134c95ce0076eac2a1d91b87cc24ccfa5e70cbe25
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=BSD-3-Clause
@@ -22,7 +22,9 @@ include $(INCLUDE_DIR)/meson.mk
MESON_ARGS += \
-Denable-x11=false \
-Denable-docs=false \
-Denable-wayland=true
-Denable-wayland=true \
-Dxkb-config-unversioned-extensions-path=/usr/share/xkeyboard-config.d \
-Dxkb-config-versioned-extensions-path=/usr/share/X11/xkb.d
define Package/libxkbcommon
SECTION:=libs
@@ -1,6 +1,6 @@
--- a/meson.build
+++ b/meson.build
@@ -1055,7 +1055,7 @@ test(
@@ -1068,7 +1068,7 @@ test(
pymod = import('python')
python = pymod.find_installation('python3', modules: ['jinja2'], required: false)
has_merge_modes_tests = python.found() and python.language_version().version_compare('>=3.11')