ooo-build r11874 - in trunk: . patches/src680

[hmth svn gnome org]

Author: hmth
Date: Tue Mar 11 18:00:12 2008
New Revision: 11874
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11874&view=rev

Log:
	* patches/src680/system-xmlsec.diff: fix apply
	* patches/src680/buildfix-vba-as-extn.diff: add; dmake failed on
	ambiguous variable COMP in sc/util/makefile.mk


Added:
   trunk/patches/src680/buildfix-vba-as-extn.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/system-xmlsec.diff

Added: trunk/patches/src680/buildfix-vba-as-extn.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/buildfix-vba-as-extn.diff	Tue Mar 11 18:00:12 2008
@@ -0,0 +1,10 @@
+--- sc/util/makefile.mk.orig	2008-03-11 18:36:44.000000000 +0100
++++ sc/util/makefile.mk	2008-03-11 18:36:54.000000000 +0100
+@@ -300,6 +300,7 @@
+ 
+ .INCLUDE :  target.mk
+ 
++COMP=
+ .IF "$(VBA_EXTENSION)"=="YES"
+     COMP=build_extn
+ .ENDIF

Modified: trunk/patches/src680/system-xmlsec.diff
==============================================================================
--- trunk/patches/src680/system-xmlsec.diff	(original)
+++ trunk/patches/src680/system-xmlsec.diff	Tue Mar 11 18:00:12 2008
@@ -58,14 +58,14 @@
 diff -u -p -r1.68 set_soenv.in
 --- config_office/set_soenv.in	20 Jun 2005 15:18:00 -0000	1.68
 +++ config_office/set_soenv.in	8 Jul 2005 11:13:50 -0000
-@@ -2074,6 +2074,7 @@ ToFile( "MYSPELL_CFLAGS",    "@MYSPELL_C
- ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
- ToFile( "BUILD_SCSOLVER",    "@BUILD_SCSOLVER@",   "e" );
- ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
-+ToFile( "SYSTEM_XMLSEC",     "@SYSTEM_XMLSEC@",    "e" );
+@@ -2074,6 +2074,7 @@
  ToFile( "PAM",               "@PAM@",              "e" );
  ToFile( "NEW_SHADOW_API",    "@NEW_SHADOW_API@",   "e" );
  ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );
++ToFile( "SYSTEM_XMLSEC",     "@SYSTEM_XMLSEC@",    "e" );
+ ToFile( "CRYPT_LINK",        "@CRYPT_LINK@",       "e" );
+ ToFile( "XAU_LIBS",          "@XAU_LIBS@",         "e" );
+ ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@", "e" );
 Index: source/ooo/file_library_ooo.scp
 ===================================================================
 RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v