rpms/openoffice.org/devel openoffice.org.spec, 1.1413, 1.1414 workspace.gcc430two.patch, 1.1, 1.2

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Sat Feb 2 11:27:04 UTC 2008 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32507

Modified Files:
	openoffice.org.spec workspace.gcc430two.patch 
Log Message:
fix up gcc 4.3.0 patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -u -r1.1413 -r1.1414
--- openoffice.org.spec	1 Feb 2008 14:05:04 -0000	1.1413
+++ openoffice.org.spec	2 Feb 2008 11:26:27 -0000	1.1414
@@ -1072,7 +1072,7 @@
 %patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch47 -p1 -b .ooo81321.cppu.silencewarnings.patch
 %patch48 -p1 -b .ooo76649.httpencoding.patc
-%patch40 -p1 -b .ooo82966.svx.missing3d.patch
+%patch49 -p1 -b .ooo82966.svx.missing3d.patch
 %patch50 -p1 -b .ooo81307.sw.word2.patch
 %patch51 -p1 -b .ooo83878.unopkg.enablelinking.patch
 %patch52 -p1 -b .workspace.notes2.patch

workspace.gcc430two.patch:

Index: workspace.gcc430two.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gcc430two.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.gcc430two.patch	1 Feb 2008 14:05:04 -0000	1.1
+++ workspace.gcc430two.patch	2 Feb 2008 11:26:27 -0000	1.2
@@ -247,30 +247,6 @@
  #include <sal/alloca.h>
  #include <vector>
  
-Index: xml/sax/source/fastparser/fastparser.cxx
-diff -u xml/sax/source/fastparser/fastparser.cxx:1.2 xml/sax/source/fastparser/fastparser.cxx:1.2.4.1
---- xml/sax/source/fastparser/fastparser.cxx:1.2	Thu Jan 10 04:52:30 2008
-+++ xml/sax/source/fastparser/fastparser.cxx	Mon Jan 28 01:53:10 2008
-@@ -65,6 +65,7 @@
- #else
- #include "expat/xmlparse.h"
- #endif
-+#include <string.h>
- 
- using ::rtl::OUString;
- using ::rtl::OString;
-Index: util/tools/inc/bootstrp/command.hxx
-diff -u util/tools/inc/bootstrp/command.hxx:1.4 util/tools/inc/bootstrp/command.hxx:1.4.36.1
---- util/tools/inc/bootstrp/command.hxx:1.4	Fri Nov  2 05:59:41 2007
-+++ util/tools/inc/bootstrp/command.hxx	Mon Jan 28 01:53:11 2008
-@@ -36,7 +36,7 @@
- #ifndef COMMAND_HXX
- #define COMMAND_HXX
- 
--#include <iostream.h>
-+#include <iostream>
- 
- #include <tools/stream.hxx>
  #define STRLEN 100
 Index: util/tools/source/fsys/urlobj.cxx
 diff -u util/tools/source/fsys/urlobj.cxx:1.60 util/tools/source/fsys/urlobj.cxx:1.60.64.1
