ooo-build r14151 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Sep 30 12:11:36 2008
New Revision: 14151
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14151&view=rev

Log:
2008-09-30  Rene Engelhard  <rene debian org>

        * patches/src680/unxsplash-rework.diff: don't run the external oosplash
          with -nologo (no splash anyway) and with the (new) -no-oosplash.
          Latter needed for e.g. OOo calls from mutt via mimecap (see
          bugs.debian.org/396276)


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff

Modified: branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff	Tue Sep 30 12:11:36 2008
@@ -46,12 +46,17 @@
 index 7fd1393..20936bd 100644
 --- desktop/scripts/soffice.sh
 +++ desktop/scripts/soffice.sh
-@@ -147,6 +147,11 @@ else
+@@ -147,6 +147,16 @@ else
  PATH=$sd_prog${PATH+:$PATH}
  export PATH
  
 +# test for availability of the fast external splash
-+if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] ; then
++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
 +