[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/apply                            |    1 +
 patches/dev300/buildfix-sw-uiconfig-layout.diff |   11 +++++++++++
 patches/dev300/piece-sw.diff                    |   11 +++++++++++
 3 files changed, 23 insertions(+)

New commits:
commit 59ad1d8b1ea8458c84359a568f43a1ef33a17269
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 23 21:32:06 2009 +0200

    Fix tralay call in sw
    
    * patches/dev300/buildfix-sw-uiconfig-layout.diff: tralay must be called
      with AUGMENT_LIBRARY_PATH and absolute path defined
    * patches/dev300/piece-sw.diff: remove the absolute path for the split build
    * patches/dev300/apply: apply the two above diffs

diff --git a/patches/dev300/apply b/patches/dev300/apply
index eb9b7b1..35888f7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2424,6 +2424,7 @@ layout-disable-experimental.diff
 layout-accessibility-dispose-only-once.diff, n#500267, janneke
 buildfix-toolkit-workben-layout.diff
 buildfix-svx-uiconfig-layout.diff
+buildfix-sw-uiconfig-layout.diff
 build-fix-layout-numfmt.diff
 # Fix heavy parallel build of the zips containing the xmls
 layout-parallel-build.diff
diff --git a/patches/dev300/buildfix-sw-uiconfig-layout.diff b/patches/dev300/buildfix-sw-uiconfig-layout.diff
new file mode 100644
index 0000000..f7d9ce1
--- /dev/null
+++ b/patches/dev300/buildfix-sw-uiconfig-layout.diff
@@ -0,0 +1,11 @@
+--- sw/uiconfig/layout/layout.mk.old	2009-10-15 14:52:41.000000000 +0200
++++ sw/uiconfig/layout/layout.mk	2009-10-23 21:23:59.000000000 +0200
+@@ -1,7 +1,7 @@
+ # TODO: move to solenv/inc
+ # copies: sw/uiconfig/layout svx/uiconfig/layout
+ 
+-TRALAY=tralay
++TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
+ XML_DEST=$(DLLDEST)
+ XML_LANGS=$(alllangiso)
+ 
diff --git a/patches/dev300/piece-sw.diff b/patches/dev300/piece-sw.diff
index d37b4f2..cf8b9ab 100644
--- a/patches/dev300/piece-sw.diff
+++ b/patches/dev300/piece-sw.diff
@@ -10,3 +10,14 @@
 +        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SPLITINSTALLDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
          echo $@
  
+--- sw/uiconfig/layout/layout.mk.old1	2009-10-23 21:23:59.000000000 +0200
++++ sw/uiconfig/layout/layout.mk	2009-10-23 21:24:26.000000000 +0200
+@@ -1,7 +1,7 @@
+ # TODO: move to solenv/inc
+ # copies: sw/uiconfig/layout svx/uiconfig/layout
+ 
+-TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/tralay
++TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
+ XML_DEST=$(DLLDEST)
+ XML_LANGS=$(alllangiso)
+