From a31c45a0b4b17f5d096eed1898c2707ee051cbfc Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Tue, 2 Apr 2002 23:48:28 +0000
Subject: Upgrade to build 641d. More work is necessary to make the build
 compile. There are still at least two different gcc bugs in our compiler, one
 issue has already been found by Alexander Kabaev <ak03@gte.com>. He's working
 on fixing the other.

---
 .../files/patch-tools::source::string::charset.cxx | 36 ----------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 editors/openoffice/files/patch-tools::source::string::charset.cxx

(limited to 'editors/openoffice/files/patch-tools::source::string::charset.cxx')

diff --git a/editors/openoffice/files/patch-tools::source::string::charset.cxx b/editors/openoffice/files/patch-tools::source::string::charset.cxx
deleted file mode 100644
index ebee79ce414b..000000000000
--- a/editors/openoffice/files/patch-tools::source::string::charset.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../tools/source/string/charset.cxx.orig	Sun Mar 10 23:55:47 2002
-+++ ../tools/source/string/charset.cxx	Mon Mar 11 00:00:56 2002
-@@ -64,12 +64,14 @@
- #elif defined( OS2 )
- #define INCL_DOSNLS
- #include <svpm.h>
--#elif defined(LINUX) || defined(SOLARIS)
-+#elif defined(LINUX) || defined(SOLARIS) || defined(FREEBSD)
- #include <stdio.h>
- #include <stdlib.h>
- #include <strings.h>
- #include <locale.h>
-+#if !defined(FREEBSD) || OSVERSION > 500000
- #include <langinfo.h>
-+#endif
- #ifndef _TOOLS_LANG_HXX
- #include <lang.hxx>
- #endif
-@@ -126,7 +128,7 @@
- 
- // -----------------------------------------------------------------------
- 
--#if defined(NETBSD) || defined(SCO)
-+#if defined(NETBSD) || defined(SCO) || defined(FREEBSD)
- 
- // check if there is a charset qualifier at the end of the given locale string
- // e.g. de.ISO8859-15 or de.ISO8859-15@euro which strongly indicates what
-@@ -707,7 +709,7 @@
- #ifdef UNX
-         CharSet nTextEncoding;
- 
--#if defined(NETBSD) || defined(SCO)
-+#if defined(NETBSD) || defined(SCO) || defined(FREEBSD)
-         nTextEncoding = GetSystemCharSetFromEnvironment();
-         if (nTextEncoding == RTL_TEXTENCODING_DONTKNOW)
-             nTextEncoding = GetSystemCharSetFromSystemLanguage();
-- 
cgit v1.2.3