[ooo-build-commit] patches/dev300

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Tue Dec 8 03:34:04 PST 2009


 patches/dev300/apply            |    3 +
 patches/dev300/g++44-debug.diff |  111 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)

New commits:
commit ccfec51661ab9ae5b49da6caf5f51d20209a221f
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Dec 8 12:31:07 2009 +0100

    Fixed some build erros when using g++4.4
    
    * patches/dev300/apply:
    * patches/dev300/g++44-debug.diff:
        This patch impacts only the DEBUG builds: stdio.h has to be included
        to use printf-like methods using g++4.4: some cleanup has been done
        in debug/debug.cxx.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 87fed01..473d0c0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1141,6 +1141,9 @@ novell-win32-agfa-monotype-fonts.diff, tml
 # even when it is built with JDK 1.6
 build-java-target.diff, i#93115, pmladek
 
+#Fixes of some changes in g++ 4.4 includes for debug mode
+g++44-debug.diff, cbosdo
+
 # do not create '.' subdirectories
 # omit './' in paths
 solenv-installer-cleaner-paths.diff, pmladek
diff --git a/patches/dev300/g++44-debug.diff b/patches/dev300/g++44-debug.diff
new file mode 100644
index 0000000..69815c7
--- /dev/null
+++ b/patches/dev300/g++44-debug.diff
@@ -0,0 +1,111 @@
+diff --git sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/dbgoutsw.cxx
+index 2fb1676..61a20d6 100644
+--- sw/source/core/doc/dbgoutsw.cxx
++++ sw/source/core/doc/dbgoutsw.cxx
+@@ -54,7 +54,7 @@
+ #include <SwNodeNum.hxx>
+ #include <dbgoutsw.hxx>
+ #include <SwRewriter.hxx>
+-#include <iostream>
++#include <stdio.h>
+ 
+ using namespace std;
+ 
+diff --git sw/source/core/text/inftxt.cxx sw/source/core/text/inftxt.cxx
+index 2333592..dae2a39 100644
+--- sw/source/core/text/inftxt.cxx
++++ sw/source/core/text/inftxt.cxx
+@@ -87,6 +87,10 @@
+ 
+ #include <unomid.h>
+ 
++#ifdef DEBUG
++#include <stdio.h>
++#endif
++
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::linguistic2;
+ using namespace ::com::sun::star::uno;
+diff --git sw/source/filter/ww8/WW8Sttbf.cxx sw/source/filter/ww8/WW8Sttbf.cxx
+index 946147a..8787b87 100644
+--- sw/source/filter/ww8/WW8Sttbf.cxx
++++ sw/source/filter/ww8/WW8Sttbf.cxx
+@@ -33,6 +33,10 @@
+ #include <dbgoutsw.hxx>
+ #include "WW8Sttbf.hxx"
+ 
++#ifdef DEBUG
++#include <stdio.h>
++#endif
++
+ namespace ww8
+ {
+     WW8Struct::WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize)
+diff --git sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/wrtw8nds.cxx
+index 2280b2b..4828bfd 100644
+--- sw/source/filter/ww8/wrtw8nds.cxx
++++ sw/source/filter/ww8/wrtw8nds.cxx
+@@ -106,6 +106,10 @@
+ #include <ndgrf.hxx>
+ #include <ndole.hxx>
+ 
++#if OSL_DEBUG_LEVEL > 0
++#include <stdio.h>
++#endif
++
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::i18n;
+ using namespace sw::util;
+diff --git sw/source/filter/ww8/wrtww8gr.cxx sw/source/filter/ww8/wrtww8gr.cxx
+index e3e6c31..348df39 100644
+--- sw/source/filter/ww8/wrtww8gr.cxx
++++ sw/source/filter/ww8/wrtww8gr.cxx
+@@ -77,6 +77,10 @@
+ 
+ #include "docsh.hxx"
+ 
++#if OSL_DEBUG_LEVEL > 0
++#include <stdio.h>
++#endif
++
+ using namespace ::com::sun::star;
+ using namespace nsFieldFlags;
+ 
+diff --git writerfilter/source/dmapper/DomainMapperTableHandler.cxx writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+index 5f2efa4..be4d96e 100644
+--- writerfilter/source/dmapper/DomainMapperTableHandler.cxx
++++ writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+@@ -34,7 +34,7 @@
+ #include <com/sun/star/table/TableBorder.hpp>
+ #include <com/sun/star/text/HoriOrientation.hpp>
+ #if OSL_DEBUG_LEVEL > 1
+-#include <iostream>
++#include <stdio.h>
+ #endif
+ 
+ namespace writerfilter {
+diff --git writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx
+index 586b002..4a2394e 100644
+--- writerfilter/source/dmapper/DomainMapper_Impl.cxx
++++ writerfilter/source/dmapper/DomainMapper_Impl.cxx
+@@ -81,6 +81,7 @@
+ #include <ooxml/OOXMLFastTokens.hxx>
+ 
+ #if DEBUG
++#include <stdio.h>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/style/TabStop.hpp>
+ #endif
+diff --git writerfilter/source/dmapper/SettingsTable.cxx writerfilter/source/dmapper/SettingsTable.cxx
+index 70d9b13..05b43d3 100644
+--- writerfilter/source/dmapper/SettingsTable.cxx
++++ writerfilter/source/dmapper/SettingsTable.cxx
+@@ -6,7 +6,7 @@
+ #include <com/sun/star/text/XTextDocument.hpp>
+ 
+ #if DEBUG
+-#include <iostream>
++#include <stdio.h>
+ #endif
+ 
+ using namespace com::sun::star;


More information about the ooo-build-commit mailing list