diff options
| author | mbr <mbr@FreeBSD.org> | 2002-09-03 19:12:25 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-09-03 19:12:25 +0800 |
| commit | 02984b7b1975ac344190ba5949622caca8451249 (patch) | |
| tree | e17e2c2014acd0ca2423c81ceb76268391b95ed1 /editors | |
| parent | 7322e2e736a11e8f569a24efeb5d10997e2d4bb4 (diff) | |
| download | freebsd-ports-graphics-02984b7b1975ac344190ba5949622caca8451249.tar.gz freebsd-ports-graphics-02984b7b1975ac344190ba5949622caca8451249.tar.zst freebsd-ports-graphics-02984b7b1975ac344190ba5949622caca8451249.zip | |
Add UTF-8 support to locale. Correct a comment.
Submitted by: Matthew Reimer <mreimer@vpop.net>
Diffstat (limited to 'editors')
23 files changed, 207 insertions, 184 deletions
diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c +++ b/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c +++ b/editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } diff --git a/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c b/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c index 8107caa02bc..7fa1cd5d789 100644 --- a/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c +++ b/editors/openoffice/files/patch-sal::osl::unx::nlsupport.c @@ -1,5 +1,5 @@ ---- ../sal/osl/unx/nlsupport.c.orig Wed Aug 14 18:22:49 2002 -+++ ../sal/osl/unx/nlsupport.c Wed Aug 14 19:07:18 2002 +--- ../sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 ++++ ../sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 @@ -63,7 +63,7 @@ #include <osl/diagnose.h> #include <osl/process.h> @@ -31,7 +31,7 @@ * from nl_langinfo(CODESET) to rtl_textencoding defines. - * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.5 and >= FreeBSD 4.4 ++ * >= NetBSD 1.6 and >= FreeBSD 4.4 * * This routine is SLOW because of the setlocale call, so * grab the result and cache it. @@ -87,7 +87,7 @@ const _pair _nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ -@@ -496,7 +502,58 @@ +@@ -496,7 +502,59 @@ { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; @@ -112,7 +112,8 @@ + { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US } /* US-ASCII */ ++ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ ++ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ +}; + +#elif defined(NETBSD) @@ -147,7 +148,7 @@ static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; -@@ -618,7 +675,7 @@ +@@ -618,7 +676,7 @@ return ret; } @@ -156,7 +157,7 @@ /* * FIXME: the MacOS X implemetation is missing -@@ -651,7 +708,7 @@ +@@ -651,7 +709,7 @@ return 0; } @@ -165,7 +166,7 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +944,6 @@ +@@ -887,6 +945,6 @@ return 0; } |