diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-02-03 17:09:27 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-02-03 17:09:27 +0000 |
| commit | dfae3c12056ffbd6675f7838d94463538ec8d948 (patch) | |
| tree | e3d89b203ce150b420fd74a62ccf4fc48b6473b8 /app-office | |
| parent | Remove broken release (diff) | |
| download | gentoo-2-dfae3c12056ffbd6675f7838d94463538ec8d948.tar.gz gentoo-2-dfae3c12056ffbd6675f7838d94463538ec8d948.tar.bz2 gentoo-2-dfae3c12056ffbd6675f7838d94463538ec8d948.zip | |
Fixes for hardened, see bug #79815
(Portage version: 2.0.51-r15)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild | 15 |
2 files changed, 13 insertions, 10 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 9203d667f7ce..1318b17e9832 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.109 2005/01/31 21:06:16 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.110 2005/02/03 17:09:27 suka Exp $ + + 03 Feb 2005; Andreas Proschofsky <suka@gentoo.org> + openoffice-ximian-1.3.7.ebuild: + GCC 3.4 patches also work fine with GCC 3.3.x so they are applied by default + now. This also fixes some further problems on hardened gccs, closes bug + #79815 31 Jan 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-ximian-1.3.7.ebuild, openoffice-ximian-1.3.8.ebuild: diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild index f979bed6c369..7e674cd8a1d9 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.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-ximian/openoffice-ximian-1.3.7.ebuild,v 1.16 2005/02/01 18:19:34 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.17 2005/02/03 17:09:27 suka Exp $ # Notes: # @@ -298,14 +298,11 @@ src_unpack() { einfo "Applying Ximian OO.org Patches" ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed" - # GCC 3.4.x fixes - if [ "$(gcc-version)" = "3.4" ] - then - epatch ${FILESDIR}/${OO_VER}/gcc34_2.patch.bz2 - epatch ${FILESDIR}/${OO_VER}/gcc34-sal-link-to-libsupc++.diff - use !java && epatch ${FILESDIR}/${OO_VER}/gcc34-nojava-fix.patch - use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch - fi + #GCC 3.4 fixes, also needed for hardened + epatch ${FILESDIR}/${OO_VER}/gcc34_2.patch.bz2 + epatch ${FILESDIR}/${OO_VER}/gcc34-sal-link-to-libsupc++.diff + use !java && epatch ${FILESDIR}/${OO_VER}/gcc34-nojava-fix.patch + use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch #Fix for hardened if use hardened; then |