ooo-build r13514 - in trunk: . bin patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Aug 11 17:01:11 2008
New Revision: 13514
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13514&view=rev

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

	* configure.in: added --disable-scsolver since we need this for Solaris
	build.	
	
	* bin/unpack:
	* download.in: scsolver is now a downloadable package.
	
	* patches/dev300/apply: apply the scsolver-* patches.


Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/configure.in
   trunk/download.in
   trunk/patches/dev300/apply

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Mon Aug 11 17:01:11 2008
@@ -587,6 +587,11 @@
   tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
 fi
 
+# Calc Solver
+SCSOLVER_PACKAGE=scsolver.2008-08-11.tar.bz2
+check_tarball $SRCDIR/$SCSOLVER_PACKAGE
+tar xfj $SRCDIR/$SCSOLVER_PACKAGE -C $OOBUILDDIR
+
 # OxygenOffice extras
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_tarball $SRCDIR/$pack

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug 11 17:01:11 2008
@@ -127,6 +127,10 @@
 [  --disable-mediawiki    disables the build of the MediaWiki Editor extension
 ],,)
 
+AC_ARG_ENABLE(scsolver,
+[  --disable-scsolver     disables the Calc Solver extension.
+],,)
+
 AC_ARG_ENABLE(mono,
 [  --enable-mono           Enables the compilation of the Mono bindings
 ],,)
@@ -1047,6 +1051,16 @@
 fi
 AC_SUBST(ENABLE_MEDIAWIKI)
 
+AC_MSG_CHECKING([whether to enable the Calc Solver extension])
+if test "$enable_mediawiki" != "no" ; then
+    ENABLE_SCSOLVER=YES
+    AC_MSG_RESULT([yes])
+else
+    ENABLE_SCSOLVER=NO
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_SCSOLVER)
+
 # FIXME: ugly hack to apply a Linux and Win32 specific variants of a patch for swext sources
 if test "$ENABLE_MEDIAWIKI" = "YES" ; then
     if test "$BUILD_WIN32" = "yes" ; then

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Mon Aug 11 17:01:11 2008
@@ -52,6 +52,7 @@
     'biblio.*'				 => '@MIRROR@/SRC680',
 # CalcSolver bits
     'lp_solve_.*'			 => '@MIRROR@/SRC680',
+    'scsolver.*.tar.bz2'                 => '@MIRROR@/DEV300',
 # Graphite rendering bits
     'silgraphite-.*'                     => '@MIRROR@/SRC680',
 # Prebuilt dictionaries for Novell Windows builds
@@ -315,7 +316,7 @@
 }
 
 if ('true' ne '') {
-   push @files, ( 'lp_solve_5.5.0.10_source.tar.gz' );
+   push @files, ( 'scsolver.2008-08-11.tar.bz2' );
 }
 
 if ('@SYSTEM_LIBWPD@' eq 'NO') {

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 11 17:01:11 2008
@@ -5,7 +5,7 @@
 
 # -------- Options --------
 
-PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting
+PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../scsolver
 
 OLDEST_SUPPORTED=dev300-m28 ooo300-m0
 
@@ -17,7 +17,7 @@
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
-	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs
+	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, CalcSolver
 
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
@@ -1628,6 +1628,15 @@
 # to xls.
 chart-subtitle-xls-export.diff, i#92357, kohei
 
+[ CalcSolver ]
+SectionOwner => kohei
+
+scsolver-config-option.diff
+scsolver-lpsolve.diff      
+scsolver-sc-build-lst.diff 
+scsolver-scp2.diff         
+scsolver-setup_native.diff 
+
 #[ OOXSTLport5 ]
 #
 ## oox devs, please reconsider operator[] use,