[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                             |   10 ++++++++--
 patches/dev300/cppu-lbnames-enable-gcc-4.5.diff  |   17 +++++++++++++++++
 patches/dev300/sal-cpprt-gcc-4.5-workaround.diff |   14 ++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 5046f9556911530eedd7aeb5a4d05a08eff9c1fc
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Mar 5 19:42:15 2010 +0100

    Fix build with gcc-4.5 (i#109853)
    
    * patches/dev300/cppu-lbnames-enable-gcc-4.5.diff: enable the build
      with gcc-4.5 (i#109853)
    * patches/dev300/sal-cpprt-gcc-4.5-workaround.diff: compile one file
      with -fno-ipa-sra as a workaround for gcc#43257
    * patches/dev300/apply: add the two new diffs

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9c9f4fb..6d9b137 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -18,7 +18,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 OOXML, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
 	 PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
 	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
-	 CalcRowLimit, Gcc44, BuildFix, WriterDocComparison, \
+	 CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
 	 OptionalIconThemes, Toolbars
 
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
@@ -292,7 +292,6 @@ registry-speed-fix.diff, thorsten
 # don't let HelpLinker be miscompiled with g++ 4.3
 gcc-HelpLinker.diff
 
-
 [ TemporaryHacks and not MacOSXOnly ]
 
 # don't lstat() that much while creating absolute URLs - breaks unopkg
@@ -1220,6 +1219,13 @@ transex3-localize.pl-ooo-build.diff, i#107386, pmladek
 [ Gcc44 ]
 oox-tokenmap.string.h.diff, i#105219
 
+[ Gcc45 ]
+
+# enable build with gcc-4.5
+cppu-lbnames-enable-gcc-4.5.diff, i#109853, pmladek
+# compile with -fno-ipa-sra as a workaround for a bug in gcc
+sal-cpprt-gcc-4.5-workaround.diff, gcc#43257, pmladek
+
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream
diff --git a/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff b/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
new file mode 100644
index 0000000..7cc3c02
--- /dev/null
+++ b/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
@@ -0,0 +1,17 @@
+--- cppu/inc/uno/lbnames.h.old	2010-02-02 12:49:41.000000000 +0100
++++ cppu/inc/uno/lbnames.h	2010-03-05 17:13:22.000000000 +0100
+@@ -62,12 +62,12 @@ provoking error here, because PP ignores
+ #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
+ #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
+ #define __CPPU_ENV gcc3
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
++#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
+ #define __CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
+ #else
+-#error "Supported gcc majors are 2 , 3 and 4 <= 4.4.  Unsupported gcc major version."
++#error "Supported gcc majors are 2 , 3 and 4 <= 4.5.  Unsupported gcc major version."
+ #endif /* defined (__GNUC__) */
+ #endif /* defined (_MSC_VER) */
+ 
diff --git a/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff b/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
new file mode 100644
index 0000000..ff3c392
--- /dev/null
+++ b/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
@@ -0,0 +1,14 @@
+--- sal/cpprt/makefile.mk.old	2010-02-02 12:49:41.000000000 +0100
++++ sal/cpprt/makefile.mk	2010-03-04 18:06:37.000000000 +0100
+@@ -43,6 +43,11 @@ LIBTARGET=NO
+ CFLAGS+= $(LFS_CFLAGS)
+ CXXFLAGS+= $(LFS_CFLAGS)
+ 
++.IF "$(CCNUMVER)" >= "000400050000" && "$(CCNUMVER)" < "000400060000"
++CFLAGS+= -fno-ipa-sra
++CXXFLAGS+= -fno-ipa-sra
++.ENDIF 
++
+ # --- Files --------------------------------------------------------
+ 
+ SLOFILES =	\