rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.3, 1.4 openoffice.org.spec, 1.1976, 1.1977

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16063/devel

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
	openoffice.org.spec 
Log Message:
little fix

openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx |    1 +
 sc/source/filter/ftools/ftools.cxx                 |    1 +
 soltools/mkdepend/def.h                            |    2 +-
 soltools/mkdepend/main.c                           |    2 +-
 soltools/mkdepend/parse.c                          |    4 ++--
 sw/source/core/doc/docbm.cxx                       |    4 ++--
 sw/source/filter/ww8/WW8TableInfo.cxx              |    1 +
 7 files changed, 9 insertions(+), 6 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	12 Mar 2009 13:45:06 -0000	1.3
+++ openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	5 Aug 2009 22:07:27 -0000	1.4
@@ -86,3 +86,14 @@ Index: mkdepend/parse.c
  		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
  		case IF:
  		case IFFALSE:
+diff -ru bridges.orig/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:02.000000000 +0100
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:34.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include "precompiled_bridges.hxx"
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -p -r1.1976 -r1.1977
--- openoffice.org.spec	29 Jul 2009 12:37:35 -0000	1.1976
+++ openoffice.org.spec	5 Aug 2009 22:07:27 -0000	1.1977
@@ -1712,8 +1712,8 @@ autoconf
  --with-system-headers --with-system-apache-commons \
  --with-system-mozilla --with-system-libtextcat --with-system-redland \
  --with-system-dicts --with-external-dict-dir=/usr/share/myspell \
- --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc \
- --without-agg --without-ppds --without-afms --without-writer2latex \
+ --without-myspell-dicts --without-system-mspack --without-fonts \
+ --without-gpc --without-agg --without-ppds --without-afms \
  %{stlflags} --with-lang="%{langpack_langs}" \
  --with-poor-help-localizations="$POORHELPS"