ooo-build r13554 - in trunk: . patches/dev300 patches/scsolver

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Aug 13 23:28:40 2008
New Revision: 13554
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13554&view=rev

Log:
2008-08-13  Kohei Yoshida  <kyoshida novell com>

	* patches/scsolver/scsolver-config-set-soenv.diff: forgot to modify this
	one...  No wonder the value WITH_SCSOLVER was not being propagated to
	the setenv script.

	* patches/dev300/apply: apply the new patch.


Added:
   trunk/patches/scsolver/scsolver-config-set-soenv.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 13 23:28:40 2008
@@ -1638,6 +1638,7 @@
 SectionOwner => kohei
 
 scsolver-config-option.diff
+scsolver-config-set-soenv.diff
 scsolver-lpsolve.diff      
 scsolver-sc-build-lst.diff 
 scsolver-sc-remove-menu.diff

Added: trunk/patches/scsolver/scsolver-config-set-soenv.diff
==============================================================================
--- (empty file)
+++ trunk/patches/scsolver/scsolver-config-set-soenv.diff	Wed Aug 13 23:28:40 2008
@@ -0,0 +1,12 @@
+diff --git config_office/set_soenv.in config_office/set_soenv.in
+index 912e320..b0ecdf7 100644
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -1982,6 +1982,7 @@ ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
+ ToFile( "WITH_BINFILTER",    "@WITH_BINFILTER@",   "e" );
+ ToFile( "BUILD_TYPE",        "@BUILD_TYPE@",       "e" );
+ ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
++ToFile( "WITH_SCSOLVER",     "@WITH_SCSOLVER@",    "e" );
+ ToFile( "WITH_FONTOOO",      "@WITH_FONTOOO@",     "e" );
+ ToFile( "ENABLE_EVOAB2",     "@ENABLE_EVOAB2@",    "e" );
+ ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );