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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 21:15:27 2008
New Revision: 14959
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14959&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/scsolver/scsolver-lpsolve-m37.diff:
	* patches/scsolver/scsolver-lpsolve.diff:
	* patches/dev300/apply: adjusted for dev300-m38.



Added:
   trunk/patches/scsolver/scsolver-lpsolve-m37.diff   (props changed)
      - copied unchanged from r14946, /trunk/patches/scsolver/scsolver-lpsolve.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/scsolver/scsolver-lpsolve.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec 29 21:15:27 2008
@@ -2029,12 +2029,17 @@
 
 scsolver-config-option.diff
 scsolver-config-set-soenv.diff
-scsolver-lpsolve.diff
 scsolver-sc-build-lst.diff
 scsolver-sc-remove-menu.diff
 scsolver-scp2.diff
 scsolver-setup_native.diff
 
+[ CalcSolver < dev300-m38 ]
+scsolver-lpsolve-m37.diff
+
+[ CalcSolver >= dev300-m38 ]
+scsolver-lpsolve.diff
+
 #[ OOXSTLport5 ]
 #
 ## oox devs, please reconsider operator[] use,

Modified: trunk/patches/scsolver/scsolver-lpsolve.diff
==============================================================================
--- trunk/patches/scsolver/scsolver-lpsolve.diff	(original)
+++ trunk/patches/scsolver/scsolver-lpsolve.diff	Mon Dec 29 21:15:27 2008
@@ -1,8 +1,28 @@
+diff --git lpsolve/lp_solve_5.5.patch lpsolve/lp_solve_5.5.patch
+index fc446a4..42190cd 100644
+--- lpsolve/lp_solve_5.5.patch
++++ lpsolve/lp_solve_5.5.patch
+@@ -7,6 +7,15 @@
+  
+  def=
+  so=
++@@ -12,7 +12,7 @@ fi
++ 
++ opts='-O3'
++ 
++-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+++$c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++ ranlib liblpsolve55.a
++ 
+ --- misc/lp_solve_5.5/lpsolve55/ccc.os2	2008-11-26 12:49:36.000000000 +0100
+ +++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2	2008-09-25 17:27:48.000000000 +0200
+ @@ -1 +1,13 @@
 diff --git lpsolve/makefile.mk lpsolve/makefile.mk
-index 0c31972..26b75b3 100644
+index b36abbe..594e5a5 100644
 --- lpsolve/makefile.mk
 +++ lpsolve/makefile.mk
-@@ -65,14 +65,18 @@ OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
+@@ -68,14 +68,18 @@ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.lib
  .ELSE
  .IF "$(OS)"=="MACOSX"
  BUILD_ACTION=sh ccc.osx
@@ -24,7 +44,7 @@
  .ENDIF
  
 diff --git lpsolve/prj/d.lst lpsolve/prj/d.lst
-index 8998065..4237414 100644
+index 64b8c0c..bd15d44 100644
 --- lpsolve/prj/d.lst
 +++ lpsolve/prj/d.lst
 @@ -2,6 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\lpsolve
@@ -33,23 +53,5 @@
  ..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib%_EXT%\liblpsolve55.so
 +..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib%_EXT%\liblpsolve55.a
  ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib%_EXT%\liblpsolve55.dylib
+ ..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib%_EXT%\liblpsolve55.lib
  ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib%_EXT%\lpsolve55.lib
- ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin%_EXT%\lpsolve55.dll
---- lpsolve/lp_solve_5.5.patch.old	2008-08-12 16:19:58.000000000 +0200
-+++ lpsolve/lp_solve_5.5.patch	2008-08-12 16:19:18.000000000 +0200
-@@ -7,6 +7,15 @@
-  
-  def=
-  so=
-+@@ -12,7 +12,7 @@ fi
-+ 
-+ opts='-O3'
-+ 
-+-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-++$c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ ranlib liblpsolve55.a
-+ 
- --- misc/lp_solve_5.5/lpsolve55/ccc.osx	Thu Jun 23 22:53:08 2005
- +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx	Wed May 21 17:19:56 2008
- @@ -3,6 +3,10 @@