[ptxdist] [PATCH] xkeyboard-config: version bump 2.42 -> 2.46

[ptxdist] [PATCH] xkeyboard-config: version bump 2.42 -> 2.46

[Sven Püschel]

xkeyboard-config now uses a versioned directory to allow having
breaking change updates [1]. The /X11/xkb directory is now just a
symlink to the current version.

The xkb-base parameter wasn't used and therefore removed [2].
Instead the meson datadir was overwritten with the XORD_DATADIR to
match the variable usage in the targetinstall step.
Also the other meson options were added to the option list
with their default values.

The license file changed due to a license error fix [3].
As the COPYING file contains multiple licenses, each of them were
evaluated with the SPDX Online Tool [4] and added to the list of
licenses. The fixed license previously had the
xkeyboard-config-Zinoviev SPDX Identifier. As the fixed version doesn't
match any license and the SPDX identifier is very specific to
xkeyboard-config the old SPDX identifier is used.

[1] https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/fd1d8d2d4f07ac494109b1a9e72d7fe777f6757a
[2] https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/7f4bfd3af1b6448cc0e37a56a8f9a929c1219696
[3] https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8d42430f6498ceb1f9ca31f2fb9d0419c682912b
[4] https://tools.spdx.org/app/check_license/

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/xkeyboard-config.make | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make
index 19e732e24..3a964615d 100644
--- a/rules/xkeyboard-config.make
+++ b/rules/xkeyboard-config.make
@@ -14,16 +14,16 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config
 #
 # Paths and names
 #
-XKEYBOARD_CONFIG_VERSION	:= 2.42
-XKEYBOARD_CONFIG_MD5		:= 2d3b7e43e597f4c607ad6261e2b3d77f
+XKEYBOARD_CONFIG_VERSION	:= 2.46
+XKEYBOARD_CONFIG_MD5		:= ca851f0e5bc0f52f2fb4629babc344c1
 XKEYBOARD_CONFIG		:= xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION)
 XKEYBOARD_CONFIG_SUFFIX		:= tar.xz
 XKEYBOARD_CONFIG_URL		:= $(call ptx/mirror, XORG, individual/data/xkeyboard-config/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX))
 XKEYBOARD_CONFIG_SOURCE		:= $(SRCDIR)/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX)
 XKEYBOARD_CONFIG_DIR		:= $(BUILDDIR)/$(XKEYBOARD_CONFIG)
-XKEYBOARD_CONFIG_LICENSE	:= MIT
+XKEYBOARD_CONFIG_LICENSE	:= HPND-sell-variant AND X11-distribute-modifications-variant AND MIT-open-group AND MIT AND X11 AND xkeyboard-config-Zinoviev
 XKEYBOARD_CONFIG_LICENSE_FILES	:= \
-	file://COPYING;md5=8fc8ae699974c360e2e2e883a63ce264
+	file://COPYING;md5=faa756e04053029ddc602caf99e5ef1d
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -36,7 +36,10 @@ XKEYBOARD_CONFIG_CONF_TOOL	:= meson
 XKEYBOARD_CONFIG_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
 	-Dcompat-rules=true \
-	-Dxkb-base=$(XORG_DATADIR)/X11/xkb
+	-Dxorg-rules-symlinks=false \
+	-Dnls=true \
+	-Dnon-latin-layouts-list=false \
+	-Ddatadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -51,7 +54,8 @@ $(STATEDIR)/xkeyboard-config.targetinstall:
 	@$(call install_fixup, xkeyboard-config,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
 	@$(call install_fixup, xkeyboard-config,DESCRIPTION,missing)
 
-	@$(call install_tree, xkeyboard-config, 0, 0, -, $(XORG_DATADIR)/X11/xkb)
+	@$(call install_tree, xkeyboard-config, 0, 0, -, $(XORG_DATADIR)/xkeyboard-config-$(basename $(XKEYBOARD_CONFIG_VERSION)))
+	@$(call install_link, xkeyboard-config, $(XORG_DATADIR)/xkeyboard-config-$(basename $(XKEYBOARD_CONFIG_VERSION)), $(XORG_DATADIR)/X11/xkb)
 
 	@$(call install_finish, xkeyboard-config)
 
-- 
2.47.3