diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2005-03-30 14:09:49 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2005-03-30 14:09:49 +0000 |
commit | b02bbfa9e49d60b5548e99cadd5b1fc3c3c43f92 (patch) | |
tree | 8926fd52807a85ccd8995fc92573947e464e3697 /app-office | |
parent | Version bump. (diff) | |
download | gentoo-2-b02bbfa9e49d60b5548e99cadd5b1fc3c3c43f92.tar.gz gentoo-2-b02bbfa9e49d60b5548e99cadd5b1fc3c3c43f92.tar.bz2 gentoo-2-b02bbfa9e49d60b5548e99cadd5b1fc3c3c43f92.zip |
Fix for bug #81835
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/openoffice/openoffice-1.1.4.ebuild | 13 |
2 files changed, 11 insertions, 9 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2a76518a27e9..d8b26b82125f 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.113 2005/03/30 10:15:29 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.114 2005/03/30 14:09:49 suka Exp $ + + 30 Mar 2005; Andreas Proschofsky <suka@gentoo.org> + openoffice-1.1.4.ebuild: + Fix for bug #81835, gcc 3.4-patches need to be applied globally, hardened + also needs them 30 Mar 2005; Andreas Proschofsky <suka@gentoo.org> files/1.1.4/ooffice-wrapper-1.3, openoffice-1.1.4.ebuild: diff --git a/app-office/openoffice/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild index 075174f0ebfc..3e56f5f16d25 100644 --- a/app-office/openoffice/openoffice-1.1.4.ebuild +++ b/app-office/openoffice/openoffice-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.19 2005/03/30 10:15:29 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.20 2005/03/30 14:09:49 suka Exp $ # Notes: # @@ -260,13 +260,10 @@ src_unpack() { epatch ${FILESDIR}/${PV}/openoffice-java.patch - # GCC 3.4.x fixes - if [ "$(gcc-version)" = "3.4" ] - then - epatch ${FILESDIR}/${PV}/gcc34.patch.bz2 - epatch ${FILESDIR}/${PV}/gcc34-sal-link-to-libsupc++.diff - use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch - fi + #GCC 3.4 fixes, also needed for hardened + epatch ${FILESDIR}/${PV}/gcc34.patch.bz2 + epatch ${FILESDIR}/${PV}/gcc34-sal-link-to-libsupc++.diff + use !java && epatch ${FILESDIR}/${PV}/gcc34-nojava-fix.patch #Fixes for hardened if use hardened; then |