ooo-build r15334 - in trunk: . distro-configs patches/dev300

From: szalaik svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15334 - in trunk: . distro-configs patches/dev300
Date: Sat, 14 Feb 2009 13:54:18 +0000 (UTC)
Author: szalaik
Date: Sat Feb 14 13:54:18 2009
New Revision: 15334
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15334&view=rev

Log:
2009-02-14  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/extras_solenv.diff
	* patches/dev300/dejavu-fonts.diff
	* patches/dev300/extensions_configure.diff
	* patches/dev300/extras_configure.diff
	Updated patches to follow to level configure.

	* patches/dev300/helpdocument-menubar.diff
	* patches/dev300/toolbars_sd.diff
	Updated menu patches.

	* distro-configs/OxygenOfficeLinux.conf.in
	* distro-configs/OxygenOfficeWindows.conf.in
	Updated configure to follow changed configure options:
		--enable-minimizer
		--enable-presenter-console
		--enable-pdfimport
		--without-system-poppler
		--enable-wiki-publisher
		--enable-ogltrans
		--enable-report-builder
	For Extension Integration.



Modified:
   trunk/ChangeLog
   trunk/distro-configs/OxygenOfficeLinux.conf.in
   trunk/distro-configs/OxygenOfficeWindows.conf.in
   trunk/patches/dev300/dejavu-fonts.diff
   trunk/patches/dev300/extensions_configure.diff
   trunk/patches/dev300/extras_configure.diff
   trunk/patches/dev300/extras_solenv.diff
   trunk/patches/dev300/helpdocument-menubar.diff
   trunk/patches/dev300/toolbars_sd.diff

Modified: trunk/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeLinux.conf.in	Sat Feb 14 13:54:18 2009
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$TOOLSDIR/src/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$TOOLSDIR/src/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 3.1.0 M035 - OxygenOffice Build 0\"
+--with-build-version=\"OxygenOffice Professional 3.1.0 M001 - OxygenOffice Build 0\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -30,14 +30,17 @@
 --enable-opengl
 --enable-dbus
 --enable-gnome-vfs
---enable-sdext
---enable-ogltrans
 --enable-mono
---enable-reportdesign
+--enable-minimizer
+--enable-presenter-console
+--enable-pdfimport
+--without-system-poppler
+--enable-wiki-publisher
+--enable-ogltrans
+--enable-report-builder
 --enable-neon
 --without-system-stdlibs
 --with-system-nas
 --with-system-freetype
---with-jdk-home=/usr/local/jdk1.5.0_15/
-
+--with-jdk-home=/usr/local/jdk1.6.0_11/
 

Modified: trunk/distro-configs/OxygenOfficeWindows.conf.in
==============================================================================
--- trunk/distro-configs/OxygenOfficeWindows.conf.in	(original)
+++ trunk/distro-configs/OxygenOfficeWindows.conf.in	Sat Feb 14 13:54:18 2009
@@ -1,7 +1,7 @@
 --with-intro-bitmaps=\"$TOOLSDIR/src/openintro_ooop.bmp\"
 --with-about-bitmaps=\"$TOOLSDIR/src/openabout_ooop.bmp\"
 --with-vendor=\"OxygenOffice Professional Team\"
---with-build-version=\"OxygenOffice Professional 3.1.0 M035 - OxygenOffice Build 0\"
+--with-build-version=\"OxygenOffice Professional 3.1.0 M001 - OxygenOffice Build 0\"
 --enable-binfilter
 --with-vba-package-format=builtin
 --enable-vba
@@ -15,6 +15,10 @@
 --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-minimizer
+--enable-presenter-console
+--enable-pdfimport
+--enable-wiki-publisher
+--enable-ogltrans
+--enable-report-builder
 --enable-cairo

Modified: trunk/patches/dev300/dejavu-fonts.diff
==============================================================================
--- trunk/patches/dev300/dejavu-fonts.diff	(original)
+++ trunk/patches/dev300/dejavu-fonts.diff	Sat Feb 14 13:54:18 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.OLD	2005-11-21 02:16:33.437250000 +0200
-+++ config_office/configure.in	2005-11-23 05:12:58.296875000 +0200
+--- configure.in.OLD	2005-11-21 02:16:33.437250000 +0200
++++ configure.in	2005-11-23 05:12:58.296875000 +0200
 @@ -52,6 +52,11 @@
                            for specific distributions where the fonts are known 
                            to be already available

Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff	(original)
+++ trunk/patches/dev300/extensions_configure.diff	Sat Feb 14 13:54:18 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.original	2008-05-30 10:58:01.000000000 +0200
-+++ config_office/configure.in	2008-05-30 11:03:00.000000000 +0200
+--- configure.in.original	2008-05-30 10:58:01.000000000 +0200
++++ configure.in	2008-05-30 11:03:00.000000000 +0200
 @@ -69,6 +69,13 @@
                            binary for your platform, to build without this
                            version, use this option.
