diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2010-05-15 07:13:23 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2010-05-15 07:13:23 +0000 |
| commit | fff906cab6a28b37de3fe802d8daa06f3cb97e9b (patch) | |
| tree | 7f3c6d303c96a50c13377fc284552e542897a53c | |
| parent | Version bump. First RC for 5.2.x series. (diff) | |
| download | gentoo-2-fff906cab6a28b37de3fe802d8daa06f3cb97e9b.tar.gz gentoo-2-fff906cab6a28b37de3fe802d8daa06f3cb97e9b.tar.bz2 gentoo-2-fff906cab6a28b37de3fe802d8daa06f3cb97e9b.zip | |
Rename gcc-4.5 buildfix so that it actually gets applied
(Portage version: 2.2_rc67/cvs/Linux i686)
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/files/gcc45-buildfix.diff (renamed from app-office/openoffice/files/gcc45-buildfix.patch) | 0 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.0.ebuild | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 6e19ec2f1d5e..09c6a319ef74 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # 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.531 2010/05/12 12:25:08 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.532 2010/05/15 07:13:22 suka Exp $ + + 15 May 2010; Andreas Proschofsky <suka@gentoo.org> + +files/gcc45-buildfix.diff, openoffice-3.2.0.ebuild, + -files/gcc45-buildfix.patch: + Rename gcc-4.5 buildfix so that it actually gets applied 12 May 2010; Andreas Proschofsky <suka@gentoo.org> +files/gcc45-buildfix.patch, openoffice-3.2.0.ebuild: diff --git a/app-office/openoffice/files/gcc45-buildfix.patch b/app-office/openoffice/files/gcc45-buildfix.diff index 7cc3c022072e..7cc3c022072e 100644 --- a/app-office/openoffice/files/gcc45-buildfix.patch +++ b/app-office/openoffice/files/gcc45-buildfix.diff diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 52f2fe520599..a8194c87eb89 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.24 2010/05/12 12:25:08 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.25 2010/05/15 07:13:22 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -223,7 +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 + cp -f "${FILESDIR}/gcc45-buildfix.diff" "${S}/patches/hotfixes" || die #Use flag checks if use java ; then |