ooo-build r13766 - in trunk: . bin patches/dev300 patches/mono

[pmladek svn gnome org]

Author: pmladek
Date: Wed Sep  3 12:16:00 2008
New Revision: 13766
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13766&view=rev

Log:
2008-09-03  Petr Mladek  <pmladek suse cz>

	* patches/dev300/cppuhelper-findsofficepath-realpath-buffer-size.diff:
	* ooo-build/patches/dev300/apply: fixes the realpath buffer size to
	  avoid crash when detecting soffice path (i#93393)

	* bin/unpack, download.in, patches/mono/mono-climaker.diff:
	* patches/mono/buildfix-use-climaker-in-unoil.diff: use the
	  prebuilt dlls from ooo-cli-prebuilt-3.0.tar.bz2 with older mono
	  where the climaker does not work



Added:
   trunk/patches/dev300/cppuhelper-findsofficepath-realpath-buffer-size.diff
Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/patches/mono/buildfix-use-climaker-in-unoil.diff
   trunk/patches/mono/mono-climaker.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Wed Sep  3 12:16:00 2008
@@ -268,11 +268,11 @@
 
 # copy in misc Mono related dlls if we need to
 # we can't build them on Unix.
-CLI_TYPES=cli_uretypes.dll
+OOO_CLI_PREBUILT_ARCHIVE=ooo-cli-prebuilt-3.0.tar.bz2
 if test "z$PIECE" = "z"; then
-if test -f "$SRCDIR/$CLI_TYPES"; then
+if test -f "$SRCDIR/$OOO_CLI_PREBUILT_ARCHIVE"; then
     mkdir -p $OOBUILDDIR/external/cli
-    $GNUCP -af $SRCDIR/$CLI_TYPES $OOBUILDDIR/external/cli
+    ( cd $OOBUILDDIR/external/cli; bzip2 -dc $SRCDIR/$OOO_CLI_PREBUILT_ARCHIVE | $GNUTAR xpf - ) || exit 1;
 fi
 fi
 

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Wed Sep  3 12:16:00 2008
@@ -45,7 +45,7 @@
     'extras-.*'				 => '@MIRROR@/SRC680',
     'ooo_custom_images.*'                => '@MIRROR@/SRC680',
     'ooo_crystal_images.*'               => '@MIRROR@/SRC680',
-    'cli_uretypes.dll'                   => '@MIRROR@/@MWS@',
+    'ooo-cli-prebuilt-*'                 => '@MIRROR@/DEV300',
     'mdbtools.*'                         => '@MIRROR@/SRC680',
     'libpixman-.*'			 => '@MIRROR@/SRC680',
     'glitz-.*'			         => '@MIRROR@/SRC680',
@@ -240,7 +240,7 @@
 else
 {
     if ('@ENABLE_MONO@' ne 'FALSE') {
-	push @files, ( 'cli_uretypes.dll' );
+	push @files, ( 'ooo-cli-prebuilt-3.0.tar.bz2' );
     }
 }
 

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Sep  3 12:16:00 2008
@@ -496,6 +496,9 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+# fixes the realpath buffer size to avoid crash when detecting soffice path
+cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
+
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.

Added: trunk/patches/dev300/cppuhelper-findsofficepath-realpath-buffer-size.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cppuhelper-findsofficepath-realpath-buffer-size.diff	Wed Sep  3 12:16:00 2008
@@ -0,0 +1,19 @@
+--- cppuhelper/source/findsofficepath.c.old	2008-06-09 14:23:56.000000000 +0200
++++ cppuhelper/source/findsofficepath.c	2008-09-02 17:34:10.000000000 +0200
+@@ -112,6 +112,7 @@ static char* platformSpecific()
+ #else
+ 
+ #include <unistd.h>
++#include <limits.h>
+ 
+ /*     
+  * Gets the installation path from the PATH environment variable.
+@@ -137,7 +138,7 @@ static char* platformSpecific()
+     char* resolved = NULL;
+ 	char* sep = NULL;
+ 
+-    char buffer[1024];
++    char buffer[PATH_MAX];
+     int pos;
+ 
+     /* get the value of the PATH environment variable */

Modified: trunk/patches/mono/buildfix-use-climaker-in-unoil.diff
==============================================================================
--- trunk/patches/mono/buildfix-use-climaker-in-unoil.diff	(original)
+++ trunk/patches/mono/buildfix-use-climaker-in-unoil.diff	Wed Sep  3 12:16:00 2008
@@ -19,15 +19,14 @@
   
  .INCLUDE :  target.mk
  .ENDIF
-diff -rup unoil-orig/climaker/makefile.mk unoil/climaker/makefile.mk
---- unoil-orig/climaker/makefile.mk	2008-07-16 16:19:13.000000000 +0200
-+++ unoil/climaker/makefile.mk	2008-07-16 17:18:18.000000000 +0200
+--- unoil/climaker/makefile.mk.old	2008-07-17 13:44:44.000000000 +0200
++++ unoil/climaker/makefile.mk	2008-09-02 23:03:25.000000000 +0200
 @@ -45,7 +45,7 @@ TARGET = unotypes
  
  POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
  
 -.IF "$(BUILD_FOR_CLI)" != ""
-+.IF "$(BUILD_FOR_CLI)" != "" || "$(ENABLE_MONO_CLIMAKER)" == "YES"
++.IF "$(BUILD_FOR_CLI)" != "" || "$(ENABLE_MONO)" == "YES"
  
  ALLTAR : \
  	$(BIN)$/clioootypesversion.mk \
@@ -48,16 +47,29 @@
  	
  CLIMAKERFLAGS =
  .IF "$(debug)" != ""
-@@ -69,7 +79,7 @@ RDB = $(SOLARBINDIR)$/offapi.rdb
+@@ -68,8 +78,20 @@ CLIMAKERFLAGS += --verbose
+ RDB = $(SOLARBINDIR)$/offapi.rdb
  EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
  
- $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt 
++EXTERNAL_DIR=$(PRJ)$/..$/external/cli
++
++.IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
++
++$(BIN)$/cli_oootypes.dll : $(EXTERNAL_DIR)$/cli_oootypes.dll $(EXTERNAL_DIR)$/cli_oootypes.config
++	+$(COPY) $? $(BIN)$/
++
++$(POLICY_ASSEMBLY_FILE) : $(EXTERNAL_DIR)$/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
++	+$(COPY) $< $@
++
++.ELSE # .IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
++
+ $(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
 -	$(WRAPCMD) $(SOLARBINDIR)$/climaker.exe $(CLIMAKERFLAGS) \
 +	$(CLIMAKER) $(CLIMAKERFLAGS) \
  		--out $@ \
   		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
  		--assembly-company "OpenOffice.org" \
-@@ -86,10 +96,13 @@ $(BIN)$/cli_oootypes.config: cli_oootype
+@@ -86,10 +111,16 @@ $(BIN)$/cli_oootypes.config: cli_oootype
  	$< $@
  
  $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oootypes.config $(BIN)$/cli_oootypes.dll
@@ -72,6 +84,9 @@
 +			 -keyfile:$(SOLARBINDIR)$/cliuno.snk \
 +			 -link:cli_oootypes.config
 +	$(RM) cli_oootypes.config
++
++.ENDIF # .IF "$(ENABLE_MONO)" == "YES" && "$(ENABLE_MONO_CLIMAKER)" != "YES"
++
  
  #always deliver a clioootypesversion.mk. It is needed for the packing process even for all other
  #platforms. Therefore BUILD_FOR_CLI is not used here 

Modified: trunk/patches/mono/mono-climaker.diff
==============================================================================
--- trunk/patches/mono/mono-climaker.diff	(original)
+++ trunk/patches/mono/mono-climaker.diff	Wed Sep  3 12:16:00 2008
@@ -5,10 +5,12 @@
  
  EXTERNAL_DIR=$(PRJ)$/..$/external/cli
  
+-$(OUT)$/bin$/cli_uretypes.dll : $(EXTERNAL_DIR)$/cli_uretypes.dll
+-	+$(COPY) $< $@
 +.IF "$(ENABLE_MONO_CLIMAKER)" != "YES"
 +
- $(OUT)$/bin$/cli_uretypes.dll : $(EXTERNAL_DIR)$/cli_uretypes.dll
- 	+$(COPY) $< $@
++$(OUT)$/bin$/cli_uretypes.dll : $(EXTERNAL_DIR)$/cli_uretypes.dll $(EXTERNAL_DIR)$/cli_uretypes.config $(EXTERNAL_DIR)$/policy.1.0.cli_uretypes.dll
++	+$(COPY) $? $(OUT)$/bin$/
  
 +.ENDIF
 +