mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Add UTF-8 support to locale. Correct a comment.

Browse Source 
Submitted by:	Matthew Reimer <mreimer@vpop.net>
This commit is contained in:
Martin Blapp 2002-09-03 11:12:25 +00:00
parent 8399651ce8
commit 4aedd0d3e2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=65557
23 changed files with 207 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
View File

@ -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;
}

17
editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice-3/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-1.0/files/patch-sal::osl::unx::nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-1.1/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-2-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-2.0/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-2/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-3-RC/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-3-devel/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-3/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice/files/patch-sal+osl+unx+nlsupport.c
View File

@ -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;
}

17
editors/openoffice/files/patch-sal::osl::unx::nlsupport.c
View File

@ -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;
}