[ooo-build-commit] .: 2 commits - patches/dev300

[Michael Meeks]

 patches/dev300/apply                      |    9 ++++
 patches/dev300/unxsplash-secondstart.diff |   62 ++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

New commits:
commit 00d718205eb3cae4e6b66c73a876514a31a145e7
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Mar 8 16:38:59 2010 +0000

    clean up 2nd start speedup
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d5aa356..739542c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -491,9 +491,6 @@ desktop-quickstart-option-enable-unx.diff, i#108918, n#575555, pmladek
 # more quickstart fixes from Caolan
 sfx2-qstartfixes.diff, i#108846, caolan
 
-# Don't run pagein / javaldx the second time - it's a madness ...
-unxsplash-secondstart.diff
-
 [ WriterFixes ]
 
 [ CalcFixes ]
@@ -924,6 +921,10 @@ system-python-ure-bootstrap.diff, deb#501028, i#90701
 pyuno-ooodir.diff, i#90701
 system-python-uno-path.diff, i#97629
 
+[ QuickStarter ]
+# Don't run pagein / javaldx the second time - it's a madness ...
+unxsplash-secondstart.diff
+
 [ LiberationFontsOnWindows ]
 
 # Use Liberation fonts on Windows, too
commit b7e9506b48aa7d306534e293b72e97563f826320
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Nov 17 16:04:22 2009 +0000

    Try to avoid pagein on the second start ...
    
    * patches/dev300/apply:
    * patches/dev300/unxsplash-secondstart.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c7ed95d..d5aa356 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -176,6 +176,11 @@ cws-koheichart02-sc.diff,     kohei
 cws-koheichart02-xmloff.diff, kohei
 
 [ LinuxOnly ]
+# Don't stat tons of config files we don't need to read on startup
+# speed-configmgr.diff, i#56783, michael - CHECK ME !
+# 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
 
@@ -486,6 +491,9 @@ desktop-quickstart-option-enable-unx.diff, i#108918, n#575555, pmladek
 # more quickstart fixes from Caolan
 sfx2-qstartfixes.diff, i#108846, caolan
 
+# Don't run pagein / javaldx the second time - it's a madness ...
+unxsplash-secondstart.diff
+
 [ WriterFixes ]
 
 [ CalcFixes ]
diff --git a/patches/dev300/unxsplash-secondstart.diff b/patches/dev300/unxsplash-secondstart.diff
new file mode 100644
index 0000000..44af462
--- /dev/null
+++ b/patches/dev300/unxsplash-secondstart.diff
@@ -0,0 +1,62 @@
+--- desktop/scripts/soffice.sh
++++ desktop/scripts/soffice.sh
+@@ -74,6 +75,26 @@
+   esac
+ done
+ 
++# test for availability of the fast external splash
++for arg in $@; do
++	if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then
++		no_oosplash=y
++	fi
++done
++
++# Setup our app as oosplash, but try to avoid executing pagein,
++# and other expensive environment setup pieces wherever possible
++# for a second started office
++if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then
++    sd_binary="oosplash.bin"
++    
++    export QSTART_CHECK_ONLY=1
++    if "$sd_prog/$sd_binary" $*; then
++	exit 0
++    fi
++    unset QSTART_CHECK_ONLY
++fi
++
+ # pagein
+ sd_pagein_args=@pagein-common
+ for sd_arg in "$@"; do
+@@ -129,16 +151,6 @@
+ PYTHONPATH=$sd_prog/../basis-link/program${PYTHONPATH+:$PYTHONPATH}
+ export PYTHONPATH
+ 
+-# test for availability of the fast external splash
+-for arg in $@; do
+-	if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then
+-		no_oosplash=y
+-	fi
+-done
+-if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then
+-    sd_binary="oosplash.bin"
+-fi
+-
+ # execute soffice binary
+ "$sd_prog/$sd_binary" "$@" &
+ trap 'kill -9 $!' TERM
+
+
+diff -u -r ../../HEAD/build/ooo320-m2/desktop/unx/source/start.c unx/source//start.c
+--- desktop/unx/source/start.c
++++ desktop/unx/source/start.c
+@@ -790,6 +790,9 @@
+         ustr_debug( "Failed to connect to pipe", pPipePath );
+ #endif
+ 
++    if (getenv ("QSTART_CHECK_ONLY"))
++	return !bSentArgs;
++
+     if ( !bSentArgs )
+     {
+         if ( !fork_app( pAppPath, &status_fd ) )
+