diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch | 30 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild | 13 |
3 files changed, 18 insertions, 33 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 9ff04274dc22..6d3907922bf6 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.106 2005/01/28 17:01:54 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.107 2005/01/28 19:16:36 suka Exp $ + + 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org> + files/1.1.4/gentoo-1.3.8.patch, openoffice-ximian-1.3.8.ebuild: + The GCC 3.4 patches also work with gcc 3.3.x, so we don't have to check for + gcc-version before applying them. That's fine cause now we can let the + ooo-patchset do the work, which cleans up the ebuild a bit. 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-ximian-1.3.8.ebuild: diff --git a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch index fcc14e353b12..68ac7d100808 100644 --- a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch +++ b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch @@ -7,32 +7,18 @@ -Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, GentooOnly, NoRpath -GentooGNOME : Gentoo, GnomeVFS, NovellOnly -GentooKDE : Gentoo, KDECommon -+GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, NoRpath ++GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, NoRpath +Gentoo : GentooBase +GentooGNOME : GentooBase, GnomeVFS, NovellOnly +GentooKDE : GentooBase, KDECommon # somewhat odder: Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only, NoRpath -@@ -1225,20 +1225,6 @@ - - ######################################################## - --[ Gcc34 ] --gcc34-main.diff --gcc34-nojava-fix.diff +@@ -1228,7 +1228,6 @@ + [ Gcc34 ] + gcc34-main.diff + gcc34-nojava-fix.diff -gcc34-nptl-fix.diff --gcc34-stlport.diff --gcc34-sal-link-to-libsupc++.diff -- --######################################################## -- --[ GentooOnly, RedHatOnly ] --gcc34-gnome.diff -- --######################################################## -- - [ TestLayout ] - # the beginnings of layout - gui-window-layout.diff - + gcc34-stlport.diff + gcc34-sal-link-to-libsupc++.diff + diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild index d943a6079bfe..8656d57d25a7 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.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.8.ebuild,v 1.2 2005/01/28 17:01:54 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild,v 1.3 2005/01/28 19:16:36 suka Exp $ # Notes: # @@ -296,15 +296,8 @@ 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 ${PATCHDIR}/patches/gcc34/gcc34-main.diff - epatch ${PATCHDIR}/patches/gcc34/gcc34-sal-link-to-libsupc++.diff - use !java && epatch ${PATCHDIR}/patches/gcc34/gcc34-nojava-fix.diff - use nptl && epatch ${PATCHDIR}/patches/gcc34/gcc34-nptl-fix.diff - use gnome && epatch ${PATCHDIR}/patches/gcc34/gcc34-gnome.diff - fi + use nptl && epatch ${PATCHDIR}/patches/gcc34/gcc34-nptl-fix.diff + use gnome && epatch ${PATCHDIR}/patches/gcc34/gcc34-gnome.diff #Fix for hardened if use hardened; then |