[ooo-build-commit] patches/dev300

[Michael Meeks]

 patches/dev300/apply                 |    3 +++
 patches/dev300/speed-soffice-sh.diff |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 577207e7bb5e9342e22d7893c4b5abd9153f4f83
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Nov 13 12:13:03 2009 +0000

    Enable pre-processed soffice script
    
    * patches/dev300/apply:
    * patches/dev300/speed-soffice-sh.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 55922c0..f8bd664 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -206,6 +206,9 @@ cws-koheicopyborder-svx.diff, kohei
 [ LinuxOnly ]
 # Don't stat tons of config files we don't need to read on startup
 speed-configmgr.diff, i#56783, michael
+# Don't spawn pointless processes to work out things we know at compile time
+speed-soffice-sh.diff, i#106891, michael
+
 
 # add accelerator to the OK and Cancel buttons.
 ok-cancel-btn-add-accel.diff, kohei
diff --git a/patches/dev300/speed-soffice-sh.diff b/patches/dev300/speed-soffice-sh.diff
index c6d7257..873a8f6 100644
--- a/patches/dev300/speed-soffice-sh.diff
+++ b/patches/dev300/speed-soffice-sh.diff
@@ -1,6 +1,6 @@
 diff -u -r /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/makefile.mk desktop/scripts/makefile.mk
---- /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/makefile.mk	2009-08-20 11:47:59.000000000 +0200
-+++ desktop/scripts/makefile.mk	2009-11-07 20:07:43.000000000 +0100
+--- desktop/scripts/makefile.mk
++++ desktop/scripts/makefile.mk
 @@ -54,7 +54,12 @@
      $(MISC)$/unopkg.sh
  
@@ -15,10 +15,11 @@ diff -u -r /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/makefile.mk desk
  
  .INCLUDE :  target.mk
 +
-Only in desktop/scripts: makefile.mk~
+
+
 diff -u -r /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/soffice.sh desktop/scripts/soffice.sh
---- /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/soffice.sh	2009-10-19 17:08:33.000000000 +0200
-+++ desktop/scripts/soffice.sh	2009-11-07 20:08:40.000000000 +0100
+--- desktop/scripts/soffice.sh
++++ desktop/scripts/soffice.sh
 @@ -44,7 +44,8 @@
  # SAL_NOOPENGL=true; export SAL_NOOPENGL
  
@@ -29,4 +30,3 @@ diff -u -r /opt/OpenOffice/HEAD/build/ooo320-m2/desktop/scripts/soffice.sh deskt
      JITC_PROCESSOR_TYPE=6
      export JITC_PROCESSOR_TYPE
  fi
-Only in desktop/scripts: soffice.sh~