diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-25 09:53:19 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-25 09:53:19 +0000 |
| commit | f932e11af9ba0093aa67af4aa6c70747ddbb10bd (patch) | |
| tree | 84d5fd9ee084318bdafe0f5ac4c3a82e12ecaf41 /app-office | |
| parent | Punt ebuild LINGUAS handling since it is breaking GTK+ translation installati... (diff) | |
| download | gentoo-2-f932e11af9ba0093aa67af4aa6c70747ddbb10bd.tar.gz gentoo-2-f932e11af9ba0093aa67af4aa6c70747ddbb10bd.tar.bz2 gentoo-2-f932e11af9ba0093aa67af4aa6c70747ddbb10bd.zip | |
Update checks patch to work on 3.7 branchie.
(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch | 64 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 4 |
3 files changed, 71 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 473f55f8941e..07025a505f34 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.374 2012/09/24 13:36:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.375 2012/09/25 09:53:19 scarabeus Exp $ + + 25 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/libreoffice-3.7-separate-checks.patch, libreoffice-9999-r2.ebuild: + Update checks patch to work on 3.7 branchie. 24 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Add ucpp dep to libreoffice (not yet finished system detection). diff --git a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch new file mode 100644 index 000000000000..5805387bd847 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch @@ -0,0 +1,64 @@ +From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001 +From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> +Date: Sun, 24 Jun 2012 14:01:54 +0200 +Subject: [PATCH] dont run check targets in build, to allow running them + separately later + +Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243 +--- + Makefile.top | 10 ++++++++-- + solenv/bin/build.pl | 2 +- + solenv/gbuild/Module.mk | 2 +- + 3 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Makefile.top b/Makefile.top +index 7362bbc..ae849fb 100644 +--- a/Makefile.top ++++ b/Makefile.top +@@ -251,7 +252,7 @@ xpdf\ + xsltml\ + zlib\ + +-export gb_TAILBUILDTARGET=all slowcheck ++export gb_TAILBUILDTARGET=all + + define gbuild_module_rules + .PHONY: $(1) $(1).all $(1).clean $(1).deliver +@@ -526,7 +527,7 @@ findunusedcode: + | grep -v WPX \ + > unusedcode.easy + +-check: dev-install subsequentcheck ++check: unitcheck slowcheck dev-install subsequentcheck + + subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ +diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl +index 74d0f32..daa4ae0 100755 +--- a/solenv/bin/build.pl ++++ b/solenv/bin/build.pl +@@ -1901,7 +1901,7 @@ sub run_job { + return 1 if (! $path =~ /prj$/ ); + mkpath("$workdir/Logs"); + my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM}; +- my $gbuild_target = 'all slowcheck'; ++ my $gbuild_target = 'all'; + if ($registered_name =~ /tail_build\/prj$/ ) + { + $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM}; +diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk +index e5f87f0..9c2608c 100644 +--- a/solenv/gbuild/Module.mk ++++ b/solenv/gbuild/Module.mk +@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT= + debugrun :| build + endif + +-all : build unitcheck ++all : build + $(info $(gb_Module_BUILDHINT)) + + build : +-- +1.7.9.5 + diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 47c20f5232d2..e430e8e3b7e5 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.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-9999-r2.ebuild,v 1.114 2012/09/24 13:36:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.115 2012/09/25 09:53:19 scarabeus Exp $ EAPI=4 @@ -226,7 +226,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-3.7-system-pyuno.patch" - "${FILESDIR}/${PN}-3.6-separate-checks.patch" + "${FILESDIR}/${PN}-3.7-separate-checks.patch" ) REQUIRED_USE=" |