Date: Sun, 27 Apr 2008 08:18:47 GMT From: Dmitry Klimov <lazyklimm@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/123137: x11/libX11: missing ru_RU.UTF-8 locale Message-ID: <200804270818.m3R8IlWs036314@www.freebsd.org> Resent-Message-ID: <200804270820.m3R8K9rj090091@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123137
>Category: ports
>Synopsis: x11/libX11: missing ru_RU.UTF-8 locale
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 27 08:20:09 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Klimov
>Release: RELENG_6
>Organization:
TrueBSD
>Environment:
FreeBSD hp.Home 6.3-STABLE FreeBSD 6.3-STABLE #0: Thu Apr 17 17:14:09 MSD 2008 root@hp.Home:/usr/obj/usr/src/sys/HP i386
>Description:
There is an old bug in libX11 - missing cyrillic UTF-8 locales (ru_RU.UTF-8), which causes incorrect (cyrillic) fonts displaying in some old apps(which use libX11 or GTK12 for font rendering - I use x11-fm/worker and russian/xmms)
Many linux distributions(eg gentoo, arch) solve this problem by some kind of hack, which (IMHO) would be impossible in FreeBSD ports.
These patches(EXTRA_PATCHES of course) add locale ru_RU.UTF-8 in almost clean way, other cyrillic(uk_UA.UTF-8, be_BY.UTF-8, bg_BG.UTF-8) locales coming soon.
NB: 1)I've commented CJK symbols description in XLC_LOCALE.pre, because they hangs xorg while choosing iso10646 fonts(There's no fonts in ports for some of East Asian encodings), en_US.UTF-8 locale has the same promplem.
>How-To-Repeat:
1)portinstall worker, xmms or any other localized gtk1 app
2)LC_ALL=ru_RU.UTF-8 xmms
>Fix:
Here is b64encoded port
begin-base64 644 libX11-utf8.tgz
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
YRM2YRM2YRM2YRP+A8L/AGYvl1oA8AAA
====
Or see below diff -ruN
Patch attached with submission follows:
diff -ruN x11/libX11/Makefile x11/libX11-utf8/Makefile
--- x11/libX11/Makefile 2008-04-19 21:54:26.000000000 +0400
+++ x11/libX11-utf8/Makefile 2008-04-27 11:24:01.000000000 +0400
@@ -7,14 +7,15 @@
PORTNAME= libX11
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 library
-OPTIONS= XCB "use XCB for low-level protocol implementation" off
+OPTIONS= XCB "use XCB for low-level protocol implementation" off \
+ CYRUTF8 "Enable cyrillic UTF-8 locales" on
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
@@ -35,5 +36,21 @@
PLIST_SUB+= XCB="@comment "
.endif
+.if defined(WITH_CYRUTF8)
+post-extract:
+ ${CP} -R ${WRKSRC}/nls/en_US.UTF-8 ${WRKSRC}/nls/ru_RU.UTF-8
+
+EXTRA_PATCHES+= ${FILESDIR}/extra-configure.ac.diff \
+ ${FILESDIR}/extra-configure.diff \
+ ${FILESDIR}/extra-nls-Makefile.am.diff \
+ ${FILESDIR}/extra-nls-Makefile.in.diff \
+ ${FILESDIR}/extra-nls-compose.dir.pre.diff \
+ ${FILESDIR}/extra-nls-locale.alias.pre.diff \
+ ${FILESDIR}/extra-nls-locale.dir.pre.diff \
+ ${FILESDIR}/extra-nls-ru_RU.UTF-8-Makefile.am.diff \
+ ${FILESDIR}/extra-nls-ru_RU.UTF-8-Makefile.in.diff \
+ ${FILESDIR}/extra-nls-ru_RU.UTF-8-XLC_LOCALE.pre
+.endif
+
.include "${.CURDIR}/manpages"
.include <bsd.port.post.mk>
diff -ruN x11/libX11/files/extra-configure.ac.diff x11/libX11-utf8/files/extra-configure.ac.diff
--- x11/libX11/files/extra-configure.ac.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-configure.ac.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,10 @@
+--- configure.ac.orig 2008-04-23 12:38:59.000000000 +0400
++++ configure.ac 2008-04-23 12:41:09.000000000 +0400
+@@ -403,6 +403,7 @@
+ nls/C/Makefile
+ nls/el_GR.UTF-8/Makefile
+ nls/en_US.UTF-8/Makefile
++ nls/ru_RU.UTF-8/Makefile
+ nls/georgian-academy/Makefile
+ nls/georgian-ps/Makefile
+ nls/ibm-cp1133/Makefile
diff -ruN x11/libX11/files/extra-configure.diff x11/libX11-utf8/files/extra-configure.diff
--- x11/libX11/files/extra-configure.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-configure.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,19 @@
+--- configure.orig 2008-04-23 12:38:43.000000000 +0400
++++ configure 2008-04-23 12:40:43.000000000 +0400
+@@ -24327,7 +24327,7 @@
+
+
+
+-ac_config_files="$ac_config_files Makefile include/Makefile man/Makefile man/xkb/Makefile src/Makefile src/util/Makefile src/xcms/Makefile src/xlibi18n/Makefile modules/Makefile modules/im/Makefile modules/im/ximcp/Makefile modules/lc/Makefile modules/lc/def/Makefile modules/lc/gen/Makefile modules/lc/Utf8/Makefile modules/lc/xlocale/Makefile modules/om/Makefile modules/om/generic/Makefile src/xkb/Makefile nls/Makefile nls/armscii-8/Makefile nls/C/Makefile nls/el_GR.UTF-8/Makefile nls/en_US.UTF-8/Makefile nls/georgian-academy/Makefile nls/georgian-ps/Makefile nls/ibm-cp1133/Makefile nls/iscii-dev/Makefile nls/isiri-3342/Makefile nls/iso8859-1/Makefile nls/iso8859-10/Makefile nls/iso8859-11/Makefile nls/iso8859-13/Makefile nls/iso8859-14/Makefile nls/iso8859-15/Makefile nls/iso8859-2/Makefile nls/iso8859-3/Makefile nls/iso8859-4/Makefile nls/iso8859-5/Makefile nls/iso8859-6/Makefile nls/iso8859-7/Makefile nls/iso8859-8/Makefile nls/iso8859-9/Makefile nls/iso8859-9e/Makefile
nls/ja/Makefile nls/ja.JIS/Makefile nls/ja_JP.UTF-8/Makefile nls/ja.S90/Makefile nls/ja.SJIS/Makefile nls/ja.U90/Makefile nls/ko/Makefile nls/koi8-c/Makefile nls/koi8-r/Makefile nls/koi8-u/Makefile nls/ko_KR.UTF-8/Makefile nls/microsoft-cp1251/Makefile nls/microsoft-cp1255/Makefile nls/microsoft-cp1256/Makefile nls/mulelao-1/Makefile nls/nokhchi-1/Makefile nls/pt_BR.UTF-8/Makefile nls/tatar-cyr/Makefile nls/th_TH/Makefile nls/th_TH.UTF-8/Makefile nls/tscii-0/Makefile nls/vi_VN.tcvn/Makefile nls/vi_VN.viscii/Makefile nls/zh_CN/Makefile nls/zh_CN.gb18030/Makefile nls/zh_CN.gbk/Makefile nls/zh_CN.UTF-8/Makefile nls/zh_HK.big5/Makefile nls/zh_HK.big5hkscs/Makefile nls/zh_HK.UTF-8/Makefile nls/zh_TW/Makefile nls/zh_TW.big5/Makefile nls/zh_TW.UTF-8/Makefile x11.pc x11-xcb.pc"
++ac_config_files="$ac_config_files Makefile include/Makefile man/Makefile man/xkb/Makefile src/Makefile src/util/Makefile src/xcms/Makefile src/xlibi18n/Makefile modules/Makefile modules/im/Makefile modules/im/ximcp/Makefile modules/lc/Makefile modules/lc/def/Makefile modules/lc/gen/Makefile modules/lc/Utf8/Makefile modules/lc/xlocale/Makefile modules/om/Makefile modules/om/generic/Makefile src/xkb/Makefile nls/Makefile nls/armscii-8/Makefile nls/C/Makefile nls/el_GR.UTF-8/Makefile nls/en_US.UTF-8/Makefile nls/ru_RU.UTF-8/Makefile nls/georgian-academy/Makefile nls/georgian-ps/Makefile nls/ibm-cp1133/Makefile nls/iscii-dev/Makefile nls/isiri-3342/Makefile nls/iso8859-1/Makefile nls/iso8859-10/Makefile nls/iso8859-11/Makefile nls/iso8859-13/Makefile nls/iso8859-14/Makefile nls/iso8859-15/Makefile nls/iso8859-2/Makefile nls/iso8859-3/Makefile nls/iso8859-4/Makefile nls/iso8859-5/Makefile nls/iso8859-6/Makefile nls/iso8859-7/Makefile nls/iso8859-8/Makefile nls/iso8859-9/Makefile
nls/iso8859-9e/Makefile nls/ja/Makefile nls/ja.JIS/Makefile nls/ja_JP.UTF-8/Makefile nls/ja.S90/Makefile nls/ja.SJIS/Makefile nls/ja.U90/Makefile nls/ko/Makefile nls/koi8-c/Makefile nls/koi8-r/Makefile nls/koi8-u/Makefile nls/ko_KR.UTF-8/Makefile nls/microsoft-cp1251/Makefile nls/microsoft-cp1255/Makefile nls/microsoft-cp1256/Makefile nls/mulelao-1/Makefile nls/nokhchi-1/Makefile nls/pt_BR.UTF-8/Makefile nls/tatar-cyr/Makefile nls/th_TH/Makefile nls/th_TH.UTF-8/Makefile nls/tscii-0/Makefile nls/vi_VN.tcvn/Makefile nls/vi_VN.viscii/Makefile nls/zh_CN/Makefile nls/zh_CN.gb18030/Makefile nls/zh_CN.gbk/Makefile nls/zh_CN.UTF-8/Makefile nls/zh_HK.big5/Makefile nls/zh_HK.big5hkscs/Makefile nls/zh_HK.UTF-8/Makefile nls/zh_TW/Makefile nls/zh_TW.big5/Makefile nls/zh_TW.UTF-8/Makefile x11.pc x11-xcb.pc"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -25024,6 +25024,7 @@
+ "nls/C/Makefile") CONFIG_FILES="$CONFIG_FILES nls/C/Makefile" ;;
+ "nls/el_GR.UTF-8/Makefile") CONFIG_FILES="$CONFIG_FILES nls/el_GR.UTF-8/Makefile" ;;
+ "nls/en_US.UTF-8/Makefile") CONFIG_FILES="$CONFIG_FILES nls/en_US.UTF-8/Makefile" ;;
++ "nls/ru_RU.UTF-8/Makefile") CONFIG_FILES="$CONFIG_FILES nls/ru_RU.UTF-8/Makefile" ;;
+ "nls/georgian-academy/Makefile") CONFIG_FILES="$CONFIG_FILES nls/georgian-academy/Makefile" ;;
+ "nls/georgian-ps/Makefile") CONFIG_FILES="$CONFIG_FILES nls/georgian-ps/Makefile" ;;
+ "nls/ibm-cp1133/Makefile") CONFIG_FILES="$CONFIG_FILES nls/ibm-cp1133/Makefile" ;;
diff -ruN x11/libX11/files/extra-nls-Makefile.am.diff x11/libX11-utf8/files/extra-nls-Makefile.am.diff
--- x11/libX11/files/extra-nls-Makefile.am.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-Makefile.am.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,10 @@
+--- nls/Makefile.am.orig 2008-04-23 11:58:32.000000000 +0400
++++ nls/Makefile.am 2008-04-23 12:00:33.000000000 +0400
+@@ -52,6 +52,7 @@
+ mulelao-1 \
+ nokhchi-1 \
+ pt_BR.UTF-8 \
++ ru_RU.UTF-8 \
+ tatar-cyr \
+ th_TH \
+ th_TH.UTF-8 \
diff -ruN x11/libX11/files/extra-nls-Makefile.in.diff x11/libX11-utf8/files/extra-nls-Makefile.in.diff
--- x11/libX11/files/extra-nls-Makefile.in.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-Makefile.in.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,10 @@
+--- nls/Makefile.in.orig 2008-04-23 11:58:44.000000000 +0400
++++ nls/Makefile.in 2008-04-23 12:01:06.000000000 +0400
+@@ -279,6 +279,7 @@
+ mulelao-1 \
+ nokhchi-1 \
+ pt_BR.UTF-8 \
++ ru_RU.UTF-8 \
+ tatar-cyr \
+ th_TH \
+ th_TH.UTF-8 \
diff -ruN x11/libX11/files/extra-nls-compose.dir.pre.diff x11/libX11-utf8/files/extra-nls-compose.dir.pre.diff
--- x11/libX11/files/extra-nls-compose.dir.pre.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-compose.dir.pre.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,11 @@
+--- nls/compose.dir.pre.orig 2007-05-16 19:34:44.000000000 +0400
++++ nls/compose.dir.pre 2008-04-22 23:45:15.000000000 +0400
+@@ -355,7 +355,7 @@
+ pt_BR.UTF-8/Compose: pt_BR.UTF-8
+ en_US.UTF-8/Compose: pt_PT.UTF-8
+ en_US.UTF-8/Compose: ro_RO.UTF-8
+-en_US.UTF-8/Compose: ru_RU.UTF-8
++ru_RU.UTF-8/Compose: ru_RU.UTF-8
+ en_US.UTF-8/Compose: ru_UA.UTF-8
+ en_US.UTF-8/Compose: rw_RW.UTF-8
+ en_US.UTF-8/Compose: si_LK.UTF-8
diff -ruN x11/libX11/files/extra-nls-locale.alias.pre.diff x11/libX11-utf8/files/extra-nls-locale.alias.pre.diff
--- x11/libX11/files/extra-nls-locale.alias.pre.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-locale.alias.pre.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,30 @@
+--- nls/locale.alias.pre.orig 2007-05-16 19:34:44.000000000 +0400
++++ nls/locale.alias.pre 2008-04-22 23:45:15.000000000 +0400
+@@ -889,8 +889,8 @@
+ ro_RO.iso88592: ro_RO.ISO8859-2
+ ro_RO.ISO-8859-2: ro_RO.ISO8859-2
+ ro_RO.utf8: ro_RO.UTF-8
+-ru: ru_RU.ISO8859-5
+-ru_RU: ru_RU.ISO8859-5
++ru: ru_RU.UTF-8
++ru_RU: ru_RU.UTF-8
+ ru_RU.iso88595: ru_RU.ISO8859-5
+ ru_RU.ISO-8859-5: ru_RU.ISO8859-5
+ ru_RU.koi8r: ru_RU.KOI8-R
+@@ -898,6 +898,7 @@
+ ru_RU.microsoftcp1251: ru_RU.CP1251
+ ru_RU.microsoft-cp1251: ru_RU.CP1251
+ ru_RU.MICROSOFT-CP1251: ru_RU.CP1251
++ru_RU.ISO10646-1 ru_RU.UTF-8
+ #if defined(INCLUDE_ru_SU)
+ XCOMM ru_SU is redundant now
+ ru_SU: ru_RU.KOI8-R
+@@ -1197,7 +1198,7 @@
+ portuguese.iso88591: pt_PT.ISO8859-1
+ romanian: ro_RO.ISO8859-2
+ rumanian: ro_RO.ISO8859-2
+-russian: ru_RU.ISO8859-5
++russian: ru_RU.UTF-8
+ serbocroatian: sr_CS.ISO8859-2
+ sinhala: si_LK.UTF-8
+ slovak: sk_SK.ISO8859-2
diff -ruN x11/libX11/files/extra-nls-locale.dir.pre.diff x11/libX11-utf8/files/extra-nls-locale.dir.pre.diff
--- x11/libX11/files/extra-nls-locale.dir.pre.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-locale.dir.pre.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,19 @@
+--- nls/locale.dir.pre.orig 2007-05-16 19:34:44.000000000 +0400
++++ nls/locale.dir.pre 2008-04-22 23:45:15.000000000 +0400
+@@ -197,6 +197,7 @@
+ iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
+ microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
+ koi8-r/XLC_LOCALE: ru_RU.KOI8-R
++ru_RU.UTF-8/XLC_LOCALE: ru_RU.UTF-8
+ koi8-u/XLC_LOCALE: ru_UA.KOI8-U
+ iso8859-1/XLC_LOCALE: rw_RW.ISO8859-1
+ iso8859-2/XLC_LOCALE: sh_YU.ISO8859-2
+@@ -382,7 +383,7 @@
+ pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
+ en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
+-en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
++#en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
+ en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
+ en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
+ en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
diff -ruN x11/libX11/files/extra-nls-ru_RU.UTF-8-Makefile.am.diff x11/libX11-utf8/files/extra-nls-ru_RU.UTF-8-Makefile.am.diff
--- x11/libX11/files/extra-nls-ru_RU.UTF-8-Makefile.am.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-ru_RU.UTF-8-Makefile.am.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,7 @@
+--- nls/ru_RU.UTF-8/Makefile.am.orig 2008-04-22 23:45:56.000000000 +0400
++++ nls/ru_RU.UTF-8/Makefile.am 2008-04-22 23:46:27.000000000 +0400
+@@ -1,3 +1,3 @@
+-x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8
++x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
+
+ include $(top_srcdir)/nls/localerules.in
diff -ruN x11/libX11/files/extra-nls-ru_RU.UTF-8-Makefile.in.diff x11/libX11-utf8/files/extra-nls-ru_RU.UTF-8-Makefile.in.diff
--- x11/libX11/files/extra-nls-ru_RU.UTF-8-Makefile.in.diff 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-ru_RU.UTF-8-Makefile.in.diff 2008-04-27 11:21:05.000000000 +0400
@@ -0,0 +1,32 @@
+--- nls/ru_RU.UTF-8/Makefile.in.orig 2008-04-22 23:46:06.000000000 +0400
++++ nls/ru_RU.UTF-8/Makefile.in 2008-04-22 23:47:53.000000000 +0400
+@@ -39,7 +39,7 @@
+ DIST_COMMON = $(dist_x11thislocale_DATA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/cpprules.in \
+ $(top_srcdir)/nls/localerules.in
+-subdir = nls/en_US.UTF-8
++subdir = nls/ru_RU.UTF-8
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+@@ -219,7 +219,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8
++x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
+ SUFFIXES = .pre
+ WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
+ CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
+@@ -254,9 +254,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/en_US.UTF-8/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign nls/ru_RU.UTF-8/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign nls/en_US.UTF-8/Makefile
++ $(AUTOMAKE) --foreign nls/ru_RU.UTF-8/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
diff -ruN x11/libX11/files/extra-nls-ru_RU.UTF-8-XLC_LOCALE.pre x11/libX11-utf8/files/extra-nls-ru_RU.UTF-8-XLC_LOCALE.pre
--- x11/libX11/files/extra-nls-ru_RU.UTF-8-XLC_LOCALE.pre 1970-01-01 03:00:00.000000000 +0300
+++ x11/libX11-utf8/files/extra-nls-ru_RU.UTF-8-XLC_LOCALE.pre 2008-04-27 11:55:02.000000000 +0400
@@ -0,0 +1,216 @@
+--- nls/ru_RU.UTF-8/XLC_LOCALE.pre.orig 2008-04-27 11:24:24.000000000 +0400
++++ nls/ru_RU.UTF-8/XLC_LOCALE.pre 2008-04-27 11:53:42.000000000 +0400
+@@ -1,5 +1,5 @@
+-XCOMM $XFree86: xc/nls/XLC_LOCALE/en_US.UTF-8,v 1.2 2000/02/29 03:09:07 dawes Exp $
+-XCOMM XLocale Database Sample for en_US.UTF-8
++XCOMM
++XCOMM XLocale Database Sample for ru_RU.UTF-8
+ XCOMM
+
+ XCOMM
+@@ -11,72 +11,72 @@
+
+ object_name generic
+
+-XCOMM fs0 class (7 bit ASCII)
++XCOMM ISO10646 should come last so the fonts above will actually be used
++XCOMM fs0 class
+ fs0 {
+ charset {
+- name ISO8859-1:GL
++ name ISO10646-1
+ }
+ font {
+- primary ISO8859-1:GL
+- vertical_rotate all
++ primary ISO10646-1
+ }
+ }
+-XCOMM fs1 class (ISO8859 families)
++XCOMM fs1 class (7 bit ASCII)
+ fs1 {
+ charset {
+- name ISO8859-1:GR
+- }
+- font {
+- primary ISO8859-1:GR
+- }
+-}
+-XCOMM fs2 class (Kanji)
+-fs2 {
+- charset {
+- name JISX0208.1983-0:GL
+- }
+- font {
+- primary JISX0208.1983-0:GL
+- }
+-}
+-XCOMM fs3 class (Korean Character)
+-fs3 {
+- charset {
+- name KSC5601.1987-0:GL
+- }
+- font {
+- primary KSC5601.1987-0:GL
+- }
+-}
+-XCOMM fs4 class (Chinese Han Character)
+-fs4 {
+- charset {
+- name GB2312.1980-0:GL
+- }
+- font {
+- primary GB2312.1980-0:GL
+- }
+-}
+-XCOMM fs5 class (Half Kana)
+-fs5 {
+- charset {
+- name JISX0201.1976-0:GR
++ name ISO8859-1:GL
+ }
+ font {
+- primary JISX0201.1976-0:GR
++ primary ISO8859-1:GL
+ vertical_rotate all
+ }
+ }
+-XCOMM ISO10646 should come last so the fonts above will actually be used
+-XCOMM fs6 class
+-fs6 {
++XCOMM fs2 class (ISO8859 families)
++fs2 {
+ charset {
+- name ISO10646-1
++ name ISO8859-1:GR
+ }
+ font {
+- primary ISO10646-1
++ primary ISO8859-1:GR
+ }
+ }
++XCOMM fs3 class (Kanji)
++XCOMMfs3 {
++XCOMM charset {
++XCOMM name JISX0208.1983-0:GL
++XCOMM }
++XCOMM font {
++XCOMM primary JISX0208.1983-0:GL
++XCOMM }
++XCOMM}
++XCOMM fs4 class (Korean Character)
++XCOMMfs4 {
++XCOMM charset {
++XCOMM name KSC5601.1987-0:GL
++XCOMM }
++XCOMM font {
++XCOMM primary KSC5601.1987-0:GL
++XCOMM }
++XCOMM}
++XCOMM fs5 class (Chinese Han Character)
++XCOMMfs5 {
++XCOMM charset {
++XCOMM name GB2312.1980-0:GL
++XCOMM }
++XCOMM font {
++XCOMM primary GB2312.1980-0:GL
++XCOMM }
++XCOMM}
++XCOMM fs6 class (Half Kana)
++XCOMMfs6 {
++XCOMM charset {
++XCOMM name JISX0201.1976-0:GR
++XCOMM }
++XCOMM font {
++XCOMM primary JISX0201.1976-0:GR
++XCOMM vertical_rotate all
++XCOMM }
++XCOMM}
+ END XLC_FONTSET
+
+ XCOMM
+@@ -90,52 +90,52 @@
+
+ XCOMM cs0 class
+ cs0 {
++ side none
++ ct_encoding ISO10646-1
++}
++
++XCOMM cs1 class
++cs1 {
+ side GL:Default
+ length 1
+ ct_encoding ISO8859-1:GL
+ }
+
+-XCOMM cs1 class
+-cs1 {
++XCOMM cs2 class
++cs2 {
+ side GR:Default
+ length 1
+ ct_encoding ISO8859-1:GR
+ }
+
+-XCOMM cs2 class
+-cs2 {
+- side GR
+- length 2
+- ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
+- JISX0208.1983-1:GL; JISX0208.1983-1:GR
+-}
+-
+ XCOMM cs3 class
+-cs3 {
+- side GL
+- length 2
+- ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
+- KSC5601.1987-1:GL; KSC5601.1987-1:GR
+-}
+-
++XCOMMcs3 {
++XCOMM side GR
++XCOMM length 2
++XCOMM ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR
++XCOMM
++XCOMM}
++
+ XCOMM cs4 class
+-cs4 {
+- side GR
+- length 2
+- ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
+-}
++XCOMMcs4 {
++XCOMM side GL
++XCOMM length 2
++XCOMM ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR; KSC5601.1987-1:GL; KSC5601.1987-1:GR
++XCOMM
++XCOMM}
+
+ XCOMM cs5 class
+-cs5 {
+- side GR
+- length 1
+- ct_encoding JISX0201.1976-0:GR
+-}
+-
++XCOMMcs5 {
++XCOMM side GR
++XCOMM length 2
++XCOMM ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
++XCOMM}
++
+ XCOMM cs6 class
+-cs6 {
+- side none
+- ct_encoding ISO10646-1
+-}
++XCOMMcs6 {
++XCOMM side GR
++XCOMM length 1
++XCOMM ct_encoding JISX0201.1976-0:GR
++XCOMM}
+
+ END XLC_XLOCALE
diff -ruN x11/libX11/pkg-plist x11/libX11-utf8/pkg-plist
--- x11/libX11/pkg-plist 2007-06-06 20:25:02.000000000 +0400
+++ x11/libX11-utf8/pkg-plist 2008-04-27 11:21:05.000000000 +0400
@@ -35,6 +35,9 @@
lib/X11/locale/en_US.UTF-8/XI18N_OBJS
lib/X11/locale/en_US.UTF-8/XLC_LOCALE
lib/X11/locale/en_US.UTF-8/Compose
+lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE
+lib/X11/locale/ru_RU.UTF-8/Compose
lib/X11/locale/georgian-academy/XI18N_OBJS
lib/X11/locale/georgian-academy/XLC_LOCALE
lib/X11/locale/georgian-academy/Compose
@@ -250,6 +253,7 @@
@dirrm lib/X11/locale/ibm-cp1133
@dirrm lib/X11/locale/georgian-ps
@dirrm lib/X11/locale/georgian-academy
+@dirrm lib/X11/locale/ru_RU.UTF-8
@dirrm lib/X11/locale/en_US.UTF-8
@dirrm lib/X11/locale/el_GR.UTF-8
@dirrm lib/X11/locale/C
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804270818.m3R8IlWs036314>