diff options
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/gcc45-buildfix.patch | 17 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.0.ebuild | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 8316ff844e54..6e19ec2f1d5e 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.530 2010/05/01 01:01:06 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.531 2010/05/12 12:25:08 suka Exp $ + + 12 May 2010; Andreas Proschofsky <suka@gentoo.org> + +files/gcc45-buildfix.patch, openoffice-3.2.0.ebuild: + Fix build with gcc 4.5, bug #317207 01 May 2010; Maciej Mrozowski <reavertm@gentoo.org> openoffice-3.2.0.ebuild: diff --git a/app-office/openoffice/files/gcc45-buildfix.patch b/app-office/openoffice/files/gcc45-buildfix.patch new file mode 100644 index 000000000000..7cc3c022072e --- /dev/null +++ b/app-office/openoffice/files/gcc45-buildfix.patch @@ -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/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 5444200e86d0..52f2fe520599 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.23 2010/05/01 01:01:06 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.24 2010/05/12 12:25:08 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -223,6 +223,7 @@ src_prepare() { cp -f "${FILESDIR}/qt-use-native-backend.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/npwrap-fix-nogtk.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/neon-remove-SSPI-support.diff" "${S}/patches/hotfixes" || die + cp -f "${FILESDIR}/gcc45-buildfix.patch" "${S}/patches/hotfixes" || die #Use flag checks if use java ; then |