diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-11 21:22:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-11 21:22:25 +0200 |
| commit | 8e27619ab489dece35cc4bec86950ee7729cd309 (patch) | |
| tree | ab59dbc661e00c12ed4777cf9d0d37393c4163aa /libX11 | |
| parent | ffc99ce2402fe5c9a6eb8fcf193e8e9472fd993b (diff) | |
| parent | fdbedba4d50e1b28b0249c83ba11c029f096e400 (diff) | |
| download | vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.gz vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.bz2 vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/c_client.py
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
mesalib/src/glsl/.gitignore
mesalib/src/mesa/drivers/dri/common/xmlconfig.h
mesalib/src/mesa/main/.gitignore
xorg-server/Xext/xvmain.c
xorg-server/dix/dispatch.c
xorg-server/hw/xfree86/common/compiler.h
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/configure.ac | 23 | ||||
| -rw-r--r-- | libX11/nls/cs_CZ.UTF-8/Compose.pre | 12 | ||||
| -rw-r--r-- | libX11/nls/cs_CZ.UTF-8/XI18N_OBJS | 0 | ||||
| -rw-r--r-- | libX11/nls/cs_CZ.UTF-8/XLC_LOCALE.pre | 0 | ||||
| -rw-r--r-- | libX11/src/Makefile.am | 2 |
5 files changed, 25 insertions, 12 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index 161206114..047917dd8 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -431,17 +431,18 @@ AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data]) AC_SUBST(X11_LOCALEDIR) locales="\ - am_ET.UTF-8 armscii-8 C el_GR.UTF-8 en_US.UTF-8 fi_FI.UTF-8 \ - georgian-academy georgian-ps ibm-cp1133 iscii-dev isiri-3342 \ - iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \ - iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \ - iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\ - ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r koi8-u \ - ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 \ - mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 sr_CS.UTF-8 \ - tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \ - zh_CN zh_CN.gb18030 zh_CN.gbk zh_CN.UTF-8 zh_HK.big5 \ - zh_HK.big5hkscs zh_HK.UTF-8 zh_TW zh_TW.big5 zh_TW.UTF-8" + am_ET.UTF-8 armscii-8 C cs_CZ.UTF-8 el_GR.UTF-8 en_US.UTF-8 \ + fi_FI.UTF-8 georgian-academy georgian-ps ibm-cp1133 iscii-dev \ + isiri-3342 iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 \ + iso8859-15 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 \ + iso8859-7 iso8859-8 iso8859-9 iso8859-9e ja ja.JIS \ + ja_JP.UTF-8 ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r \ + koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \ + microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \ + sr_CS.UTF-8 tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn \ + vi_VN.viscii zh_CN zh_CN.gb18030 zh_CN.gbk zh_CN.UTF-8 \ + zh_HK.big5 zh_HK.big5hkscs zh_HK.UTF-8 zh_TW zh_TW.big5 \ + zh_TW.UTF-8" AC_SUBST(locales) XKEYSYMDB="${X11_DATADIR}/XKeysymDB" diff --git a/libX11/nls/cs_CZ.UTF-8/Compose.pre b/libX11/nls/cs_CZ.UTF-8/Compose.pre new file mode 100644 index 000000000..022753ea9 --- /dev/null +++ b/libX11/nls/cs_CZ.UTF-8/Compose.pre @@ -0,0 +1,12 @@ +XCOMM UTF-8 (Unicode) compose sequences +XCOMM +XCOMM Modified for Czech, following iso8859-2/Compose +XCOMM by James Cloos <cloos@jhcloos.com> +XCOMM based on bug report by Vladimír Marek <vlmarek@volny.cz> + +XCOMM Use the sequences from en_US.UTF-8 as the basis: +include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" + +XCOMM Overriding U with caron: +<dead_caron> <u> : "ů" U016F # LATIN SMALL LETTER U WITH RING ABOVE +<dead_caron> <U> : "Ů" U016E # LATIN CAPITAL LETTER U WITH RING ABOVE diff --git a/libX11/nls/cs_CZ.UTF-8/XI18N_OBJS b/libX11/nls/cs_CZ.UTF-8/XI18N_OBJS new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/libX11/nls/cs_CZ.UTF-8/XI18N_OBJS diff --git a/libX11/nls/cs_CZ.UTF-8/XLC_LOCALE.pre b/libX11/nls/cs_CZ.UTF-8/XLC_LOCALE.pre new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/libX11/nls/cs_CZ.UTF-8/XLC_LOCALE.pre diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am index d46b49301..ceb836625 100644 --- a/libX11/src/Makefile.am +++ b/libX11/src/Makefile.am @@ -398,7 +398,7 @@ lintlibdir = $(libdir) lintlib_DATA = $(LINTLIB) -lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c +lintlib_src = $(libX11_la_SOURCES) $(srcdir)/xcms/*.c $(srcdir)/xkb/*.c CLEANFILES += $(lintlib_DATA) |