ooo-build r14150 - in branches/debian-2-4-1: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Sep 30 12:05:19 2008
New Revision: 14150
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14150&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/debian-2-4-1/ChangeLog
   branches/debian-2-4-1/patches/src680/unxsplash-rework.diff

Modified: branches/debian-2-4-1/patches/src680/unxsplash-rework.diff
==============================================================================
--- branches/debian-2-4-1/patches/src680/unxsplash-rework.diff	(original)
+++ branches/debian-2-4-1/patches/src680/unxsplash-rework.diff	Tue Sep 30 12:05:19 2008
@@ -46,12 +46,17 @@
 index 7fd1393..20936bd 100644
 --- desktop/scripts/soffice.sh
 +++ desktop/scripts/soffice.sh
-@@ -262,6 +262,10 @@ else
+@@ -262,6 +262,15 @@ else
  fi
  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
++fi
++if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] && [ "$no_oosplash" != "y" ] ; then
 +    sd_binary="oosplash.bin"
 +fi