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

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jan  8 14:59:45 2009
New Revision: 15031
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15031&view=rev

Log:
2008-01-08  Petr Mladek  <pmladek suse cz>

	* patches/dev300/cws-hro41.diff, patches/dev300/apply: "soffice" is
	  binary instead of shellscript in ooo300-m14; will be fixed in m15;
	  thanks Rene for pointing this out



Added:
   branches/ooo-build-3-0-1/patches/dev300/cws-hro41.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Thu Jan  8 14:59:45 2009
@@ -294,6 +294,12 @@
 wpsimport-writerperfect.diff
 libwps.diff
 
+[ CWSBackports == ooo300-m14 ]
+
+# "soffice" now being binary instead of shellscript
+cws-hro41.diff, i#97491
+
+
 [ CWSBackports ]
 #basic runtime fixes
 basic-add-missing-includes-after-cws-npower10.diff

Added: branches/ooo-build-3-0-1/patches/dev300/cws-hro41.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/cws-hro41.diff	Thu Jan  8 14:59:45 2009
@@ -0,0 +1,47 @@
+Index: desktop/prj/d.lst
+===================================================================
+RCS file: /cvs/framework/desktop/prj/d.lst,v
+retrieving revision 1.67.12.2
+retrieving revision 1.67.12.2.2.1
+diff -u -p -u -p -b -w -B -r1.67.12.2 -r1.67.12.2.2.1
+--- desktop/prj/d.lst	11 Dec 2008 15:22:37 -0000	1.67.12.2
++++ desktop/prj/d.lst	7 Jan 2009 15:06:38 -0000	1.67.12.2.2.1
+@@ -12,11 +12,11 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
+ ..\%__SRC%\bin\soffice.bin %_DEST%\bin%_EXT%\soffice.bin
+ ..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe
+ ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
+-..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice
++..\%__SRC%\bin\soffice_mac %_DEST%\bin%_EXT%\soffice
+ ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
+ ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe
+ ..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin
+-..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice
++..\%__SRC%\bin\so\soffice_mac %_DEST%\bin%_EXT%\so\soffice
+ ..\%__SRC%\bin\sofficeapp.dll %_DEST%\bin%_EXT%\sofficeapp.dll
+ ..\%__SRC%\lib\isofficeapp.lib %_DEST%\lib%_EXT%\isofficeapp.lib
+ ..\%__SRC%\lib\libsofficeapp.dylib %_DEST%\lib%_EXT%\libsofficeapp.dylib
+Index: desktop/util/makefile.mk
+===================================================================
+RCS file: /cvs/framework/desktop/util/makefile.mk,v
+retrieving revision 1.82.12.1
+retrieving revision 1.82.12.1.20.1
+diff -u -p -u -p -b -w -B -r1.82.12.1 -r1.82.12.1.20.1
+--- desktop/util/makefile.mk	27 Aug 2008 14:32:53 -0000	1.82.12.1
++++ desktop/util/makefile.mk	7 Jan 2009 15:06:38 -0000	1.82.12.1.20.1
+@@ -210,6 +210,16 @@ ALLTAR : $(BIN)$/so$/soffice_so$(EXECPOS
+ 
+ .ENDIF
+ 
++.IF "$(OS)" == "MACOSX"
++$(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
++	$(COPY) $< $@
++	
++$(BIN)$/soffice_mac$(EXECPOST) : $(APP5TARGETN)
++	$(COPY) $< $@
++
++ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) $(BIN)$/soffice_mac$(EXECPOST)
++
++.ENDIF
+ 
+ .IF "$(GUI)" == "WNT"
+