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

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Oct 20 11:57:12 2008
New Revision: 14349
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14349&view=rev

Log:
2008-10-20  Rene Engelhard  <rene debian org>

        * patches/dev300/unxsplash-rework.diff,
          patches/dev300/apply,
          patches/dev300/cwscheckapi-envset.diff: fix cwscheckapi


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

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Mon Oct 20 11:57:12 2008
@@ -598,6 +598,8 @@
 # fix bitmap reading; the lines are aliased to 4 bytes
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
+[ Fixes ]
+cwscheckapi-envset.diff, i#95204
 
 [ WriterFixes ]
 # Allows to copy/paste html text which is between 2 unknown tags.

Added: branches/ooo-build-3-0/patches/dev300/cwscheckapi-envset.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/cwscheckapi-envset.diff	Mon Oct 20 11:57:12 2008
@@ -0,0 +1,16 @@
+Index: cwscheckapi
+===================================================================
+RCS file: /cvs/tools/solenv/bin/cwscheckapi,v
+retrieving revision 1.3.36.1
+diff -u -r1.3.36.1 cwscheckapi
+--- solenv/bin/cwscheckapi	14 Aug 2008 12:52:20 -0000	1.3.36.1
++++ solenv/bincwscheckapi	20 Oct 2008 11:53:11 -0000
+@@ -163,7 +163,7 @@
+ PARAM="$PARAM -cmd '$OFFICEBIN  -nofirststartwizard -no-oosplash -norestore -nocrashreport -nolockcheck -accept=pipe,name=$USER;urp;'"
+ PARAM="$PARAM -cs pipe,name=$USER"
+ PARAM="$PARAM -NoOffice true"
+-PARAM="$PARAM -OOO_EnvSet setsolar"
++PARAM="$PARAM -OOO_EnvSet $SRC_ROOT/*Env.Set"
+ PARAM="$PARAM -SRC_ROOT $SRC_ROOT"
+ PARAM="$PARAM -COMP_ENV $INPATH"
+ PARAM="$PARAM -Shell /usr/bin/tcsh"

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	Mon Oct 20 11:57:12 2008
@@ -2358,3 +2358,19 @@
  	if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) {
  		$Command = "cd \"$programpath\"; " . $Command;
  	}
+Index: cwscheckapi
+===================================================================
+RCS file: /cvs/tools/solenv/bin/cwscheckapi,v
+retrieving revision 1.3.36.1
+diff -u -r1.3.36.1 cwscheckapi
+--- solenv/bin/cwscheckapi	14 Aug 2008 12:52:20 -0000	1.3.36.1
++++ solenv/bin/cwscheckapi	20 Oct 2008 11:51:21 -0000
+@@ -160,7 +160,7 @@
+ 	fi
+ fi
+ 
+-PARAM="$PARAM -cmd '$OFFICEBIN  -nofirststartwizard -norestore -nocrashreport -nolockcheck -accept=pipe,name=$USER;urp;'"
++PARAM="$PARAM -cmd '$OFFICEBIN  -nofirststartwizard -no-oosplash -norestore -nocrashreport -nolockcheck -accept=pipe,name=$USER;urp;'"
+ PARAM="$PARAM -cs pipe,name=$USER"
+ PARAM="$PARAM -NoOffice true"
+ PARAM="$PARAM -OOO_EnvSet setsolar"