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

[tml svn gnome org]

Author: tml
Date: Tue Jan 15 17:05:35 2008
New Revision: 11271
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11271&view=rev

Log:
2008-01-15  Tor Lillqvist  <tml novell com>

	* patches/src680/layout-dialogs-config_office-scp2.diff: Add the
	ENABLE_LAYOUT line to another place in the set_soenv.in file so
	that the lines added by a Mono patch (which aren't there on Win32)
	aren't visible in the diff chunk context.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/layout-dialogs-config_office-scp2.diff

Modified: trunk/patches/src680/layout-dialogs-config_office-scp2.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-config_office-scp2.diff	(original)
+++ trunk/patches/src680/layout-dialogs-config_office-scp2.diff	Tue Jan 15 17:05:35 2008
@@ -33,14 +33,14 @@
 index 8448a23..f653f99 100644
 --- config_office/set_soenv.in
 +++ config_office/set_soenv.in
-@@ -1795,6 +1795,7 @@ ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
- # (c = comment, e = environment variable, a = alias )
- ToFile( "Platform dependent constant values.", $empty, "c" );
- ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
+@@ -1828,6 +1828,7 @@ ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
+ ToFile( "use_shl_versions",  $use_shl_versions,  "e" );
+ ToFile( "WRAPCMD",           $WRAPCMD,           "e" );
+ ToFile( "FLIPCMD",           $FLIPCMD,           "e" );
 +ToFile( "ENABLE_LAYOUT",       "@ENABLE_LAYOUT@",    "e" );
- ToFile( "ENABLE_MONO",       "@ENABLE_MONO@",    "e" );
- ToFile( "ENABLE_MONO_CLIMAKER",       "@ENABLE_MONO_CLIMAKER@",    "e" );
- ToFile( "CSC",               "@CSC@",            "e" );
+ #
+ # Writing the variables to file.
+ # (c = comment, e = environment variable, a = alias, n = newline )
 diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
 index f9fffd2..9514a82 100644
 --- scp2/prj/build.lst