aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2002-08-03 07:59:08 +0800
committermbr <mbr@FreeBSD.org>2002-08-03 07:59:08 +0800
commit46de257af307e07fcd914e7bd5dddbbbbc821e44 (patch)
treef3e2036d13218a7c83aa1ecb5f69a29ed42810a9 /editors
parent7e72a4144cf253c22aeccdd03ebeb151fc14eda5 (diff)
downloadfreebsd-ports-gnome-46de257af307e07fcd914e7bd5dddbbbbc821e44.tar.gz
freebsd-ports-gnome-46de257af307e07fcd914e7bd5dddbbbbc821e44.tar.zst
freebsd-ports-gnome-46de257af307e07fcd914e7bd5dddbbbbc821e44.zip
The gcc31 port has been updated. It seems that g++ includes are again in
g++-v3. In all preview version they where located in g++. Remove part of this patch, so OO builds again with gcc31 (release)
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch30
-rw-r--r--editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice-3/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-1.1/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice/files/patch-stlport+STLport-4.5.patch30
-rw-r--r--editors/openoffice/files/patch-stlport::STLport-4.5.patch30
23 files changed, 23 insertions, 667 deletions
diff --git a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch b/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch
+++ b/editors/openoffice-1.0/files/patch-stlport::STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-1.1-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-1.1/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-2.0-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-3-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-3/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-1.0/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch b/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch
+++ b/editors/openoffice.org-1.0/files/patch-stlport::STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-1.1-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
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
index 8c482fea843a..2a34de03f4b1 100644
--- 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
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2.0-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2.0/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-2/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-3-RC/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-3-devel/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-3/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice.org-vcltesttool/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice/files/patch-stlport+STLport-4.5.patch b/editors/openoffice/files/patch-stlport+STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice/files/patch-stlport+STLport-4.5.patch
+++ b/editors/openoffice/files/patch-stlport+STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
diff --git a/editors/openoffice/files/patch-stlport::STLport-4.5.patch b/editors/openoffice/files/patch-stlport::STLport-4.5.patch
index 8c482fea843a..2a34de03f4b1 100644
--- a/editors/openoffice/files/patch-stlport::STLport-4.5.patch
+++ b/editors/openoffice/files/patch-stlport::STLport-4.5.patch
@@ -1,6 +1,6 @@
--- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002
+++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002
-@@ -174,3 +174,138 @@
+@@ -174,3 +174,110 @@
class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
public:
__Named_exception(const string& __str)
@@ -111,31 +111,3 @@
+ # include <stl/_cwchar.h>
+
+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
-+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002
-++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002
-+@@ -226,8 +226,13 @@
-+
-+ # if (__GNUC__ >= 3)
-+
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../g++
-++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-++#endif
-+
-+ # elif (__GNUC_MINOR__ < 8)
-+
-+@@ -261,7 +266,11 @@
-+ # if defined(__DJGPP)
-+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-++#ifdef __FreeBSD__
-++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++
-++#else
-+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-++#endif
-+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)