[libreoffice/master-3.5] fix build failure in filter/source/svg

[David Tardon]

commit e92d7206a87777d8b13c6b156b7d73401d1b740f
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 14 07:28:23 2011 +0100

    fix build failure in filter/source/svg

 0001-force-gbuild-stage-for-CustomTargets.patch |   28 +++++++++++++++++++++++
 libreoffice.spec                                |    2 +
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/0001-force-gbuild-stage-for-CustomTargets.patch b/0001-force-gbuild-stage-for-CustomTargets.patch
new file mode 100644
index 0000000..970bf60
--- /dev/null
+++ b/0001-force-gbuild-stage-for-CustomTargets.patch
@@ -0,0 +1,28 @@
+From ee29bb2a47311d86f794d10bbcfad27644baebb5 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Wed, 14 Dec 2011 07:11:47 +0100
+Subject: [PATCH] force gbuild stage for CustomTargets
+
+gb_SourceEnvAndRecurse_STAGE is unset in CustomTarget's make process
+when the parent make has been started in sourced environment. This leads
+to all sorts of "interesting" failures because the gbuild classes and
+platform stuff are not loaded...
+---
+ solenv/gbuild/CustomTarget.mk |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
+index 41b23b8..1e075af 100644
+--- a/solenv/gbuild/CustomTarget.mk
++++ b/solenv/gbuild/CustomTarget.mk
+@@ -31,6 +31,7 @@ define gb_CustomTarget__command
+ +$(call gb_Helper_abbreviate_dirs,\
+ 	mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
+ 	O='$(OUTDIR)' R='$(REPODIR)' S='$(SRCDIR)' W='$(WORKDIR)' gb_AWK='$(gb_AWK)' \
++	gb_SourceEnvAndRecurse_STAGE=gbuild \
+ 	gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' SRCDIR='$(SRCDIR)' \
+ 	$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
+ 	touch $(1))
+-- 
+1.7.7.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 4a9733e..b6a93aa 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -111,6 +111,7 @@ Patch10: 0001-wpsimport-writerperfect.diff-WPS-Import-filter-core-.patch
 Patch11: libreoffice-gcj.patch
 Patch12: libreoffice-rhel6poppler.patch
 %endif
+Patch13: 0001-force-gbuild-stage-for-CustomTargets.patch
 # TODO: this in S390 only, so it can wait .-)
 #Patch13: solenv.fix.mk.inheritance.patch
 
@@ -754,6 +755,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch10 -p1 -R -b .wpsimport
 %patch11 -p1 -b .gcj.patch
 %patch12 -p0 -b .rhel6poppler.patch
+%patch13 -p1 -b .force-gbuild-stage-for-CustomTargets.patch
 %endif
 #%patch13 -p1 -b .solenv.fix.mk.inheritance.patch