From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Mar 2022 11:16:22 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nThkU-002llp-AL for lore@lore.pengutronix.de; Mon, 14 Mar 2022 11:16:22 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nThkT-0007Y2-Ls; Mon, 14 Mar 2022 11:16:21 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nThiq-0005RX-6Q; Mon, 14 Mar 2022 11:14:40 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nThiq-000cgT-R0; Mon, 14 Mar 2022 11:14:39 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nThio-00AbEb-R1; Mon, 14 Mar 2022 11:14:38 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 14 Mar 2022 11:14:38 +0100 Message-Id: <20220314101438.2526365-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220310102513.1403020-1-christian.melki@t2data.com> References: <20220310102513.1403020-1-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] xkeyboard-config: Version bump. 2.33 -> 2.35.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 05567a5ead52053b895b102a29a9ebb0286067fb. Michael [sent from post-receive hook] On Mon, 14 Mar 2022 11:14:38 +0100, Christian Melki 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 > Message-Id: <20220310102513.1403020-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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