- More fixes for gcc4.

  Still doesn't build for me: xml2cmp crashes later.

Changed files:
    libreoffice.spec -> 1.567
    openoffice.org-gcc4.diff -> 1.1

diff --git a/libreoffice.spec b/libreoffice.spec
index a0f366756b396830abc00adafe8a57e4054ba24c..9370f8844e279c44c796c6624d085158a4aac566 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -146,6 +146,7 @@ Patch1:             %{name}-STL-lib64.diff
 Patch2:                %{name}-filter.patch
 Patch3:                buildfix-64bit-sc.diff
 Patch4:                %{name}-desktop.patch
+Patch5:                %{name}-gcc4.diff
 
 URL:           http://www.openoffice.org/
 BuildRequires: ImageMagick
@@ -1668,6 +1669,8 @@ ln -sf %{SOURCE400} %{SOURCE401} %{SOURCE402} %{SOURCE403} %{SOURCE404} \
 # add to ooo-build patch-system
 install %{PATCH1} patches/src680
 install %{PATCH3} patches/64bit
+install %{PATCH5} patches/src680
+(echo "[ Fixes ]"; echo `basename %{PATCH5}`) >>patches/OOO_2_0/apply
 # fake patch to make buildsystem happy (patch is included)
 touch patches/64bit/cws-ooo64bit02.2005-04-19-math-h.diff
 

diff --git a/openoffice.org-gcc4.diff b/openoffice.org-gcc4.diff
new file mode 100644 (file)
index 0000000..fb414c5
--- /dev/null
+++ b/openoffice.org-gcc4.diff
@@ -0,0 +1,23 @@
+--- autodoc/source/tools/filecoll.cxx.~1.8.~   2005-09-07 21:12:43.000000000 +0200
++++ autodoc/source/tools/filecoll.cxx  2005-12-24 20:50:22.000000000 +0100
+@@ -41,6 +41,9 @@
+ #include <cosv/ploc_dir.hxx>
+ 
+ 
++#include <stdio.h>
++
++
+ FileCollector::FileCollector( uintt i_nRoughNrOfFiles )
+     // :    aFoundFiles
+ {
+--- sal/inc/internal/allocator.hxx.~1.4.~      2005-09-08 16:25:55.000000000 +0200
++++ sal/inc/internal/allocator.hxx     2005-12-24 21:09:16.000000000 +0100
+@@ -175,7 +175,7 @@
+ /* REQUIRED BY STLPort (see stlport '_alloc.h'): 
+    Hack for compilers that do not support member 
+    template classes (e.g. MSVC 6) */
+-namespace _STL
++namespace stlp_std
+ {
+       template<class T, class U>
+       inline sal::Allocator<U> & __stl_alloc_rebind (sal::Allocator<T> & a, U const *)