[ooo-build-commit] patches/emf+

[Tor Lillqvist]

 patches/emf+/emf+-cppcanvas-emfplus.diff |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9d433f07a1f57be2f04c4fc340243c6c09e4f88f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 17:13:59 2009 +0300

    Adapt emf+-cppcanvas-emfplus.diff for dev300-m56

diff --git a/patches/emf+/emf+-cppcanvas-emfplus.diff b/patches/emf+/emf+-cppcanvas-emfplus.diff
index 6b15aee..c5be3af 100644
--- a/patches/emf+/emf+-cppcanvas-emfplus.diff
+++ b/patches/emf+/emf+-cppcanvas-emfplus.diff
@@ -169,17 +169,17 @@
          };
  
  
---- cppcanvas/util/makefile.mk.old	2009-04-06 16:41:40.000000000 +0000
-+++ cppcanvas/util/makefile.mk	2009-04-06 16:42:16.000000000 +0000
-@@ -55,7 +55,7 @@ LINKFLAGS+=-Wl,--no-as-needed
+--- cppcanvas/util/makefile.mk
++++ cppcanvas/util/makefile.mk
+@@ -55,7 +55,7 @@
  
  SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
  SHL1IMPLIB= 	i$(TARGET)
--SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
-+SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(SVTOOLLIB)
- 
- SHL1LIBS=		$(SLB)$/$(TARGET).lib
+-SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(I18NISOLANGLIB)
++SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)  $(I18NISOLANGLIB) $(SVTOOLLIB)
  
+ .IF "$(debug)$(dbgutil)"!=""
+ SHL1STDLIBS += $(CPPUHELPERLIB)
 --- cppcanvas/source/mtfrenderer/makefile.mk.old	2009-04-02 11:06:59.000000000 +0000
 +++ cppcanvas/source/mtfrenderer/makefile.mk	2009-04-06 16:42:16.000000000 +0000
 @@ -48,6 +48,7 @@ CDEFS+= -DVERBOSE