diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-04-24 21:36:26 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-04-24 21:36:26 +0000 |
| commit | 02cbc1bd630e7dc2525cde670f5bbd8bbd7f827c (patch) | |
| tree | 1b00c16fe29259fc26a7ebd7b50563ee4ef0659d /app-office | |
| parent | Bump to 2.18.1 (diff) | |
| download | gentoo-2-02cbc1bd630e7dc2525cde670f5bbd8bbd7f827c.tar.gz gentoo-2-02cbc1bd630e7dc2525cde670f5bbd8bbd7f827c.tar.bz2 gentoo-2-02cbc1bd630e7dc2525cde670f5bbd8bbd7f827c.zip | |
Fix for wrongly colored compile output, see bug #172380
(Portage version: 2.1.2.4)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.2.0/ooo-env_log.diff | 25 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.2.0.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index a7f122234e59..ce177679fef2 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.318 2007/04/24 20:52:12 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.319 2007/04/24 21:36:26 suka Exp $ + + 24 Apr 2007; Andreas Proschofsky <suka@gentoo.org> + +files/2.2.0/ooo-env_log.diff, openoffice-2.2.0.ebuild: + Fix for wrongly colored compile output, see bug #172380 24 Apr 2007; Andreas Proschofsky <suka@gentoo.org> openoffice-2.2.0.ebuild: diff --git a/app-office/openoffice/files/2.2.0/ooo-env_log.diff b/app-office/openoffice/files/2.2.0/ooo-env_log.diff new file mode 100644 index 000000000000..908169ab6c5a --- /dev/null +++ b/app-office/openoffice/files/2.2.0/ooo-env_log.diff @@ -0,0 +1,25 @@ +--- bin/build-ooo.orig 2007-04-18 18:32:06.000000000 +0200 ++++ bin/build-ooo 2007-04-18 18:32:45.000000000 +0200 +@@ -21,9 +21,8 @@ + echo "configuring ..."; + autoconf || exit 1; + +-echo "Env for configure:" +-set +-echo "Env for configure ends" ++echo "Log Env for configure to `pwd`/env.log" ++set > env.log + + eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1; + +@@ -88,8 +88,8 @@ + # similar that gives child nmake's pain. + unset MAKEFLAGS + +-echo "Env:" +-set ++echo "Log Env to `pwd`/env.log" ++set > env.log + + # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not + # already merged? diff --git a/app-office/openoffice/openoffice-2.2.0.ebuild b/app-office/openoffice/openoffice-2.2.0.ebuild index 7a1d35445454..e146340493f2 100644 --- a/app-office/openoffice/openoffice-2.2.0.ebuild +++ b/app-office/openoffice/openoffice-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.0.ebuild,v 1.4 2007/04/24 20:52:12 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.0.ebuild,v 1.5 2007/04/24 21:36:26 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -202,6 +202,7 @@ src_unpack() { #Some fixes for our patchset cd ${S} epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff + epatch ${FILESDIR}/${PV}/ooo-env_log.diff if use ppc ; then cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die |