* [ptxdist] [PATCH] xkeyboard-config: Version bump. 2.33 -> 2.35.1
@ 2022-03-10 10:25 Christian Melki
2022-03-14 10:14 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2022-03-10 10:25 UTC (permalink / raw)
To: ptxdist
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 <christian.melki@t2data.com>
---
rules/xkeyboard-config.in | 2 ++
rules/xkeyboard-config.make | 18 +++++++-----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/rules/xkeyboard-config.in b/rules/xkeyboard-config.in
index 07930039f..fbd481a5b 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 2d789db67..fb1456bf5 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
--
2.32.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] xkeyboard-config: Version bump. 2.33 -> 2.35.1
2022-03-10 10:25 [ptxdist] [PATCH] xkeyboard-config: Version bump. 2.33 -> 2.35.1 Christian Melki
@ 2022-03-14 10:14 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-03-14 10:14 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 05567a5ead52053b895b102a29a9ebb0286067fb.
Michael
[sent from post-receive hook]
On Mon, 14 Mar 2022 11:14:38 +0100, Christian Melki <christian.melki@t2data.com> 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 <christian.melki@t2data.com>
> Message-Id: <20220310102513.1403020-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-14 10:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-10 10:25 [ptxdist] [PATCH] xkeyboard-config: Version bump. 2.33 -> 2.35.1 Christian Melki
2022-03-14 10:14 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox