mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-31 05:41:08 +00:00
Code Issues Releases Activity

Make this patch up-to-date

Browse Source
This commit is contained in:
Maho Nakata 2003-08-15 23:54:41 +00:00
parent 06a66651cd
commit 55757c281c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=87017
17 changed files with 425 additions and 901 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
editors/openoffice-1.1-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice-1.1/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice-2.0-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice-3-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice-3/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-1.1-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-1.1/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-2-RC/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-2-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-2.0-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-2.0/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-2/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-3-RC/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-3-devel/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-3/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>

78
editors/openoffice.org-vcltesttool/files/patch-stlport::STLport-4.5.patch
View File

@ -1,53 +1,25 @@
--- ../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>
--- ../stlport/STLport-4.5.patch.orig Sat Aug 16 08:45:46 2003
+++ ../stlport/STLport-4.5.patch Sat Aug 16 08:52:25 2003
@@ -254,11 +254,12 @@
# elif (__GNUC_MINOR__ < 8)
---- 244,253 ----
+--- 244,254 ----
# if (__GNUC__ >= 3)
! /* properly determine the STLP_NATIVE_INCLUDE_PATH */
+! #undef i386
! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
! GXX_INCLUDE_PATH/backward
@@ -274,7 +275,7 @@
# endif
+ #ifdef __FreeBSD__
-+ # include <../wchar.h>
++ #include _STLP_NATIVE_C_HEADER(wchar.h)
+ #endif
# include <stl/_cwchar.h>