Add a ru_RU.UTF-8 locale

Based on patch by Eugene Konev <ejka@imfi.kspu.ru> for X.Org 6.9.0.

Debian bug#330144 <http://bugs.debian.org/330144>
X.Org bug#15887 <http://bugs.freedesktop.org/show_bug.cgi?id=15887>

8 files changed, 184 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index afcf02a7..e0f1aa79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,7 @@ AC_OUTPUT([Makefile
 	   nls/mulelao-1/Makefile
 	   nls/nokhchi-1/Makefile
 	   nls/pt_BR.UTF-8/Makefile
+	   nls/ru_RU.UTF-8/Makefile
 	   nls/tatar-cyr/Makefile
 	   nls/th_TH/Makefile
 	   nls/th_TH.UTF-8/Makefile
diff --git a/cpprules.in b/cpprules.in
index 12964fa8..52e34a01 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -22,6 +22,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 .pre:
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 62ca44d7..d6ec4e14 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -54,6 +54,7 @@ SUBDIRS= \
 	mulelao-1		\
 	nokhchi-1		\
 	pt_BR.UTF-8		\
+	ru_RU.UTF-8		\
 	tatar-cyr		\
 	th_TH			\
 	th_TH.UTF-8		\
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 3e2c8ef4..44655687 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -394,7 +394,7 @@ en_US.UTF-8/XLC_LOCALE:			pp_AN.UTF-8
 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
+ru_RU.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 --git a/nls/ru_RU.UTF-8/Compose.pre b/nls/ru_RU.UTF-8/Compose.pre
new file mode 100644
index 00000000..6c2c4114
--- /dev/null
+++ b/nls/ru_RU.UTF-8/Compose.pre
@@ -0,0 +1 @@
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
diff --git a/nls/ru_RU.UTF-8/Makefile.am b/nls/ru_RU.UTF-8/Makefile.am
new file mode 100644
index 00000000..f138e53d
--- /dev/null
+++ b/nls/ru_RU.UTF-8/Makefile.am
@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
+
+include $(top_srcdir)/nls/localerules.in
diff --git a/nls/ru_RU.UTF-8/XI18N_OBJS b/nls/ru_RU.UTF-8/XI18N_OBJS
new file mode 100644
index 00000000..842fc27f
--- /dev/null
+++ b/nls/ru_RU.UTF-8/XI18N_OBJS
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for ru_RU.UTF-8 locale
+#
+XLC	common/xlcUTF8Load	_XlcUtf8Loader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/nls/ru_RU.UTF-8/XLC_LOCALE.pre b/nls/ru_RU.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 00000000..d2f397e4
--- /dev/null
+++ b/nls/ru_RU.UTF-8/XLC_LOCALE.pre
@@ -0,0 +1,169 @@
+XCOMM
+XCOMM	XLocale Database Sample for ru_RU.UTF-8
+XCOMM	Derived from en_US.UTF-8
+XCOMM
+
+XCOMM
+XCOMM 	XLC_FONTSET category
+XCOMM
+XLC_FONTSET
+
+on_demand_loading	True
+
+object_name		generic
+
+XCOMM 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary	ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+XCOMM	fs1 class (ISO8859 families)
+fs1	{
+	charset	{
+		name	ISO8859-1:GR
+	}
+	font	{
+		primary	ISO8859-1:GR
+	}
+}
+XCOMM	fs2 class (KOI8-R)
+fs2	{
+	charset	{
+		name	KOI8-R:GR
+	}
+	font	{
+		primary	KOI8-R:GR
+	}
+}
+XCOMM	fs3 class (MICROSOFT-CP1251)
+fs3	{
+	charset	{
+		name	MICROSOFT-CP1251:GR
+	}
+	font	{
+		primary	MICROSOFT-CP1251:GR
+	}
+}
+XCOMM	fs4 class (ISO8859-5)
+fs4	{
+	charset	{
+		name	ISO8859-5:GR
+	}
+	font	{
+		primary	ISO8859-5:GR
+	}
+}
+XCOMM 	fs5 class (Kanji)
+fs5	{
+	charset	{
+		name	JISX0208.1983-0:GL
+	}
+	font	{
+		primary	JISX0208.1983-0:GL
+	}
+}
+XCOMM	fs6 class (Korean Character)
+fs6	{
+	charset	{
+		name	KSC5601.1987-0:GL
+	}
+	font	{
+		primary	KSC5601.1987-0:GL
+	}
+}
+XCOMM	fs7 class (Chinese Han Character)
+fs7	{
+	charset	{
+		name	GB2312.1980-0:GL
+	}
+	font	{
+		primary	GB2312.1980-0:GL
+	}
+}
+XCOMM	fs8 class (Half Kana)
+fs8	{
+	charset	{
+		name	JISX0201.1976-0:GR
+	}
+	font	{
+		primary		JISX0201.1976-0:GR
+		vertical_rotate	all
+	}
+}
+XCOMM	ISO10646 should come last so the fonts above will actually be used
+XCOMM	fs9 class
+fs9	{
+	charset	{
+		name	ISO10646-1
+	}
+	font	{
+		primary	ISO10646-1
+	}
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM 	XLC_XLOCALE category
+XCOMM
+XLC_XLOCALE
+
+encoding_name		UTF-8
+mb_cur_max		6
+state_depend_encoding	False
+
+XCOMM	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	ct_encoding	ISO8859-1:GL
+}
+
+XCOMM	cs1 class
+cs1     {
+        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
+
+}
+
+XCOMM	cs4 class
+cs4     {
+        side            GR
+        length          2
+        ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+
+XCOMM	cs5 class
+cs5	{
+	side		GR
+	length		1
+	ct_encoding	JISX0201.1976-0:GR
+}
+
+XCOMM	cs6 class
+cs6	{
+	side		none
+	ct_encoding	ISO10646-1
+}
+
+END XLC_XLOCALE