diff options
author | 2005-03-30 14:09:49 +0000 | |
---|---|---|
committer | 2005-03-30 14:09:49 +0000 | |
commit | 62b69122639c51f80baa8f6d17327413a9626b72 (patch) | |
tree | 1418dc3955e495a83d333c3cdaa9d65cf307149e /app-office/openoffice | |
parent | Version bump. (diff) | |
download | historical-62b69122639c51f80baa8f6d17327413a9626b72.tar.gz historical-62b69122639c51f80baa8f6d17327413a9626b72.tar.bz2 historical-62b69122639c51f80baa8f6d17327413a9626b72.zip |
Fix for bug #81835
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'app-office/openoffice')
-rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
-rw-r--r-- | app-office/openoffice/openoffice-1.1.4.ebuild | 13 |
3 files changed, 13 insertions, 11 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/Manifest b/app-office/openoffice/Manifest index e0fac6eec7b5..cb926ab40f1b 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,6 +1,6 @@ -MD5 b62da51b5db6b9f2eadce8935ba26300 openoffice-1.1.4.ebuild 16183 +MD5 5c971a8e7a1ef585c9ecc2187f96051e openoffice-1.1.4.ebuild 16160 MD5 b9f4c245c8b1197f11106923e64a50a3 openoffice-1.1.3.ebuild 15710 -MD5 6c7d4690bba841d3b967fb734cc1382f ChangeLog 25225 +MD5 f1d9d10aa57cb260d8a885e55b41a56f ChangeLog 25400 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4 325 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 |