<http://cgit.freedesktop.org/libreoffice/postprocess/commit/?h=libreoffice-3-4&id=978f106a5e6851dc6e833ab33c437ad7baa2bb38>
"make the 3D transitions work again" causes libreoffice-3-4 build to
fail for me in postprocess/packcomponents, not finding
ogltrans.component. Attached 0001-Fix-build-of-ogltrans.component.patch
would fix that for me. Please sign-off and commit.
Stephan
From 8ded95d08c34ab0253530f855b4e6a77d3c8c356 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 7 Nov 2011 21:23:24 +0100
Subject: [PATCH] Fix build of ogltrans.component
...now that postprocess/packcomponents wants to use it.
---
slideshow/source/engine/OGLTrans/mac/makefile.mk | 8 ++++++++
slideshow/source/engine/OGLTrans/unx/makefile.mk | 8 ++++++++
slideshow/source/engine/OGLTrans/win/makefile.mk | 4 ++--
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/slideshow/source/engine/OGLTrans/mac/makefile.mk
b/slideshow/source/engine/OGLTrans/mac/makefile.mk
index aaaedb9..8f08080 100644
--- a/slideshow/source/engine/OGLTrans/mac/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/mac/makefile.mk
@@ -85,3 +85,11 @@ DEF1EXPORTFILE=../exports.dxp
# ==========================================================================
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/ogltrans.component
+
+$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ ../ogltrans.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
diff --git a/slideshow/source/engine/OGLTrans/unx/makefile.mk
b/slideshow/source/engine/OGLTrans/unx/makefile.mk
index 31066e3..2b31ac7 100644
--- a/slideshow/source/engine/OGLTrans/unx/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/unx/makefile.mk
@@ -71,3 +71,11 @@ DEF1EXPORTFILE=../exports.dxp
# ==========================================================================
.INCLUDE : target.mk
+
+ALLTAR : $(MISC)/ogltrans.component
+
+$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ ../ogltrans.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
diff --git a/slideshow/source/engine/OGLTrans/win/makefile.mk
b/slideshow/source/engine/OGLTrans/win/makefile.mk
index 7da3787..7f0ac88 100644
--- a/slideshow/source/engine/OGLTrans/win/makefile.mk
+++ b/slideshow/source/engine/OGLTrans/win/makefile.mk
@@ -74,7 +74,7 @@ DEF1EXPORTFILE=../exports.dxp
ALLTAR : $(MISC)/ogltrans.component
$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ogltrans.component
+ ../ogltrans.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ogltrans.component
+ $(SOLARENV)/bin/createcomponent.xslt ../ogltrans.component
--
1.7.6.4
Context
- [Libreoffice] [PATCH] fix libreoffice-3-4 after "make the 3D transitions work again" · Stephan Bergmann
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.