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 | db3f96f05c7d56fcb05f517514cfd61295590a9b (patch) | |
| tree | f3340fa2369cca72cc3aa64b3b90ae16859934f8 | |
| parent | Removed 0.5.0 and added ruby.eclass support to 0.9.1 (diff) | |
| download | historical-db3f96f05c7d56fcb05f517514cfd61295590a9b.tar.gz historical-db3f96f05c7d56fcb05f517514cfd61295590a9b.tar.bz2 historical-db3f96f05c7d56fcb05f517514cfd61295590a9b.zip | |
Add patch to work around build breakage
5 files changed, 29 insertions, 8 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/Manifest b/app-office/openoffice-ximian/Manifest index 74730902ccb3..50425d99917e 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,7 +1,7 @@ MD5 21ec95b24000001a79d5c8cc0b4b6b32 openoffice-ximian-1.1.51.ebuild 14859 MD5 9db58898583f97148b0694d8802b0302 openoffice-ximian-1.1.46.ebuild 18267 -MD5 b67b55e9026314d03025ce840cfa2251 openoffice-ximian-1.1.52.ebuild 15064 -MD5 e17bd52d004c359222dfbf5e523b81a0 ChangeLog 7707 +MD5 987b9cc61bd74ae41a06d7397c49fca0 openoffice-ximian-1.1.52.ebuild 15157 +MD5 ac0c8dcd83c58485129d49587320253f ChangeLog 7979 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 f0de3fac5fcb75c45346444d17cca718 files/drawing.desktop 1653 MD5 4657a820e8c5914e37383fa3e014ab38 files/textdoc.desktop 1969 @@ -9,7 +9,7 @@ MD5 4834c6f3d1bac4ab5567ba499c3a584e files/spreadsheet.desktop 1709 MD5 61809b2d86430fb760a3545a0d27cbb6 files/presentation.desktop 1941 MD5 0a7f30e95eac54db54a2be02603f2036 files/digest-openoffice-ximian-1.1.46 213 MD5 bd8a36025a84cb2ad840e822f513e468 files/digest-openoffice-ximian-1.1.51 213 -MD5 c1d96740b23d47f15629cc219b721903 files/digest-openoffice-ximian-1.1.52 213 +MD5 ebb47daad89ff2dd462d21aad878b42b files/digest-openoffice-ximian-1.1.52 215 MD5 9caea43966f68ba0f3d7c364c9a01b89 files/1.1.0/ooffice-wrapper-1.3 8964 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.0/ximian-openoffice.applications 980 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.0/ximian-openoffice.keys 6298 @@ -25,4 +25,5 @@ MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.pa MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221 MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603 MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285 +MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330 MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362 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 |