@@ -54,11 +54,11 @@
 @@ -5663,6 +5663,7 @@
  else
    AC_MSG_RESULT([no])
-   ENABLE_REPORTDESIGN=NO
+   ENABLE_REPORTBUILDER=NO
 +  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
    SYSTEM_JFREEREPORT=NO
  fi
- AC_SUBST(ENABLE_REPORTDESIGN)
+ AC_SUBST(ENABLE_REPORTBUILDER)
 @@ -6055,6 +6068,52 @@
  fi
  

Modified: trunk/patches/dev300/extras_configure.diff
==============================================================================
--- trunk/patches/dev300/extras_configure.diff	(original)
+++ trunk/patches/dev300/extras_configure.diff	Sat Feb 14 13:54:18 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in.org	2007-11-17 16:00:31.000000000 +0100
-+++ config_office/configure.in	2007-12-24 13:26:16.000000000 +0100
+--- configure.in.org	2007-11-17 16:00:31.000000000 +0100
++++ configure.in	2007-12-24 13:26:16.000000000 +0100
 @@ -681,6 +681,26 @@
  			  Microsystems' template packages relesead to Extensions site.],
  ,)

Modified: trunk/patches/dev300/extras_solenv.diff
==============================================================================
--- trunk/patches/dev300/extras_solenv.diff	(original)
+++ trunk/patches/dev300/extras_solenv.diff	Sat Feb 14 13:54:18 2009
@@ -1,5 +1,5 @@
---- config_office/set_soenv.in.orig	2007-12-24 14:28:24.000000000 +0100
-+++ config_office/set_soenv.in	2007-12-24 15:12:17.000000000 +0100
+--- set_soenv.in.orig	2007-12-24 14:28:24.000000000 +0100
++++ set_soenv.in	2007-12-24 15:12:17.000000000 +0100
 @@ -2004,6 +2005,11 @@
  ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
  ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );

Modified: trunk/patches/dev300/helpdocument-menubar.diff
==============================================================================
--- trunk/patches/dev300/helpdocument-menubar.diff	(original)
+++ trunk/patches/dev300/helpdocument-menubar.diff	Sat Feb 14 13:54:18 2009
@@ -132,7 +132,7 @@
 +			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+                        <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
++                       <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
@@ -150,7 +150,7 @@
 +			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+                        <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
++                       <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
@@ -176,50 +176,50 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- sd/uiconfig/sdraw/menubar/menubar.xml.orig	2007-08-10 19:15:56.000000000 +0200
-+++ sd/uiconfig/sdraw/menubar/menubar.xml	2007-09-12 15:16:03.880094800 +0200
-@@ -314,12 +314,19 @@
- 	<menu:menu menu:id=".uno:HelpMenu">
- 		<menu:menupopup>
- 			<menu:menuitem menu:id=".uno:HelpIndex"/>
-+			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+--- sd/uiconfig/sdraw/menubar/menubar.xml.orig	2009-02-12 14:52:42.000000000 +0100
++++ sd/uiconfig/sdraw/menubar/menubar.xml	2009-02-14 07:08:14.000000000 +0100
+@@ -315,10 +315,16 @@
+ 	</menu:menu>
+ 	<menu:menu menu:id=".uno:HelpMenu">
+ 		<menu:menupopup>
+-			<menu:menuitem menu:id=".uno:HelpIndex"/>
+-			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
++			<menu:menuitem menu:id=".uno:HelpIndex"/>
+ 			<menu:menuseparator/>
+-			<menu:menuitem menu:id=".uno:HelpSupport"/>
++			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
 +			<menu:menuitem menu:id=".uno:HelpTip"/>
 +			<menu:menuitem menu:id=".uno:ActiveHelp"/>
 +			<menu:menuseparator/>
