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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Apr 22 23:22:56 2008
New Revision: 12297
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12297&view=rev

Log:
2008-04-22  Kohei Yoshida  <kyoshida novell com>

	* bin/unpack:
	* patches/dev300/apply: disabled CalcSolver entirely from the build.


Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/patches/dev300/apply

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Apr 22 23:22:56 2008
@@ -473,8 +473,8 @@
 $GNUCP -f $TOOLSDIR/src/icons/*.png $OOBUILDDIR/default_images/res/commandimagelist/ || exit 1
 $GNUCP -f $TOOLSDIR/src/icons/tango/*.png $OOBUILDDIR/ooo_custom_images/tango/res/commandimagelist/ || exit 1
 
-echo "Copying scsolver directory into the tree"
-$GNUCP -Rf $TOOLSDIR/scratch/scsolver $OOBUILDDIR/ || exit 1
+#echo "Copying scsolver directory into the tree"
+#$GNUCP -Rf $TOOLSDIR/scratch/scsolver $OOBUILDDIR/ || exit 1
 
-echo "Copying lpsolve directory into the tree"
-$GNUCP -Rf $TOOLSDIR/scratch/lpsolve $OOBUILDDIR/ || exit 1
+#echo "Copying lpsolve directory into the tree"
+#$GNUCP -Rf $TOOLSDIR/scratch/lpsolve $OOBUILDDIR/ || exit 1

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 22 23:22:56 2008
@@ -40,7 +40,7 @@
 Localize : LocalizeLayout
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
-	     NotDebian, Lockdown, CalcSolver, Split, Shrink, \
+	     NotDebian, Lockdown, Split, Shrink, \
 	     CustomUserConfig
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
@@ -52,7 +52,7 @@
 SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
-DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, CalcSolver, BerkeleyDB43, Split, PostgreSQL
+DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
 Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, Gcc43
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
@@ -77,24 +77,24 @@
 # Ark Linux
 Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, Gcc43
 # www.pld-linux.org
-PLDBase: LinuxCommon, NotDebian, CalcSolver, CairoFonts, PLDOnly
+PLDBase: LinuxCommon, NotDebian, CairoFonts, PLDOnly
 PLD: PLDBase
 PLD64: PLDBase
 # Mandriva Linux
-MandrivaBase: CairoFonts, MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown, CalcSolver, Split, NotDebian
+MandrivaBase: CairoFonts, MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown, Split, NotDebian
 Mandriva: MandrivaBase
 Mandriva64: MandrivaBase
 # Frugalware Linux
-Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, CalcSolver, Gcc43
+Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian, FrugalwareOnly, Gcc43
 # openmamba
 openmamba: LinuxCommon, GlobalDesktopFiles
 #Gentoo
-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, Gcc43
+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43
 GentooUnstable: GentooBase, GentooExperimental
 Gentoo : GentooBase
 Gentoo64: GentooBase
 # rPath Linux
-rPathCommon: LinuxCommon, NotDebian, CalcSolver, Lockdown, BerkeleyDB43, CairoFonts
+rPathCommon: LinuxCommon, NotDebian, Lockdown, BerkeleyDB43, CairoFonts
 rpl2: rPathCommon
 rpl2-64: rPathCommon
 # Win32
@@ -102,17 +102,17 @@
 # translate.org.za
 translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
 translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas, Fpickers, CustomUserConfig
+NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, cairocanvas, Fpickers, CustomUserConfig
 # Novell
 NovellWin32: NovellLikeWin32
 NovellWin32ISO: NovellLikeWin32
 # go-oo.org Win32
 GoOoWin32: NovellLikeWin32
 # Mac OS X
-MacOSX : MacOSXCommon, CalcSolver, MacOSXOnly
+MacOSX : MacOSXCommon, MacOSXOnly
 # Pardus
-Pardus2007: PardusOnly, LinuxCommon, NotDebian, CalcSolver
-Pardus2008: PardusOnly, LinuxCommon, NotDebian, CalcSolver, Gcc43
+Pardus2007: PardusOnly, LinuxCommon, NotDebian
+Pardus2008: PardusOnly, LinuxCommon, NotDebian, Gcc43
 # Solaris
 Solaris: NovellBase
 # Universal Upstream-like packages
@@ -125,8 +125,8 @@
 OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions
 OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions
 
-OxygenOfficeLinux:	OxygenOfficeLinuxCommon, CalcSolver, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
-OxygenOfficeWindows:	OxygenOfficeWin32Common, CalcSolver, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
+OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
+OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
 
 
@@ -160,8 +160,8 @@
 testtool-more-defaults.diff, martink
 
 #Fix plus/minus in to each heading in Navigator
-plus-minus-sw-navigator.diff, i#64886, n#129410, jianhua
-plus-minus-sw-navigator2.diff, i#64886, n#129410, jianhua
+#plus-minus-sw-navigator.diff, i#64886, n#129410, jianhua
+#plus-minus-sw-navigator2.diff, i#64886, n#129410, jianhua
 
 #set default varchar lenght to 100.
 dbaccess-default-varchar-lenght.diff, i#62664, jianhua
@@ -1510,31 +1510,31 @@
 #system-stlport51.diff, i#79876
 
 
-[ CalcSolver ]
-SectionOwner => kyoshida
-SectionIssue => i#8808
-
-# add lpsolve linker flag to libs.mk
-solenv-inc-libs-mk.diff
-
-# add scsolver to the dep chain for sc
-scs-sc-build.diff
-
-# needs more boost headers
-scs-boost.diff
-
-# configure check for system-lpsolve
-system-lpsolve-config_office.diff
-
-# setup protocol handler (urgh) and add menu bar item, and install the component.
-scs-officecfg.diff
-scs-scp2.diff
-scs-sc-menubar.diff
-scs-officecfg-calc.diff
-
-# package scsolver as a default uno extension (not working ATM).
-#scsolver-uno-extension.diff
-#scsolver-enable-extension.diff
+#[ CalcSolver ]
+#SectionOwner => kyoshida
+#SectionIssue => i#8808
+#
+## add lpsolve linker flag to libs.mk
+#solenv-inc-libs-mk.diff
+#
+## add scsolver to the dep chain for sc
+#scs-sc-build.diff
+#
+## needs more boost headers
+#scs-boost.diff
+#
+## configure check for system-lpsolve
+#system-lpsolve-config_office.diff
+#
+## setup protocol handler (urgh) and add menu bar item, and install the component.
+#scs-officecfg.diff
+#scs-scp2.diff
+#scs-sc-menubar.diff
+#scs-officecfg-calc.diff
+#
+## package scsolver as a default uno extension (not working ATM).
+##scsolver-uno-extension.diff
+##scsolver-enable-extension.diff
 
 
 [ OOXML ]