ooo-build r11994 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Tue Mar 25 09:35:33 2008
New Revision: 11994
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11994&view=rev

Log:
2008-03-24  Jan Holesovsky  <kendy suse cz>
        
        * patches/dev300/scs-scp2.diff: Fix installation of lpsolve.

        * dev300 builds & installs.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/scs-scp2.diff

Modified: trunk/patches/dev300/scs-scp2.diff
==============================================================================
--- trunk/patches/dev300/scs-scp2.diff	(original)
+++ trunk/patches/dev300/scs-scp2.diff	Tue Mar 25 09:35:33 2008
@@ -22,31 +22,12 @@
 diff -u -r1.29 file_calc.scp
 --- scp2/source/calc/file_calc.scp	26 Apr 2006 20:46:56 -0000	1.29
 +++ scp2/source/calc/file_calc.scp	1 Jul 2006 22:41:11 -0000
-@@ -35,6 +35,43 @@
+@@ -35,6 +35,24 @@
  
  #include "macros.inc"
  
 +#ifdef BUILD_SCSOLVER
 +
-+#ifndef SYSTEM_LPSOLVE
-+
-+#ifdef UNX
-+
-+File gid_File_Lib_LpSolve
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+  #ifdef UNX
-+    Name = STRING(CONCAT2(liblpsolve55,UNXSUFFIX));
-+  #else
-+    Name = "lpsolve55.dll";
-+  #endif
-+    Dir = gid_Dir_Program;
-+End
-+
-+#endif
-+
-+#endif
-+
 +File gid_File_Lib_ScSolver
 +    TXT_FILE_BODY;
 +    Styles = (PACKED,UNO_COMPONENT);