ooo-build r14263 - in branches/ooo-build-3-0: . distro-configs patches/dev300



Author: szalaik
Date: Thu Oct  9 11:40:07 2008
New Revision: 14263
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14263&view=rev

Log:
2008-10-09  Kalman Szalai - KAMI <kamihir freemail hu> 

	* patches/dev300/speed-symbolic-functions.diff:
	Fixing patching problem.
	* patches/dev300/extensions_packinfo.diff:
	Packinfo update.
	* distro-configs/OxygenOfficeLinux.conf.in
	* distro-configs/OxygenOfficeWindows.conf.in:
	Configure bits.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in
   branches/ooo-build-3-0/distro-configs/OxygenOfficeWindows.conf.in
   branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff
   branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff

Modified: branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in	Thu Oct  9 11:40:07 2008
@@ -1,7 +1,7 @@
 --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.9.0 M22 (3.0 Betas) - OxygenOffice Build 1\"
+--with-build-version=\"OxygenOffice Professional 2.9.0 M009 (3.0 Betas) - OxygenOffice Build 9\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -28,16 +28,23 @@
 --with-extra-accessory
 --with-lang=\"en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko\"
 --enable-opengl
+--enable-ogltrans
 --enable-dbus
 --enable-gnome-vfs
---enable-sdext
---enable-ogltrans
 --enable-mono
---enable-reportdesign
 --enable-neon
 --without-system-stdlibs
 --with-system-nas
 --with-system-freetype
 --with-jdk-home=/usr/local/jdk1.5.0_15/
-
+--with-extensions 
+--with-extension-integration
+--enable-minimizer 
+--enable-presenter-console 
+--enable-pdfimport
+--without-system-poppler
+--enable-wiki-publisher 
+--enable-report-builder
+--with-sun-templates
+--with-linker-hash-style=both
 

Modified: branches/ooo-build-3-0/distro-configs/OxygenOfficeWindows.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/OxygenOfficeWindows.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/OxygenOfficeWindows.conf.in	Thu Oct  9 11:40:07 2008
@@ -1,7 +1,7 @@
 --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.9.0 M22 (3.0 Betas) - OxygenOffice Build 1\"
+--with-build-version=\"OxygenOffice Professional 2.9.0 M009 (3.0 Betas) - OxygenOffice Build 9\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -15,6 +15,13 @@
 --with-extra-font
 --with-extra-accessory
 --with-lang=\"hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko\"
---enable-sdext
---enable-reportdesign
---enable-cairo
+--disable-cairo
+--with-extensions 
+--with-extension-integration
+--enable-minimizer 
+--enable-presenter-console 
+--enable-pdfimport
+--without-system-poppler
+--enable-wiki-publisher 
+--enable-report-builder
+--with-sun-templates

Modified: branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff	Thu Oct  9 11:40:07 2008
@@ -84,7 +84,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_en-US"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_en-US"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-en-US"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
@@ -100,7 +100,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_de"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_de"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-de"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
@@ -116,7 +116,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_it"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_it"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-it"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
@@ -132,7 +132,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_fr"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_fr"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-fr"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
@@ -148,7 +148,7 @@
 +End
 +
 +Start
-+module = "gid_Module_Optional_Extensions_SUN_Template_Pack_es"
++module = "gid_Module_Optional_Extensions_Sun_Template_Pack_es"
 +script = "shellscripts_extensions.txt"
 +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-sun-templates-pack-es"
 +solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"

Modified: branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/speed-symbolic-functions.diff	Thu Oct  9 11:40:07 2008
@@ -33,9 +33,9 @@
 --- config_office/set_soenv.in.old	2008-01-28 17:13:14.000000000 +0100
 +++ config_office/set_soenv.in	2008-01-28 18:47:05.000000000 +0100
 @@ -1924,6 +1924,8 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
+ ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
  		"@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
- ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
 +ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
 +		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
  ToFile( "CXX",               $CXX,               "e" );



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]