diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2007-09-20 07:03:41 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2007-09-20 07:03:41 +0000 |
commit | bce95ba3d2cb44177d97bcbf86968353f570cd59 (patch) | |
tree | e57dc1d4149a429cc85ffbfb8f7cef8c5533682a /app-office | |
parent | Trying to fix internal STLport build on ppc, see bug #193056 (diff) | |
download | gentoo-2-bce95ba3d2cb44177d97bcbf86968353f570cd59.tar.gz gentoo-2-bce95ba3d2cb44177d97bcbf86968353f570cd59.tar.bz2 gentoo-2-bce95ba3d2cb44177d97bcbf86968353f570cd59.zip |
Fix mozilla stuff, see bug #192917
(Portage version: 2.1.3.9)
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
-rw-r--r-- | app-office/openoffice/openoffice-2.3.0.ebuild | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 9654c7a86afe..6f87c0eab790 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.340 2007/09/20 06:44:20 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.341 2007/09/20 07:03:41 suka Exp $ + + 20 Sep 2007; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.3.0.ebuild: + Fix mozilla stuff, see bug #192917 20 Sep 2007; Andreas Proschofsky <suka@gentoo.org> +files/2.3.0/stlport-ppc-buildfix.diff, diff --git a/app-office/openoffice/openoffice-2.3.0.ebuild b/app-office/openoffice/openoffice-2.3.0.ebuild index f90973b9eb2b..a1a8197a5c43 100644 --- a/app-office/openoffice/openoffice-2.3.0.ebuild +++ b/app-office/openoffice/openoffice-2.3.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.3.0.ebuild,v 1.4 2007/09/20 06:44:20 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.0.ebuild,v 1.5 2007/09/20 07:03:41 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -73,6 +73,9 @@ COMMON_DEPEND="!app-office/openoffice-bin !firefox? ( seamonkey? ( www-client/seamonkey >=dev-libs/nspr-4.6.2 >=dev-libs/nss-3.11-r1 ) ) + !firefox? ( !seamonkey? ( xulrunner? ( net-libs/xulrunner + >=dev-libs/nspr-4.6.2 + >=dev-libs/nss-3.11-r1 ) ) ) sound? ( >=media-libs/portaudio-18.1-r5 >=media-libs/libsndfile-1.0.9 ) webdav? ( >=net-misc/neon-0.24.7 ) @@ -241,6 +244,7 @@ src_unpack() { echo "--with-system-mozilla=${browser}" >> ${CONFFILE} else echo "--disable-mozilla" >> ${CONFFILE} + echo "--without-system-mozilla" >> ${CONFFILE} fi echo "`use_enable cups`" >> ${CONFFILE} |