Thanks, applied as 05567a5ead52053b895b102a29a9ebb0286067fb. Michael
[sent from post-receive hook] On Mon, 14 Mar 2022 11:14:38 +0100, Christian Melki <[email protected]> wrote: > Mostly translation updates/fixes. > https://github.com/freedesktop/xkeyboard-config/blob/master/NEWS > > * Autoconf was completely dropped. Meson only. > * Compression delivery format changed to xz. > * Meson ruleset does not seem to be able to explicitly disable > xsltproc. > * Depends on host-gettext, not sure how this was managed before. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/xkeyboard-config.in b/rules/xkeyboard-config.in > index 07930039fc10..fbd481a5b74e 100644 > --- a/rules/xkeyboard-config.in > +++ b/rules/xkeyboard-config.in > @@ -3,7 +3,9 @@ > config XKEYBOARD_CONFIG > tristate > prompt "xkeyboard-config" > + select HOST_MESON > select HOST_SYSTEM_PYTHON3 > select HOST_INTLTOOL > + select HOST_GETTEXT > help > FIXME > diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make > index 2d789db6709e..fb1456bf5760 100644 > --- a/rules/xkeyboard-config.make > +++ b/rules/xkeyboard-config.make > @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config > # > # Paths and names > # > -XKEYBOARD_CONFIG_VERSION := 2.33 > -XKEYBOARD_CONFIG_MD5 := 49282f120fd22c6c860004931c03c595 > +XKEYBOARD_CONFIG_VERSION := 2.35.1 > +XKEYBOARD_CONFIG_MD5 := cea34f56cdf13c4a82b264bc513fe834 > XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION) > -XKEYBOARD_CONFIG_SUFFIX := tar.bz2 > +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) > @@ -32,15 +32,11 @@ XKEYBOARD_CONFIG_LICENSE_FILES := \ > # > # autoconf > # > -XKEYBOARD_CONFIG_CONF_TOOL := autoconf > +XKEYBOARD_CONFIG_CONF_TOOL := meson > XKEYBOARD_CONFIG_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --enable-compat-rules \ > - --disable-runtime-deps \ > - --disable-nls \ > - --disable-rpath \ > - --without-xsltproc \ > - --with-xkb-base=$(XORG_DATADIR)/X11/xkb \ > + $(CROSS_MESON_USR) \ > + -Dcompat-rules=true \ > + -Dxkb-base=$(XORG_DATADIR)/X11/xkb > > # > ---------------------------------------------------------------------------- > # Target-Install _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