-+			<menu:menuitem menu:id=".uno:HelperDialog"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+                        <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
++			<menu:menuitem menu:id=".uno:HelperDialog"/>
++			<menu:menuseparator/>
++			<menu:menuitem menu:id=".uno:HelpSupport"/>
++                        <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
+ 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
- 	</menu:menu>
- </menu:menubar>
-+
---- sd/uiconfig/simpress/menubar/menubar.xml.orig	2007-08-10 19:15:57.000000000 +0200
-+++ sd/uiconfig/simpress/menubar/menubar.xml	2007-09-12 15:16:03.911345200 +0200
-@@ -289,12 +289,19 @@
- 	<menu:menu menu:id=".uno:HelpMenu">
- 		<menu:menupopup>
- 			<menu:menuitem menu:id=".uno:HelpIndex"/>
-+			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+--- sd/uiconfig/simpress/menubar/menubar.xml.orig	2009-02-12 14:52:42.000000000 +0100
++++ sd/uiconfig/simpress/menubar/menubar.xml	2009-02-14 07:04:07.000000000 +0100
+@@ -290,10 +290,16 @@
+ 	</menu:menu>
+ 	<menu:menu menu:id=".uno:HelpMenu">
+ 		<menu:menupopup>
+-			<menu:menuitem menu:id=".uno:HelpIndex"/>
+-			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
++			<menu:menuitem menu:id=".uno:HelpIndex"/>
+ 			<menu:menuseparator/>
+-			<menu:menuitem menu:id=".uno:HelpSupport"/>
++			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
 +			<menu:menuitem menu:id=".uno:HelpTip"/>
 +			<menu:menuitem menu:id=".uno:ActiveHelp"/>
 +			<menu:menuseparator/>
-+			<menu:menuitem menu:id=".uno:HelperDialog"/>
- 			<menu:menuseparator/>
- 			<menu:menuitem menu:id=".uno:HelpSupport"/>
-+                        <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- 			<menu:menuseparator/>
++			<menu:menuitem menu:id=".uno:HelperDialog"/>
++			<menu:menuseparator/>
++			<menu:menuitem menu:id=".uno:HelpSupport"/>
++                        <menu:menuitem menu:id="macro:///Premium.OOoHelpDocumentation.OpenHelpDocument"/>
+ 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
+ 			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
- 		</menu:menupopup>
- 	</menu:menu>
- </menu:menubar>
-+
 --- dbaccess/uiconfig/dbapp/menubar/menubar.xml.orig	2007-08-10 19:07:22.000000000 +0200
 +++ dbaccess/uiconfig/dbapp/menubar/menubar.xml	2007-09-13 07:20:13.662533900 +0200
 @@ -138,6 +138,7 @@

Modified: trunk/patches/dev300/toolbars_sd.diff
==============================================================================
--- trunk/patches/dev300/toolbars_sd.diff	(original)
+++ trunk/patches/dev300/toolbars_sd.diff	Sat Feb 14 13:54:18 2009
@@ -106,17 +106,19 @@
 + <toolbar:toolbaritem xlink:href=".uno:OutlineRight" toolbar:helpid="10153"/>
 + <toolbar:toolbaritem xlink:href=".uno:OutlineUp" toolbar:helpid="10150"/>
 + <toolbar:toolbaritem xlink:href=".uno:OutlineDown" toolbar:helpid="10151"/>
+  <toolbar:toolbaritem xlink:href=".uno:Grow" toolbar:helpid="helpid:20403"/>
+  <toolbar:toolbaritem xlink:href=".uno:Shrink" toolbar:helpid="helpid:20404"/>
   <toolbar:toolbarseparator/>
-  <toolbar:toolbaritem xlink:href=".uno:TextdirectionLeftToRight" toolbar:helpid="10907"/>
-  <toolbar:toolbaritem xlink:href=".uno:TextdirectionTopToBottom" toolbar:helpid="10908"/>
-@@ -34,5 +38,5 @@
+@@ -36,5 +36,6 @@
   <toolbar:toolbaritem xlink:href=".uno:ParagraphDialog" toolbar:helpid="10297"/>
   <toolbar:toolbarseparator/>
   <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/>
 - <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:visible="false" toolbar:helpid="27019"/>
-+ <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:helpid="27019"/>
- </toolbar:toolbar>
+-</toolbar:toolbar>
 \ Nincs Ãjsor a fÃjl vÃgÃn
++ <toolbar:toolbaritem xlink:href=".uno:Bullet" toolbar:helpid="27019"/>
++</toolbar:toolbar>
++
 diff -Naur sd.old/uiconfig/sdraw/toolbar/toolbar.xml sd/uiconfig/sdraw/toolbar/toolbar.xml
 --- sd.old/uiconfig/sdraw/toolbar/toolbar.xml	2008-04-07 13:34:28.000000000 +0200
 +++ sd/uiconfig/sdraw/toolbar/toolbar.xml	2008-04-10 09:26:19.000000000 +0200
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]