@@ -630,90 +606,6 @@
  
  struct TCheck
  {
-Index: xml/oox/inc/oox/helper/helper.hxx
-diff -u xml/oox/inc/oox/helper/helper.hxx:1.2 xml/oox/inc/oox/helper/helper.hxx:1.2.8.1
---- xml/oox/inc/oox/helper/helper.hxx:1.2	Thu Jan 17 00:05:47 2008
-+++ xml/oox/inc/oox/helper/helper.hxx	Mon Jan 28 01:53:08 2008
-@@ -40,6 +40,7 @@
- #include <osl/endian.h>
- #include <rtl/string.hxx>
- #include <rtl/ustring.hxx>
-+#include <string.h>
- 
- namespace oox {
- 
-Index: xml/oox/source/core/binarycodec.cxx
-diff -u xml/oox/source/core/binarycodec.cxx:1.2 xml/oox/source/core/binarycodec.cxx:1.2.8.1
---- xml/oox/source/core/binarycodec.cxx:1.2	Thu Jan 17 00:05:50 2008
-+++ xml/oox/source/core/binarycodec.cxx	Mon Jan 28 01:53:08 2008
-@@ -35,6 +35,7 @@
- 
- #include "oox/core/binarycodec.hxx"
- #include <algorithm>
-+#include <string.h>
- #include <osl/diagnose.h>
- 
- namespace oox {
-Index: xml/oox/source/helper/binaryinputstream.cxx
-diff -u xml/oox/source/helper/binaryinputstream.cxx:1.2 xml/oox/source/helper/binaryinputstream.cxx:1.2.8.1
---- xml/oox/source/helper/binaryinputstream.cxx:1.2	Thu Jan 17 00:05:59 2008
-+++ xml/oox/source/helper/binaryinputstream.cxx	Mon Jan 28 01:53:08 2008
-@@ -36,6 +36,7 @@
- #include "oox/helper/binaryinputstream.hxx"
- #include <com/sun/star/io/XInputStream.hpp>
- #include <osl/diagnose.h>
-+#include <string.h>
- 
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Sequence;
-Index: xml/oox/source/helper/binaryoutputstream.cxx
-diff -u xml/oox/source/helper/binaryoutputstream.cxx:1.2 xml/oox/source/helper/binaryoutputstream.cxx:1.2.8.1
---- xml/oox/source/helper/binaryoutputstream.cxx:1.2	Thu Jan 17 00:05:59 2008
-+++ xml/oox/source/helper/binaryoutputstream.cxx	Mon Jan 28 01:53:08 2008
-@@ -37,6 +37,7 @@
- #include <osl/diagnose.h>
- #include <com/sun/star/io/XOutputStream.hpp>
- #include "oox/helper/binaryinputstream.hxx"
-+#include <string.h>
- 
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::Sequence;
-Index: xml/oox/source/helper/recordinputstream.cxx
-diff -u xml/oox/source/helper/recordinputstream.cxx:1.2 xml/oox/source/helper/recordinputstream.cxx:1.2.8.1
---- xml/oox/source/helper/recordinputstream.cxx:1.2	Thu Jan 17 00:05:59 2008
-+++ xml/oox/source/helper/recordinputstream.cxx	Mon Jan 28 01:53:08 2008
-@@ -35,6 +35,7 @@
- 
- #include "oox/helper/recordinputstream.hxx"
- #include <vector>
-+#include <string.h>
- 
- using ::rtl::OUString;
- 
-Index: xml/oox/source/ppt/commonbehaviorcontext.cxx
-diff -u xml/oox/source/ppt/commonbehaviorcontext.cxx:1.2 xml/oox/source/ppt/commonbehaviorcontext.cxx:1.2.8.1
---- xml/oox/source/ppt/commonbehaviorcontext.cxx:1.2	Thu Jan 17 00:06:00 2008
-+++ xml/oox/source/ppt/commonbehaviorcontext.cxx	Mon Jan 28 01:53:09 2008
-@@ -52,6 +52,7 @@
- #include "pptfilterhelpers.hxx"
- #include "tokens.hxx"
- 
-+#include <string.h>
- 
- using ::rtl::OUString;
- using ::rtl::OUStringBuffer;
-Index: xml/oox/source/xls/biffcodec.cxx
-diff -u xml/oox/source/xls/biffcodec.cxx:1.2 xml/oox/source/xls/biffcodec.cxx:1.2.8.1
---- xml/oox/source/xls/biffcodec.cxx:1.2	Thu Jan 17 00:06:07 2008
-+++ xml/oox/source/xls/biffcodec.cxx	Mon Jan 28 01:53:09 2008
-@@ -35,6 +35,7 @@
- 
- #include "oox/xls/biffcodec.hxx"
- #include <osl/thread.h>
-+#include <string.h>
- 
- using ::rtl::OString;
- using ::rtl::OUString;
 Index: sw/hwpfilter/source/formula.cpp
 diff -u sw/hwpfilter/source/formula.cpp:1.3 sw/hwpfilter/source/formula.cpp:1.3.38.1
 --- sw/hwpfilter/source/formula.cpp:1.3	Mon Jun 19 17:52:46 2006
@@ -1078,18 +970,6 @@
  namespace com{ namespace sun{ namespace star{
          namespace lang{
              class XMultiServiceFactory;
-Index: sw/writerfilter/source/dmapper/GraphicImport.cxx
-diff -u sw/writerfilter/source/dmapper/GraphicImport.cxx:1.9 sw/writerfilter/source/dmapper/GraphicImport.cxx:1.9.10.1
---- sw/writerfilter/source/dmapper/GraphicImport.cxx:1.9	Thu Jan 10 03:38:57 2008
-+++ sw/writerfilter/source/dmapper/GraphicImport.cxx	Mon Jan 28 01:53:12 2008
-@@ -107,6 +107,7 @@
- 
- #include <iostream>
- #include <resourcemodel/QNameToString.hxx>
-+#include <string.h>
- 
- namespace writerfilter {
- namespace dmapper
 Index: sw/writerfilter/source/odiapi/qname/QName.cxx
 diff -u sw/writerfilter/source/odiapi/qname/QName.cxx:1.2 sw/writerfilter/source/odiapi/qname/QName.cxx:1.2.26.1
 --- sw/writerfilter/source/odiapi/qname/QName.cxx:1.2	Wed Nov  1 01:14:35 2006
@@ -1102,31 +982,6 @@
  
  namespace writerfilter
  {
-Index: sw/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
-diff -u sw/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx:1.2 sw/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx:1.2.10.1
---- sw/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx:1.2	Thu Jan 10 03:56:25 2008
-+++ sw/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx	Mon Jan 28 01:53:13 2008
-@@ -33,6 +33,7 @@
-  *
-  ************************************************************************/
- #include "OOXMLBinaryObjectReference.hxx"
-+#include <string.h>
- 
- namespace writerfilter {
- namespace ooxml
-Index: sw/writerfilter/source/ooxml/makefile.mk
-diff -u sw/writerfilter/source/ooxml/makefile.mk:1.9 sw/writerfilter/source/ooxml/makefile.mk:1.9.10.1
---- sw/writerfilter/source/ooxml/makefile.mk:1.9	Thu Jan 10 04:12:24 2008
-+++ sw/writerfilter/source/ooxml/makefile.mk	Mon Jan 28 01:53:13 2008
-@@ -208,7 +208,7 @@
- 	$(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
- 
- $(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
--	$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -t -E -S1 -c -G -LC++ > $@
-+	$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
- 
- $(SLOFASTNAMESPACES): $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
- 
 Index: sw/writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx
 diff -u sw/writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx:1.5 sw/writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx:1.5.26.1
 --- sw/writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx:1.5	Mon Jun 18 22:39:12 2007

More information about the fedora-extras-commits mailing list