[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                   |    5 +++++
 patches/dev300/link-with-uno-cppu.diff |   12 ++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit feddf2d160e71bb98ec2d93c11945838c51d3a30
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Sep 3 13:15:23 2009 +0300

    Hacky fix for build problem in vcl/util
    
    * patches/dev300/link-with-uno-cppu.diff: New diff. Link the
      vcplug_gen shared library also with $(CPPULIB). Otherwise I get
      undefined errors for uno_any_destruct and other symbols. Would be
      nice to find out the root cause for this problem.
    
    * patches/dev300/apply: Add it to Fixes with FIXME comment.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 79dc89c..994d9f0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3234,6 +3234,11 @@ edit-links-decode-unicode-uri.diff, i#104166, kohei
 # cache fontconfig's pre-substitution result for better rendering performance.
 fontconfig-cache-pre-substitution.diff, n#529532, kohei
 
+# FIXME: 2009-09-03: For some reason need to link with $(CPPULIB),
+# i.e. -luno_cppu in vcl/util, otherwise get undefined refs. Remove
+# this if some way to fix the root cause of the problem is found.
+link-with-uno-cppu.diff, tml
+
 [ OOXML ]
 oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
 
diff --git a/patches/dev300/link-with-uno-cppu.diff b/patches/dev300/link-with-uno-cppu.diff
new file mode 100644
index 0000000..6e8d472
--- /dev/null
+++ b/patches/dev300/link-with-uno-cppu.diff
@@ -0,0 +1,12 @@
+--- vcl/util/makefile.mk
++++ vcl/util/makefile.mk
+@@ -287,7 +287,8 @@
+             $(TOOLSLIB)         \
+             $(VOSLIB)           \
+             $(BASEGFXLIB)	\
+-            $(SALLIB)
++            $(SALLIB)          \
++            $(CPPULIB)
+ 
+ # prepare linking of Xinerama
+ .IF "$(USE_XINERAMA)" != "NO"