GNOME.org
 

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

Author: rengelhard
Date: Fri Oct 10 21:44:03 2008
New Revision: 14283
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14283&view=rev

Log:
2008-10-10  Rene Engelhard  <rene debian org>

        * patches/dev300/speed-symbolic-functions.diff,
          patches/dev300/extensions_packinfo.diff,
          patches/dev300/scp2_accessories.diff,
          patches/dev300/apply: revert KAMIs changes from 2008-10-09 since
          they break the extras build


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/apply
   branches/ooo-build-3-0/patches/dev300/extensions_packinfo.diff
   branches/ooo-build-3-0/patches/dev300/scp2_accessories.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	Fri Oct 10 21:44:03 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 M009 (3.0 Betas) - OxygenOffice Build 9\"
+--with-build-version=\"OxygenOffice Professional 2.9.0 M22 (3.0 Betas) - OxygenOffice Build 1\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -28,23 +28,16 @@
 --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	Fri Oct 10 21:44:03 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 M009 (3.0 Betas) - OxygenOffice Build 9\"
+--with-build-version=\"OxygenOffice Professional 2.9.0 M22 (3.0 Betas) - OxygenOffice Build 1\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -15,13 +15,6 @@
 --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\"
---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
+--enable-sdext
+--enable-reportdesign
+--enable-cairo

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Fri Oct 10 21:44:03 2008
@@ -17,7 +17,7 @@
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
 	 CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
-	 FedoraCommonFixes, InternalMesaHeaders, IntegrateExtensions, OxygenOfficeExtrasCommon, LayoutDialogs
+	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs
 
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
@@ -131,9 +131,9 @@
 OxygenOfficeLinuxCommon :	Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
 	      			LinuxOnly, SystemBits, \
 	      			msaccess, OpenGLTransitions, \
-	      			Fpickers, Mono, AddressBooks, QuickStarter, DejaVuFonts
-OxygenOfficeMacOSXCommon :	Common, SystemBits, DejaVuFonts
-OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, DejaVuFonts
+	      			Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions, DejaVuFonts
+OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions, DejaVuFonts
+OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, DejaVuFonts
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
@@ -2364,7 +2364,7 @@
 #Always use default iconset
 always_default_iconset.diff
 
-[ OxygenOfficeExtrasCommon ]
+[ OxygenOfficeExtras ]
 # Adding new items to extras module
 accessories_build.diff
 accessories_target.diff
@@ -2390,8 +2390,6 @@
 extras_solenv.diff
 extras_wizard.diff
 extras_fonts.diff
-
-[ OxygenOfficeExtras ]
 # Add our macros stuffs to wizard module
 premium_macro_build.diff
 premium_macro_dialog.diff

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	Fri Oct 10 21:44:03 2008
@@ -100,7 +100,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")"
@@ -116,7 +116,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")"
@@ -132,7 +132,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")"
@@ -148,7 +148,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")"
@@ -164,7 +164,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/scp2_accessories.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff	Fri Oct 10 21:44:03 2008
@@ -1432,7 +1432,7 @@
 diff -Naur scp2/source/accessories/module_accessories.scp scp2/source/accessories/module_accessories.scp
 --- scp2/source/accessories/module_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_accessories.scp	2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,52 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -1473,11 +1473,8 @@
 +Module gid_Module_Optional_Accessories
 +    ParentID = gid_Module_Optional;
 +    Files = (
-+#ifndef WITHOUT_EXTRA_ACCESSORY
 +        gid_File_Basic_Premium,
-+	 gid_File_Basic_OOoWikipedia
-+#endif
-+  ); 
++	 	 gid_File_Basic_OOoWikipedia  ); 
 +    XPDParentID = "root";
 +    Sortkey = "300";
 +    Minimal = NO;

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	Fri Oct 10 21:44:03 2008
@@ -33,14 +33,14 @@
 --- 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( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
  ToFile( "CXX",               $CXX,               "e" );
  ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
+ ToFile( "MINGWSTRIP",        "@MINGWSTRIP@",     "e" );
 --- solenv/inc/unxlngi6.mk.old	2008-01-28 18:31:50.000000000 +0100
 +++ solenv/inc/unxlngi6.mk	2008-01-28 18:49:03.000000000 +0100
 @@ -157,6 +157,9 @@ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]