diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2004-04-11 16:23:50 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2004-04-11 16:23:50 +0000 |
| commit | d8704b33d87f644e075dd838d92be2a0b5a170df (patch) | |
| tree | ea6eb19ad9c5de750ffcd09a390addc73d1e3a7f /app-office | |
| parent | Removed 0.5.0 and added ruby.eclass support to 0.9.1 (Manifest recommit) (diff) | |
| download | gentoo-2-d8704b33d87f644e075dd838d92be2a0b5a170df.tar.gz gentoo-2-d8704b33d87f644e075dd838d92be2a0b5a170df.tar.bz2 gentoo-2-d8704b33d87f644e075dd838d92be2a0b5a170df.zip | |
Add patch to work around build breakage
Diffstat (limited to 'app-office')
4 files changed, 25 insertions, 5 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 207eaca154f3..2ecf0708f804 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.28 2004/04/03 23:32:03 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.29 2004/04/11 16:23:50 suka Exp $ + + 11 Apr 2004; suka@gentoo.org openoffice-ximian-1.1.52.ebuild, + files/1.1.1/build.patch: + Add temporary patch provided by scout@scoutheeten.com on bug #46945 to work + around build breakage caused by recent sandbox problems in portage. + Also use newer source tarball. 04 Apr 2004; Lars Weiler <pylon@gentoo.org> openoffice-ximian-1.1.51.ebuild, openoffice-ximian-1.1.52.ebuild: diff --git a/app-office/openoffice-ximian/files/1.1.1/build.patch b/app-office/openoffice-ximian/files/1.1.1/build.patch new file mode 100644 index 000000000000..8049215b8186 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.1/build.patch @@ -0,0 +1,11 @@ +--- solenv/bin/build.pl.orig 2004-04-11 12:13:16.296275784 +0000 ++++ solenv/bin/build.pl 2004-04-11 12:13:37.367072536 +0000 +@@ -1,6 +1,5 @@ +- : +- eval 'exec perl -S $0 ${1+"$@"}' +- if 0; ++#!/usr/bin/perl ++ + #************************************************************************* + # + # $RCSfile: build.patch,v $ diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.52 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.52 index d899ec37dc1d..878abe9c187f 100644 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.52 +++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.52 @@ -1,3 +1,3 @@ -MD5 1919ec0ef5d3e8fe4b0a4910856d8987 OOo_1.1.1_source.tar.bz2 192665594 +MD5 3cc04c46514cd4b663cab3ca5637d501 OOo_1.1.1p1_source.tar.bz2 192388698 MD5 008d9f13076bc78fdb4e7720d6591bc8 ooo-build-1.1.52.tar.gz 1582813 MD5 61c9379fa718ee7f36ccd2d70f3649c8 ooo-icons-OOO_1_1-8.tar.gz 1344675 diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild index fd6ccb496804..30cafd8e08e1 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild,v 1.5 2004/04/05 14:00:09 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild,v 1.6 2004/04/11 16:23:50 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -53,7 +53,7 @@ PATCHDIR=${WORKDIR}/ooo-build-${PV} ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER} S="${WORKDIR}/oo_${OO_VER}_src" DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite." -SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}_source.tar.bz2 +SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}p1_source.tar.bz2 http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz" @@ -228,7 +228,7 @@ src_unpack() { oo_setup cd ${WORKDIR} - unpack OOo_${OO_VER}_source.tar.bz2 ooo-build-${PV}.tar.gz ooo-icons-${ICON_VER}.tar.gz + unpack OOo_${OO_VER}p1_source.tar.bz2 ooo-build-${PV}.tar.gz ooo-icons-${ICON_VER}.tar.gz #Still needed: The STLport patch cd ${S} @@ -241,6 +241,9 @@ src_unpack() { #Additional patch for Kernel 2.6 epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-linux-2.6-fix.patch + #Work around recent portage sandbox troubles + epatch ${FILESDIR}/${OO_VER}/build.patch + if [ ${ARCH} = "sparc" ]; then epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch fi |