ooo-build r11821 - in trunk: . distro-configs patches/src680

[szalaik svn gnome org]

Author: szalaik
Date: Thu Mar  6 11:27:38 2008
New Revision: 11821
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11821&view=rev

Log:
2008-03-06  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/src680/scp2_build_accessories.diff: First aid for OxygenOffice
	build breakage.
	* distro-configs/OxygenOfficeLinux.conf.in:
	* distro-configs/OxygenOfficeWindows.conf.in: Updated OxygenOffice
	configuration

Modified:
   trunk/ChangeLog
   trunk/distro-configs/OxygenOfficeLinux.conf.in
   trunk/distro-configs/OxygenOfficeWindows.conf.in
   trunk/patches/src680/apply
   trunk/patches/src680/scp2_build_accessories.diff

Modified: trunk/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeLinux.conf.in	Thu Mar  6 11:27:38 2008
@@ -1,8 +1,8 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$SRCDIR/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 2.4.0 M7 - OxygenOffice Build 7\"
---enable-binfilter
+--with-build-version=\"OxygenOffice Professional 2.4.0 M9 - OxygenOffice Build 9\"
+--enable-binfiltmer
 --with-vba-package-format=builtin
 --enable-vba
 --enable-build-mozilla
@@ -27,7 +27,6 @@
 --with-extra-font
 --with-extra-accessory
 --with-lang=\"en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv\"
---enable-crashdump=yes
 --enable-opengl
 --enable-dbus
 --enable-gnome-vfs

Modified: trunk/distro-configs/OxygenOfficeWindows.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeWindows.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeWindows.conf.in	Thu Mar  6 11:27:38 2008
@@ -1,18 +1,19 @@
 --with-intro-bitmaps=\"$SRCDIR/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$SRCDIR/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 2.4.0 - OxygenOffice Build 5\"
+--with-build-version=\"OxygenOffice Professional 2.4.0 M9 - OxygenOffice Build 9\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
 --disable-build-mozilla
+--enable-fontooo
+--enable-systray
 --with-extra-gallery
 --with-extra-template
 --with-extra-sample
 --with-extra-font
 --with-extra-accessory
 --with-lang=\"hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv\"
---enable-crashdump
---enable-opengl
 --enable-sdext
---enable-ogltrans
\ No newline at end of file
+--enable-reportdesign
+--enable-cairo

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar  6 11:27:38 2008
@@ -117,10 +117,10 @@
 # Universal Upstream-like packages
 GoOoLinux: NovellBase, Glib2
 # OxygenOffice Professional
-OxygenOfficeLinuxCommon :	Common, FontConfigTemporaryHacks, \
-				FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
-				cairocanvas, msaccess, GnomeVFS, OpenGLTransitions, \
-				Fpickers, Mono, AddressBooks, QuickStarter, UnitTesting
+OxygenOfficeLinuxCommon :	Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
+	      			FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
+	      			cairocanvas, msaccess, OpenGLTransitions, \
+	      			Fpickers, Mono, AddressBooks, QuickStarter
 OxygenOfficeMacOSXCommon :	Common, SystemBits
 OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, NotMacOSX
 

Modified: trunk/patches/src680/scp2_build_accessories.diff
==============================================================================
--- trunk/patches/src680/scp2_build_accessories.diff	(original)
+++ trunk/patches/src680/scp2_build_accessories.diff	Thu Mar  6 11:27:38 2008
@@ -4,6 +4,6 @@
  cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros NULL
  cp    scp2\source\ooo_wo_ure      nmake    -    all    cp_ooo_wo_ure cp_langmacros NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
 +cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure cp_accessories NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure cp_accessories NULL