ooo-build r14967 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Dec 30 01:24:43 2008
New Revision: 14967
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14967&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/unxsplash-rework-m36.diff:
	* patches/dev300/unxsplash-rework.diff: adjusted for dev300-m37 and newer.
	
	* patches/dev300/apply: re-enabled the whole QuickStarter section which 
	depended upon the above patch.



Added:
   trunk/patches/dev300/unxsplash-rework-m36.diff
      - copied unchanged from r14946, /trunk/patches/dev300/unxsplash-rework.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/unxsplash-rework.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Dec 30 01:24:43 2008
@@ -625,7 +625,7 @@
 unxsplash-rework.diff, i#60696, michael/jholesov
 
 [ QuickStarter > dev300-m36 ]
-#FIXME_m37 unxsplash-rework.diff, i#60696, michael/jholesov
+unxsplash-rework.diff, i#60696, michael/jholesov
 
 [ QuickStarter ]
 # fix the systray quickstarter
@@ -635,7 +635,7 @@
 # due to being unused. fix properly.
 hack-readd-GetStringParam.diff
 
-[ QuickStarter <= dev300-m36 ]
+[ QuickStarter ]
 # handling of osl pipe has changed, see i#84045
 unxsplash-new-osl-pipe.diff, i#60696, jholesov
 
@@ -654,25 +654,6 @@
 # fix bitmap reading; the lines are aliased to 4 bytes
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
-[ QuickStarter > dev300-m36 ]
-# handling of osl pipe has changed, see i#84045
-#FIXME_m37 unxsplash-new-osl-pipe.diff, i#60696, jholesov
-
-# fix the slot: handling again :-(
-#FIXME_m37 unxsplash-new-osl-pipe-slot.diff, i#60696, n#375529, jholesov
-
-# when OOo fails during startup, don't loop endlessly
-#FIXME_m37 unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
-
-# the 'three layer OOo' needs rpath
-#FIXME_m37 unxsplash-rpath.diff, i#60696, jholesov
-
-# the OSL_PIPE protocol has changed thanks to 3-layer OOo again :-(
-#FIXME_m37 unxsplash-3layer.diff, i#60696, jholesov
-
-# fix bitmap reading; the lines are aliased to 4 bytes
-#FIXME_m37 unxsplash-bmp-alias.diff, i#60696, jholesov
-
 [ Fixes < dev300-m37 ]
 cwscheckapi-envset.diff, i#95204
 

Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff	(original)
+++ trunk/patches/dev300/unxsplash-rework.diff	Tue Dec 30 01:24:43 2008
@@ -30,14 +30,14 @@
 -dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
 +dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
  dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
-diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
-index ebfc739..b550b26 100644
+diff --git desktop/prj/d.lst desktop/prj/d.lst
+index 9fed318..7698153 100644
 --- desktop/prj/d.lst
 +++ desktop/prj/d.lst
-@@ -7,6 +7,7 @@ mkdir: %_DEST%\bin%_EXT%\remote2
+@@ -13,6 +13,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
  ..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe
  ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
- ..\%__SRC%\bin\officeloader %_DEST%\bin%_EXT%\soffice
+ ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice
 +..\%__SRC%\bin\oosplash %_DEST%\bin%_EXT%\oosplash.bin
  ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
  ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe
@@ -2358,20 +2358,16 @@
        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
+diff --git solenv/bin/cwscheckapi solenv/bin/cwscheckapi
+index fe5ecc1..e43ba12 100755
+--- solenv/bin/cwscheckapi
++++ solenv/bin/cwscheckapi
+@@ -225,7 +225,7 @@ if [ -n "$WORK_STAMP" ]; then
+ 	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 -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
++PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -no-oosplash -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
  PARAM="$PARAM -cs pipe,name=$USER"
  PARAM="$PARAM -NoOffice true"
- PARAM="$PARAM -OOO_EnvSet setsolar"
-
+ PARAM="$PARAM -SRC_ROOT $SRC_ROOT"