[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                     |    6 ++++++
 patches/dev300/link-with-comphelper.diff |   10 ++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit e3931b516cab39fe8b6a7a84904ce8de64086196
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Sep 3 15:05:40 2009 +0300

    Hacky fix for build problem in xmlscript/util
    
    * patches/dev300/link-with-comphelper.diff: New diff. Link with
      $(COMPHELPERLIB) in xmlscript/util. No idea why needed in ooo-build.
      Would be nice to find out the root cause.
    
    * patches/dev300/apply: Add it to Fixes, with FIXME comment.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ad93187..3627073 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3244,6 +3244,12 @@ fontconfig-cache-pre-substitution.diff, n#529532, kohei
 # this if some way to fix the root cause of the problem is found.
 link-with-uno-cppu.diff, tml
 
+# FIXME: 2009-09-03: For some reason need to link with
+# $(COMPHELPERLIB), in xmlscript/util, otherwise get undefined
+# refs. Remove this if some way to fix the root cause of the problem
+# is found.
+link-with-comphelper.diff, tml
+
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 
diff --git a/patches/dev300/link-with-comphelper.diff b/patches/dev300/link-with-comphelper.diff
new file mode 100644
index 0000000..131d475
--- /dev/null
+++ b/patches/dev300/link-with-comphelper.diff
@@ -0,0 +1,10 @@
+--- xmlscript/util/makefile.mk
++++ xmlscript/util/makefile.mk
+@@ -58,6 +58,7 @@
+         $(LIB1TARGET)
+ 
+ SHL1STDLIBS= \
++        $(COMPHELPERLIB)		\
+         $(CPPUHELPERLIB)		\
+         $(CPPULIB) 			\
+         $(SALLIB)