Date: Sunday, December 12, 2010 @ 05:21:22
Author: andyrtr
Revision: 102851
add two patches that changed upstream
Added:
openoffice-base-beta/trunk/cppu-lbnames-enable-gcc-4.5.diff
openoffice-base-beta/trunk/sal-cpprt-gcc-4.5-workaround.diff
Modified:
openoffice-base-beta/trunk/PKGBUILD
-----------------------------------+
PKGBUILD | 6 ++++--
cppu-lbnames-enable-gcc-4.5.diff | 17 +++++++++++++++++
sal-cpprt-gcc-4.5-workaround.diff | 14 ++++++++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-12 08:36:21 UTC (rev 102850)
+++ PKGBUILD 2010-12-12 10:21:22 UTC (rev 102851)
@@ -30,8 +30,10 @@
buildfix-gcc44.diff
buildfix_FormulaMissingHeader.diff
http://www.openoffice.org/nonav/issues/showattachment.cgi/72052/configure.set-redland-cflags.patch
-
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
-
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
+ #http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/
+ cppu-lbnames-enable-gcc-4.5.diff
+ #http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/
+ sal-cpprt-gcc-4.5-workaround.diff
cppunit_gcc45.diff
libx11.diff
openoffice-beta.profile
Added: cppu-lbnames-enable-gcc-4.5.diff
===================================================================
--- cppu-lbnames-enable-gcc-4.5.diff (rev 0)
+++ cppu-lbnames-enable-gcc-4.5.diff 2010-12-12 10:21:22 UTC (rev 102851)
@@ -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) */
+
Property changes on: openoffice-base-beta/trunk/cppu-lbnames-enable-gcc-4.5.diff
___________________________________________________________________
Added: svn:executable
+ *
Added: sal-cpprt-gcc-4.5-workaround.diff
===================================================================
--- sal-cpprt-gcc-4.5-workaround.diff (rev 0)
+++ sal-cpprt-gcc-4.5-workaround.diff 2010-12-12 10:21:22 UTC (rev 102851)
@@ -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 = \
Property changes on:
openoffice-base-beta/trunk/sal-cpprt-gcc-4.5-workaround.diff
___________________________________________________________________
Added: svn:executable
+ *
