From c6ce64e0ca830c33fca4f97d79383718e558c457 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Tue, 12 Aug 2003 22:31:00 +0000
Subject: Hopefully fix the wchar header issues one last time. It's annyoing to
 have changing includes paths with each new gcc import.

Submitted by:	maho
---
 .../files/patch-stlport::STLport-4.5.patch         | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 editors/openoffice.org-1.1/files/patch-stlport::STLport-4.5.patch

(limited to 'editors/openoffice.org-1.1')

diff --git a/editors/openoffice.org-1.1/files/patch-stlport::STLport-4.5.patch b/editors/openoffice.org-1.1/files/patch-stlport::STLport-4.5.patch
new file mode 100644
index 000000000000..1810ae36e6c0
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-stlport::STLport-4.5.patch
@@ -0,0 +1,53 @@
+--- ../stlport/STLport-4.5.patch	Thu Mar 27 12:54:46 2003
++++ ../stlport/STLport-4.5.patch	Tue Aug 12 12:07:48 2003
+@@ -65,27 +65,20 @@
+ ! 
+ *** misc/STLport-4.5/stlport/config/stl_gcc.h	Tue Sep  4 13:10:16 2001
+ --- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Mon Nov 11 09:37:18 2002
+-*************** typedef unsigned int wint_t;
+-*** 226,233 ****
+-  
+-  # if (__GNUC__ >= 3)
+-  
+-! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
+-! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+-  
+-  # elif (__GNUC_MINOR__ < 8)
+-
+---- 226,235 ----
+-  
+-  # if (__GNUC__ >= 3)
+-  
+-! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+-! #  define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
+-! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
+-!           GXX_INCLUDE_PATH/backward
+-  
+-  # elif (__GNUC_MINOR__ < 8)
+-
++@@ -226,8 +226,11 @@
++ 
++ # if (__GNUC__ >= 3)
++ 
++-#  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
++-#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
+++/* properly determine the STLP_NATIVE_INCLUDE_PATH */
+++#undef i386
+++#  define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/3.3
+++#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
+++          /usr/include/c++/3.3/backward
++ 
++ # elif (__GNUC_MINOR__ < 8)
++ 
+ *** misc/STLport-4.5/stlport/stdexcept	Mon May 21 20:50:21 2001
+ --- misc/build/STLport-4.5/stlport/stdexcept	Mon Nov 11 09:37:18 2002
+ ***************
+@@ -206,7 +199,7 @@
+  # endif
+  
+ +#ifdef __FreeBSD__
+-+# include <../wchar.h>
+++# include _STLP_NATIVE_C_HEADER(wchar.h)
+ +#endif
+  # include <stl/_cwchar.h>
+  
-- 
cgit v1.2.3