diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-15 22:15:50 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-17 19:00:12 +0100 |
commit | 9715338b40fec4a84c9f8f58f49584787fd4e661 (patch) | |
tree | b0f15a43cdea6d5b005e00520586920cc85c2afc /rules | |
parent | 647b477db9678ea6f079b92aeb4c458a91ef1040 (diff) | |
download | ptxdist-9715338b40fec4a84c9f8f58f49584787fd4e661.tar.gz ptxdist-9715338b40fec4a84c9f8f58f49584787fd4e661.tar.xz |
xorg-lib-x11: version bump 1.6.2 -> 1.6.7
Also, split the locale data into a separate package. This way, libxkbcommon
can use it independently for key composing.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r-- | rules/host-xorg-lib-X11.make | 8 | ||||
-rw-r--r-- | rules/libx11-locale.in | 7 | ||||
-rw-r--r-- | rules/libx11-locale.make | 81 | ||||
-rw-r--r-- | rules/xorg-lib-X11.in | 58 | ||||
-rw-r--r-- | rules/xorg-lib-X11.make | 115 |
5 files changed, 106 insertions, 163 deletions
diff --git a/rules/host-xorg-lib-X11.make b/rules/host-xorg-lib-X11.make index 47d8c2c93..6a352c3b3 100644 --- a/rules/host-xorg-lib-X11.make +++ b/rules/host-xorg-lib-X11.make @@ -24,17 +24,23 @@ HOST_PACKAGES-$(PTXCONF_HOST_XORG_LIB_X11) += host-xorg-lib-x11 HOST_XORG_LIB_X11_CONF_TOOL := autoconf HOST_XORG_LIB_X11_CONF_OPT := \ $(HOST_AUTOCONF) \ + --disable-selective-werror \ + --disable-strict-compilation \ --disable-specs \ - --disable-secure-rpc \ --disable-loadable-i18n \ --disable-loadable-xcursor \ --disable-xthreads \ --disable-xcms \ --enable-xlocale \ + --enable-xlocaledir \ --disable-xf86bigfont \ --enable-xkb \ + --disable-composecache \ + --disable-lint-library \ + --disable-malloc0returnsnull \ $(XORG_OPTIONS_DOCS) \ --without-perl \ + --without-launchd \ --without-lint # vim: syntax=make diff --git a/rules/libx11-locale.in b/rules/libx11-locale.in new file mode 100644 index 000000000..80d962839 --- /dev/null +++ b/rules/libx11-locale.in @@ -0,0 +1,7 @@ +## SECTION=multimedia_libs + +config LIBX11_LOCALE + tristate + prompt "libx11 locale data" + help + X11 locale data files. diff --git a/rules/libx11-locale.make b/rules/libx11-locale.make new file mode 100644 index 000000000..0169d780b --- /dev/null +++ b/rules/libx11-locale.make @@ -0,0 +1,81 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Michael Olbrich <m.olbrich@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBX11_LOCALE) += libx11-locale + +# +# Paths and names +# +LIBX11_LOCALE_VERSION = $(XORG_LIB_X11_VERSION) +LIBX11_LOCALE_MD5 = $(XORG_LIB_X11_MD5) +LIBX11_LOCALE = libx11-locale-$(LIBX11_LOCALE_VERSION) +LIBX11_LOCALE_SUFFIX = $(XORG_LIB_X11_SUFFIX) +LIBX11_LOCALE_URL = $(XORG_LIB_X11_URL) +LIBX11_LOCALE_SOURCE = $(XORG_LIB_X11_SOURCE) +LIBX11_LOCALE_DIR = $(BUILDDIR)/$(LIBX11_LOCALE) +LIBX11_LOCALE_LICENSE = $(XORG_LIB_X11_LICENSE) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +# +# autoconf +# +LIBX11_LOCALE_CONF_TOOL := autoconf +LIBX11_LOCALE_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-selective-werror \ + --disable-strict-compilation \ + --disable-specs \ + $(XORG_OPTIONS_TRANS) \ + --disable-loadable-i18n \ + --disable-loadable-xcursor \ + --enable-xthreads \ + --enable-xcms \ + --enable-xlocale \ + --enable-xlocaledir \ + --disable-xf86bigfont \ + --disable-xkb \ + --enable-composecache \ + --disable-lint-library \ + --disable-malloc0returnsnull \ + $(XORG_OPTIONS_DOCS) \ + --without-perl \ + --without-launchd \ + --without-lint \ + --with-locale-lib-dir=$(XORG_DATADIR)/X11/locale + +LIBX11_LOCALE_MAKE_OPT := -C nls +LIBX11_LOCALE_INSTALL_OPT := -C nls install + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/libx11-locale.targetinstall: + @$(call targetinfo) + + @$(call install_init, libx11-locale) + @$(call install_fixup, libx11-locale,PRIORITY,optional) + @$(call install_fixup, libx11-locale,SECTION,base) + @$(call install_fixup, libx11-locale,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") + @$(call install_fixup, libx11-locale,DESCRIPTION,missing) + + @$(call install_tree, libx11-locale, 0, 0, -, $(XORG_DATADIR)/X11/locale,n) + + @$(call install_finish, libx11-locale) + + @$(call touch) + +# vim: syntax=make diff --git a/rules/xorg-lib-X11.in b/rules/xorg-lib-X11.in index 861d840e5..300911895 100644 --- a/rules/xorg-lib-X11.in +++ b/rules/xorg-lib-X11.in @@ -50,62 +50,4 @@ config XORG_LIB_X11_XKB applications handling keyboards need it. Note: this feature is marked as experimental if disabled! -config XORG_LIB_X11_INSTALL_LOCALE - depends on LOCALES - bool - prompt "XLOCALE Support" - default y - help - add XLOCALE Support, you will need this one if you have localized X - applications. - -config XORG_LIB_X11_INSTALL_LOCALE_8859_1 - depends on XORG_LIB_X11_INSTALL_LOCALE - depends on LOCALES_EN_US || LOCALES_EN_GB || LOCALES_DE_DE - bool - prompt "install iso8859-1 locale packet" - default y - help - install iso8859-1(latin alphabet No.1) locale files. - -config XORG_LIB_X11_INSTALL_LOCALE_8859_15 - depends on XORG_LIB_X11_INSTALL_LOCALE - depends on LOCALES_EN_GB_EURO || LOCALES_DE_DE_EURO - bool - prompt "install iso8859-15 locale packet" - default y - help - install iso8859-15(latin alphabet No.9) locale files. - -menu "Chinese locale packets " - depends on XORG_LIB_X11_INSTALL_LOCALE - -config XORG_LIB_X11_INSTALL_LOCALE_CHN_MAIN - depends on XORG_LIB_X11_INSTALL_LOCALE - depends on LOCALES_ZH_CN - bool - prompt "install chinese locales packet (mainland)" - help - install chinese locale files, including gb2303, gb18030 and utf8 - -config XORG_LIB_X11_INSTALL_LOCALE_CHN_HK - depends on XORG_LIB_X11_INSTALL_LOCALE - depends on LOCALES_ZH_HK - bool - prompt "install chinese locale packet (Hongkong)" - help - install chinese locale files, including big5 and big5hkcks as used - in Honkong. - -config XORG_LIB_X11_INSTALL_LOCALE_CHN_TW - depends on XORG_LIB_X11_INSTALL_LOCALE - depends on LOCALES_ZH_TW - bool - prompt "install chinese locale packet (Taiwan)" - help - install chinese locale files, including big5 and big5hkcks as used - in Taiwan. - -endmenu - endif diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make index 8b7ffaca6..1f99d1a55 100644 --- a/rules/xorg-lib-X11.make +++ b/rules/xorg-lib-X11.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11 # # Paths and names # -XORG_LIB_X11_VERSION := 1.6.2 -XORG_LIB_X11_MD5 := c35d6ad95b06635a524579e88622fdb5 +XORG_LIB_X11_VERSION := 1.6.7 +XORG_LIB_X11_MD5 := 034fdd6cc5393974d88aec6f5bc96162 XORG_LIB_X11 := libX11-$(XORG_LIB_X11_VERSION) XORG_LIB_X11_SUFFIX := tar.bz2 XORG_LIB_X11_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)) @@ -43,32 +43,27 @@ XORG_LIB_X11_CONF_ENV += ac_cv_func_mmap_fixed_mapped=yes XORG_LIB_X11_CONF_TOOL := autoconf XORG_LIB_X11_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-malloc0returnsnull \ + --datadir=$(XORG_DATADIR) \ + --disable-selective-werror \ + --disable-strict-compilation \ --disable-specs \ $(XORG_OPTIONS_TRANS) \ - --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_SECURE_RPC)-secure-rpc \ --$(call ptx/endis, PTXCONF_XORG_LIB_X11_I18N)-loadable-i18n \ --$(call ptx/endis, PTXCONF_XORG_LIB_X11_CURSOR)-loadable-xcursor \ --enable-xthreads \ --enable-xcms \ --enable-xlocale \ + --enable-xlocaledir \ --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XF86BIGFONT)-xf86bigfont \ --$(call ptx/endis, PTXCONF_XORG_LIB_X11_XKB)-xkb \ --enable-composecache \ + --disable-lint-library \ + --disable-malloc0returnsnull \ $(XORG_OPTIONS_DOCS) \ --without-perl \ - --without-lint - -# -# if no value is given ignore the "--datadir" switch -# -ifneq ($(call remove_quotes,$(XORG_DATADIR)),) -XORG_LIB_X11_CONF_OPT += --datadir=$(XORG_DATADIR) -endif - -# missing configure switches: -# --enable-xlocaledir Enable XLOCALEDIR environment variable support -# + --without-launchd \ + --without-lint \ + --with-locale-lib-dir=$(XORG_DATADIR)/X11/locale # ---------------------------------------------------------------------------- # Target-Install @@ -86,94 +81,6 @@ $(STATEDIR)/xorg-lib-x11.targetinstall: @$(call install_lib, xorg-lib-x11, 0, 0, 0644, libX11) @$(call install_lib, xorg-lib-x11, 0, 0, 0644, libX11-xcb) -# Where is it gone? -# @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ -# /usr/lib/X11/XKeysymDB) - -ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE - @$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/locale.alias,n) - - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/locale.dir,n) - - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/compose.dir,n) - - @$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale/C) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/C/Compose,n) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/C/XI18N_OBJS,n) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/C/XLC_LOCALE,n) - -endif - -ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_8859_1 - @$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale/iso8859-1) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/iso8859-1/Compose,n) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/iso8859-1/XI18N_OBJS,n) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/iso8859-1/XLC_LOCALE,n) -endif - -ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_8859_15 - @$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale/iso8859-15) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/iso8859-15/Compose,n) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/iso8859-15/XI18N_OBJS,n) - @$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/iso8859-15/XLC_LOCALE,n) -endif - -ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_CHN_MAIN - @cd $(XORG_LIB_X11_DIR)/nls; \ - for file in `find . -name "*zh_CN*" -type d`; do \ - echo "scanning $$file"; \ - if [ -d $$file ]; then \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/Compose,n); \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/XI18N_OBJS,n); \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/XLC_LOCALE,n); \ - fi; \ - done; -endif - -ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_CHN_HK - @cd $(XORG_LIB_X11_DIR)/nls; \ - for file in `find . -name "*zh_HK*" -type d`; do \ - if [ -d $$file ]; then \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/Compose,n); \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/XI18N_OBJS,n); \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/XLC_LOCALE,n); \ - fi; \ - done; -endif - -ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_CHN_TW - @cd $(XORG_LIB_X11_DIR)/nls; \ - for file in `find . -name "*zh_TW*" -type d`; do \ - if [ -d $$file ]; then \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/Compose,n); \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/XI18N_OBJS,n); \ - $(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \ - $(XORG_DATADIR)/X11/locale/$$file/XLC_LOCALE,n); \ - fi; \ - done; -endif - @$(call install_finish, xorg-lib-x11) @$(call touch) |