From 1ff07415380fed0d78d4b4d1d2c8d1d92e275b94 Mon Sep 17 00:00:00 2001
From: Eugene Doudine <dudinea@gmail.com>
Date: Tue, 25 Feb 2014 12:52:00 +0200
Subject: [PATCH] Addition of the en_US.UTF-8 locale: installation support

---
 cde/config/cf/site.def                             |  7 ++++++-
 cde/databases/CDE-FONTS.udb                        | 10 ++++++++++
 cde/databases/CDE-MSG-LOC.src                      | 14 ++++++++++++++
 cde/databases/Imakefile                            |  7 ++++++-
 cde/doc/en_US.UTF-8/Imakefile                      |  1 +
 cde/programs/fontaliases/linux/Imakefile           |  2 +-
 .../fontaliases/linux/en_US.UTF-8/Imakefile        |  1 +
 cde/programs/localized/en_US.UTF-8/Imakefile       |  0
 8 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 cde/doc/en_US.UTF-8/Imakefile
 create mode 100644 cde/programs/fontaliases/linux/en_US.UTF-8/Imakefile
 create mode 100644 cde/programs/localized/en_US.UTF-8/Imakefile

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index ebd52e58..ac114b69 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -107,10 +107,15 @@ XCOMM build the DtXinerama support
 
 XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
 XCOMM  or building non-C locales will cause build failures.
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(BSDArchitecture)
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 
+#if defined(LinuxArchitecture)
+# define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1 en_US.UTF-8
+# define UTF8_NLS_SUPPORT
+#endif
+
 #ifdef SunArchitecture
 #define HasCodeCenter        YES
 #define HasTestCenter        YES
diff --git a/cde/databases/CDE-FONTS.udb b/cde/databases/CDE-FONTS.udb
index f9f127aa..79fce157 100644
--- a/cde/databases/CDE-FONTS.udb
+++ b/cde/databases/CDE-FONTS.udb
@@ -215,6 +215,16 @@
 #
 # for Linux
 #
+#ifdef UTF8_NLS_SUPPORT
+programs/fontaliases/linux/en_US.UTF-8/fonts.alias
+{ linux
+	install_target = /usr/dt/config/xfonts/en_US.UTF-8/fonts.alias
+}
+programs/fontaliases/linux/en_US.UTF-8/fonts.dir
+{ linux
+	install_target = /usr/dt/config/xfonts/en_US.UTF-8/fonts.dir
+}
+#endif
 programs/fontaliases/linux/C/fonts.alias
 { linux
 	install_target = /usr/dt/config/xfonts/C/fonts.alias
diff --git a/cde/databases/CDE-MSG-LOC.src b/cde/databases/CDE-MSG-LOC.src
index 2b61d889..2a0b120a 100644
--- a/cde/databases/CDE-MSG-LOC.src
+++ b/cde/databases/CDE-MSG-LOC.src
@@ -388,6 +388,20 @@ programs/localized/%_LANG_%/msg/fmt_tbl.cat
 { default
 	install_target = /usr/dt/lib/nls/msg/%_LANG_%/fmt_tbl.cat
 }
+XCOMM ##########################################################################
+XCOMM en_US.UTF-8 locale: only directory is needed, rest of data comes from C
+XCOMM ##########################################################################
+#if defined(_ENGLISH_)
+#if defined(UTF8_NLS_SUPPORT)
+-
+{ default
+        type = directory
+        install_target = /usr/dt/lib/nls/msg/en_US.UTF-8
+        mode = 0555
+        status = ------
+}
+#endif
+#endif
 
 XCOMM ##########################################################################
 XCOMM 
diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index cc4f0c5b..845e2ee4 100644
--- a/cde/databases/Imakefile
+++ b/cde/databases/Imakefile
@@ -192,10 +192,15 @@ DBS = \
 clean::
 	$(RM) *.db
 
+
+#if defined UTF8_NLS_SUPPORT
+# define UTF8_NLS_SUPPORT_OPT -DUTF8_NLS_SUPPORT
+#endif
+
 /*
  * Default locale (C)
  */
-LOC_CPP_LIST = $(UDB_CPP_UNDEF_LIST) -D_ENGLISH_
+LOC_CPP_LIST = $(UDB_CPP_UNDEF_LIST) -D_ENGLISH_ UTF8_NLS_SUPPORT_OPT
 CppSourceFile(CDE-LOC-C.tmp,CDE-LOC.src,$(LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-C.tmp,CDE-HELP-LOC.src,$(LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-C.tmp,CDE-MSG-LOC.src,$(LOC_CPP_LIST),)
diff --git a/cde/doc/en_US.UTF-8/Imakefile b/cde/doc/en_US.UTF-8/Imakefile
new file mode 100644
index 00000000..c29e500f
--- /dev/null
+++ b/cde/doc/en_US.UTF-8/Imakefile
@@ -0,0 +1 @@
+XCOMM $XConsortium: Imakefile /main/10 1996/07/23 22:00:00 rws $
diff --git a/cde/programs/fontaliases/linux/Imakefile b/cde/programs/fontaliases/linux/Imakefile
index 6532167c..99007d89 100644
--- a/cde/programs/fontaliases/linux/Imakefile
+++ b/cde/programs/fontaliases/linux/Imakefile
@@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/09/13 16:34:13 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags  /**/
 
-SUBDIRS = C
+SUBDIRS = C en_US.UTF-8
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
diff --git a/cde/programs/fontaliases/linux/en_US.UTF-8/Imakefile b/cde/programs/fontaliases/linux/en_US.UTF-8/Imakefile
new file mode 100644
index 00000000..9d5b2eea
--- /dev/null
+++ b/cde/programs/fontaliases/linux/en_US.UTF-8/Imakefile
@@ -0,0 +1 @@
+XCOMM $XConsortium: Imakefile /main/3 1996/09/13 17:50:44 drk $
diff --git a/cde/programs/localized/en_US.UTF-8/Imakefile b/cde/programs/localized/en_US.UTF-8/Imakefile
new file mode 100644
index 00000000..e69de29b
-- 
2.25.1