diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-09 19:29:14 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-11-09 19:29:14 +0000 |
| commit | 8f1b006eb4f7a0002df66e1ea9b46212fe89a08c (patch) | |
| tree | 1cc95512debb48db80daa2cf0f0cbebc5aeaee15 /app-office | |
| parent | Enforce ownership of the nagios plugin directory. Should solve bug #441980. (diff) | |
| download | gentoo-2-8f1b006eb4f7a0002df66e1ea9b46212fe89a08c.tar.gz gentoo-2-8f1b006eb4f7a0002df66e1ea9b46212fe89a08c.tar.bz2 gentoo-2-8f1b006eb4f7a0002df66e1ea9b46212fe89a08c.zip | |
Fix patch to apply again.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
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 | 44 |
2 files changed, 19 insertions, 31 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 440125bfad0d..0b280949ce14 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.388 2012/11/09 09:50:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.389 2012/11/09 19:29:14 scarabeus Exp $ + + 09 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> + files/libreoffice-3.7-separate-checks.patch: + Fix patch to apply again. 09 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Bye rsvg/glib. diff --git a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch index 5805387bd847..dbeb503927fe 100644 --- a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch +++ b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch @@ -1,56 +1,43 @@ -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 +index 9e67a71..64a7b6c 100644 --- a/Makefile.top +++ b/Makefile.top -@@ -251,7 +252,7 @@ xpdf\ - xsltml\ - zlib\ +@@ -244,7 +244,7 @@ stlport\ + sysui\ + xpdf\ -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 \ + .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver +@@ -546,7 +546,7 @@ findunusedcode: + | grep -v ^WSObject \ > 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 $@ + $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl -index 74d0f32..daa4ae0 100755 +index c8e62ee..11a9069 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl -@@ -1901,7 +1901,7 @@ sub run_job { +@@ -1902,7 +1902,7 @@ sub run_job { return 1 if (! $path =~ /prj$/ ); mkpath("$workdir/Logs"); - my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM}; + my $gbuild_flags = '-j' . $ENV{PARALLELISM}; - my $gbuild_target = 'all slowcheck'; + my $gbuild_target = 'all'; if ($registered_name =~ /tail_build\/prj$/ ) { - $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM}; + $gbuild_target = $ENV{gb_TAILBUILDTARGET}; diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk -index e5f87f0..9c2608c 100644 +index 97f1a81..c7ae7f4 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk -@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT= +@@ -139,7 +139,7 @@ gb_Module_DEVINSTALLHINT= debugrun :| build endif @@ -59,6 +46,3 @@ index e5f87f0..9c2608c 100644 $(info $(gb_Module_BUILDHINT)) build : --- -1.7.9.5 - |