diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-03 12:53:21 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-03 12:53:21 +0000 |
| commit | c551b56b07dea7c681ca6cd26a34bd23c1d463b8 (patch) | |
| tree | dd65dca99c3691674430a228df08a1b0b6aedb54 /app-office/libreoffice | |
| parent | Pass headless to test runs. This should solve various dbus/assert crashes and... (diff) | |
| download | gentoo-2-c551b56b07dea7c681ca6cd26a34bd23c1d463b8.tar.gz gentoo-2-c551b56b07dea7c681ca6cd26a34bd23c1d463b8.tar.bz2 gentoo-2-c551b56b07dea7c681ca6cd26a34bd23c1d463b8.zip | |
Fix double running build, that was run once more on instakll phase.
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
4 files changed, 35 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 2d79d56c349b..70e2a0869023 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.275 2012/04/03 12:34:21 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.276 2012/04/03 12:53:20 scarabeus Exp $ + + 03 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/libreoffice-3.5-doublebuild.patch, libreoffice-3.5.2.2.ebuild, + libreoffice-3.5.9999.ebuild: + Fix double running build, that was run once more on instakll phase. 03 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +files/libreoffice-3.5.2-tests-headless.patch, libreoffice-3.5.2.2.ebuild: diff --git a/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch b/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch new file mode 100644 index 000000000000..903fe2359adf --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.5-doublebuild.patch @@ -0,0 +1,25 @@ +From c40c21fe0670c6fb58bc82e4df2825e23c7406bb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz> +Date: Tue, 3 Apr 2012 14:40:12 +0200 +Subject: [PATCH] Do not run build again during the install phase. + +--- + solenv/gbuild/extensions/post_AuxTargets.mk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk +index 72414b7..825b130 100644 +--- a/solenv/gbuild/extensions/post_AuxTargets.mk ++++ b/solenv/gbuild/extensions/post_AuxTargets.mk +@@ -83,7 +83,7 @@ distclean: clean + desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ + set_soenv set_soenv.last set_soenv.stamp src.downloaded warn + +-install: build ++install: + echo "Installing in $(INSTALLDIR)..." && \ + ooinstall "$(INSTALLDIR)" && \ + echo "" && \ +-- +1.7.7 + diff --git a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild index 54f74cf97bd1..f1cab5f9a099 100644 --- a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.7 2012/04/03 12:34:21 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.8 2012/04/03 12:53:20 scarabeus Exp $ EAPI=4 @@ -194,6 +194,7 @@ PATCHES=( # this can't be upstreamed :( "${FILESDIR}/${PN}-system-pyuno.patch" "${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch" + "${FILESDIR}/${PN}-3.5-doublebuild.patch" "${FILESDIR}/${PN}-3.5.2-icu-49.patch" "${FILESDIR}/${PN}-3.5.2-icu-49-part2.patch" "${FILESDIR}/${PN}-3.5.2-tests-headless.patch" diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild index 11e201599c74..a543f07ad650 100644 --- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.34 2012/04/02 09:19:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.35 2012/04/03 12:53:20 scarabeus Exp $ EAPI=4 @@ -194,6 +194,7 @@ PATCHES=( # this can't be upstreamed :( "${FILESDIR}/${PN}-system-pyuno.patch" "${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch" + "${FILESDIR}/${PN}-3.5-doublebuild.patch" ) REQUIRED_USE=" |