diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-03-03 16:46:11 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-03-03 16:46:42 +0100 |
| commit | c984dee8253eeac830e30d7917dbe1dfc7d44eb1 (patch) | |
| tree | ed205046379cb02a2593e384d30159702b017cf0 | |
| parent | b73b2bc42b82ba73c4e5d1328d3e57bc92d72963 (diff) | |
| download | ptxdist-c984dee8253eeac830e30d7917dbe1dfc7d44eb1.tar.gz ptxdist-c984dee8253eeac830e30d7917dbe1dfc7d44eb1.tar.xz | |
xkeyboard-config: version bump 2.0 -> 2.23.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/xkeyboard-config.in | 1 | ||||
| -rw-r--r-- | rules/xkeyboard-config.make | 27 |
2 files changed, 11 insertions, 17 deletions
diff --git a/rules/xkeyboard-config.in b/rules/xkeyboard-config.in index d37ece07d..038b8c307 100644 --- a/rules/xkeyboard-config.in +++ b/rules/xkeyboard-config.in @@ -4,6 +4,5 @@ config XKEYBOARD_CONFIG tristate prompt "xkeyboard-config" select HOST_INTLTOOL - select HOST_XORG_APP_XKBCOMP help FIXME diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make index 20de449a9..376598362 100644 --- a/rules/xkeyboard-config.make +++ b/rules/xkeyboard-config.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config # # Paths and names # -XKEYBOARD_CONFIG_VERSION := 2.0 -XKEYBOARD_CONFIG_MD5 := bb8a98ee61cdc4bd835fdfd2b5cee3e6 06a8c600d086988cc98ea186d39d552e +XKEYBOARD_CONFIG_VERSION := 2.23.1 +XKEYBOARD_CONFIG_MD5 := 875cbd09ab8394277fd16070326abbae XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION) XKEYBOARD_CONFIG_SUFFIX := tar.bz2 XKEYBOARD_CONFIG_URL := $(call ptx/mirror, XORG, individual/data/xkeyboard-config/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX)) @@ -29,15 +29,18 @@ XKEYBOARD_CONFIG_LICENSE := MIT # Prepare # ---------------------------------------------------------------------------- -XKEYBOARD_CONFIG_PATH := PATH=$(CROSS_PATH) -XKEYBOARD_CONFIG_ENV := $(CROSS_ENV) - # # autoconf # -XKEYBOARD_CONFIG_AUTOCONF := \ +XKEYBOARD_CONFIG_CONF_TOOL := autoconf +XKEYBOARD_CONFIG_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --datadir=$(XORG_DATADIR) + --enable-compat-rules \ + --disable-runtime-deps \ + --disable-nls \ + --disable-rpath \ + --without-xsltproc \ + --with-xkb-base=$(XORG_DATADIR)/X11/xkb \ # ---------------------------------------------------------------------------- # Target-Install @@ -52,15 +55,7 @@ $(STATEDIR)/xkeyboard-config.targetinstall: @$(call install_fixup, xkeyboard-config,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") @$(call install_fixup, xkeyboard-config,DESCRIPTION,missing) - @cd $(XKEYBOARD_CONFIG_PKGDIR) && \ - for dir in `find .$(XORG_DATADIR)/X11/xkb -type d`; do \ - $(call install_copy, xkeyboard-config, 0, 0, 0755, /$$dir); \ - done - @cd $(XKEYBOARD_CONFIG_PKGDIR) && \ - for file in `find .$(XORG_DATADIR)/X11/xkb -type f`; do\ - $(call install_copy, xkeyboard-config, 0, 0, 0644, \ - $(XKEYBOARD_CONFIG_PKGDIR)/$$file, /$$file); \ - done + @$(call install_tree, xkeyboard-config, 0, 0, -, $(XORG_DATADIR)/X11/xkb) @$(call install_finish, xkeyboard-config) |