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

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r11768 - in trunk: . distro-configs patches/src680
Date: Sun, 2 Mar 2008 10:28:42 +0000 (GMT)
Author: rengelhard
Date: Sun Mar  2 10:28:42 2008
New Revision: 11768
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11768&view=rev

Log:
2008-03-01  Chris Cheney <ccheney ubuntu com>

        * configure.in: Add support for Ubuntu Hardy.

        * distro-configs/UbuntuHardy.conf.in: Added for Ubuntu Hardy.

        * distro-configs/UbuntuHardy64.conf.in: Added for Ubuntu Hardy.

        * patches/src680/apply: Update for Ubuntu Hardy and xulrunner
          patch.

        * patches/src680/ubuntu-lpi.diff: Updated for 2.4.

        * patches/src680/ubuntu-xulrunner-1.9.diff: Add support for
          xulrunner 1.9.



Added:
   trunk/distro-configs/UbuntuHardy.conf.in
   trunk/distro-configs/UbuntuHardy64.conf.in
   trunk/patches/src680/ubuntu-xulrunner-1.9.diff
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/src680/apply
   trunk/patches/src680/ubuntu-lpi.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Mar  2 10:28:42 2008
@@ -1158,6 +1158,8 @@
 distro-configs/UbuntuFeisty64.conf
 distro-configs/UbuntuGutsy.conf
 distro-configs/UbuntuGutsy64.conf
+distro-configs/UbuntuHardy.conf
+distro-configs/UbuntuHardy64.conf
 distro-configs/SUSE.conf
 distro-configs/SUSE-reduced.conf
 distro-configs/SUSE-9.1.conf

Added: trunk/distro-configs/UbuntuHardy.conf.in
==============================================================================
--- (empty file)
+++ trunk/distro-configs/UbuntuHardy.conf.in	Sun Mar  2 10:28:42 2008
@@ -0,0 +1,19 @@
+--with-vendor=\"Ubuntu\"
+--without-myspell-dicts
+--enable-libsn
+--disable-fontooo
+--with-system-expat
+--with-system-odbc-headers
+--without-nas
+--with-system-curl
+--with-system-sane-header
+--with-system-xrender-headers
+--enable-gnome-vfs
+--enable-pasf
+--with-system-sndfile
+--enable-symbols
+--with-system-db
+--enable-crypt-link
+--enable-pam-link
+--with-dynamic-xinerama
+--enable-xsltproc

Added: trunk/distro-configs/UbuntuHardy64.conf.in
==============================================================================
--- (empty file)
+++ trunk/distro-configs/UbuntuHardy64.conf.in	Sun Mar  2 10:28:42 2008
@@ -0,0 +1,19 @@
+--with-vendor=\"Ubuntu\"
+--without-myspell-dicts
+--enable-libsn
+--disable-fontooo
+--with-system-expat
+--with-system-odbc-headers
+--without-nas
+--with-system-curl
+--with-system-sane-header
+--with-system-xrender-headers
+--enable-gnome-vfs
+--enable-pasf
+--with-system-sndfile
+--enable-symbols
+--with-system-db
+--enable-crypt-link
+--enable-pam-link
+--with-dynamic-xinerama
+--enable-xsltproc

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Sun Mar  2 10:28:42 2008
@@ -64,6 +64,8 @@
 UbuntuFeisty64 : UbuntuBased, CairoFonts, UbuntuFeistyOnly
 UbuntuGutsy : UbuntuBased, CairoFonts, UbuntuGutsyOnly, Debian32Only
 UbuntuGutsy64 : UbuntuBased, CairoFonts, UbuntuGutsyOnly
+UbuntuHardy : UbuntuBased, CairoFonts, UbuntuHardyOnly, Debian32Only
+UbuntuHardy64 : UbuntuBased, CairoFonts, UbuntuHardyOnly
 UbuntuL10n : UbuntuBased, UbuntuL10nOnly, Debian32Only
 # a copy of the UbuntuDapper* lines ("Ubuntu: UbuntuDapper" doesn't work)
 Ubuntu : UbuntuBased, UbuntuDapperOnly,  Debian32Only
@@ -1816,6 +1818,14 @@
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
 
+[ UbuntuHardyOnly ]
+static-libs-use-_pic.diff, rengelha
+unxlngi6-notune.diff, doko
+ubuntu-no-stack-protector.diff, doko
+# link dynamically with liblpsolve55.so
+system-lpsolve-rpath.diff, rengelha
+#gccXXXXX.solenv.javaregistration.diff
+ubuntu-xulrunner-1.9.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff

Modified: trunk/patches/src680/ubuntu-lpi.diff
==============================================================================
--- trunk/patches/src680/ubuntu-lpi.diff	(original)
+++ trunk/patches/src680/ubuntu-lpi.diff	Sun Mar  2 10:28:42 2008
@@ -1,5 +1,6 @@
---- basctl/uiconfig/basicide/menubar/menubar.xml.old	2007-08-07 00:50:32.000000000 -0500
-+++ basctl/uiconfig/basicide/menubar/menubar.xml	2007-08-07 00:50:43.000000000 -0500
+diff -Nrua basctl/uiconfig/basicide/menubar/menubar.xml OOH680_m8.new/basctl/uiconfig/basicide/menubar/menubar.xml
+--- basctl/uiconfig/basicide/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ OOH680_m8.new/basctl/uiconfig/basicide/menubar/menubar.xml	2008-03-01 17:06:11.000000000 -0600
 @@ -82,6 +82,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -9,8 +10,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- chart2/uiconfig/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ chart2/uiconfig/menubar/menubar.xml	2007-08-07 00:51:38.000000000 -0500
+diff -Nrua chart2/uiconfig/menubar/menubar.xml OOH680_m8.new/chart2/uiconfig/menubar/menubar.xml
+--- chart2/uiconfig/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ OOH680_m8.new/chart2/uiconfig/menubar/menubar.xml	2008-03-01 17:06:52.000000000 -0600
 @@ -143,8 +143,10 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -24,8 +26,9 @@
 -</menu:menubar>
 \ No newline at end of file
 +</menu:menubar>
---- dbaccess/uiconfig/dbapp/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ dbaccess/uiconfig/dbapp/menubar/menubar.xml	2007-08-07 00:52:47.000000000 -0500
+diff -Nrua dbaccess/uiconfig/dbapp/menubar/menubar.xml OOH680_m8.new/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ OOH680_m8.new/dbaccess/uiconfig/dbapp/menubar/menubar.xml	2008-03-01 17:10:23.000000000 -0600
 @@ -138,6 +138,8 @@
  			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
@@ -35,8 +38,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- dbaccess/uiconfig/dbbrowser/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ dbaccess/uiconfig/dbbrowser/menubar/menubar.xml	2007-08-07 00:53:38.000000000 -0500
+diff -Nrua dbaccess/uiconfig/dbbrowser/menubar/menubar.xml OOH680_m8.new/dbaccess/uiconfig/dbbrowser/menubar/menubar.xml
+--- dbaccess/uiconfig/dbbrowser/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ OOH680_m8.new/dbaccess/uiconfig/dbbrowser/menubar/menubar.xml	2008-03-01 17:11:44.000000000 -0600
 @@ -66,6 +66,8 @@
  			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
@@ -46,8 +50,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- dbaccess/uiconfig/dbquery/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ dbaccess/uiconfig/dbquery/menubar/menubar.xml	2007-08-07 00:54:31.000000000 -0500
+diff -Nrua dbaccess/uiconfig/dbquery/menubar/menubar.xml OOH680_m8.new/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ OOH680_m8.new/dbaccess/uiconfig/dbquery/menubar/menubar.xml	2008-03-01 17:12:34.000000000 -0600
 @@ -80,6 +80,8 @@
  			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
@@ -57,8 +62,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- dbaccess/uiconfig/dbrelation/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml	2007-08-07 00:55:21.000000000 -0500
+diff -Nrua dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml	2008-03-01 17:16:03.000000000 -0600
 @@ -63,6 +63,8 @@
  			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
@@ -68,8 +74,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml.old	2006-04-26 15:52:52.000000000 -0500
-+++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml	2007-08-06 22:05:49.000000000 -0500
+diff -Nrua extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
+--- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml	2006-04-26 15:52:52.000000000 -0500
++++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml	2008-03-01 17:16:43.000000000 -0600
 @@ -85,6 +85,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -79,8 +86,9 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- framework/uiconfig/startmodule/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ framework/uiconfig/startmodule/menubar/menubar.xml	2007-08-07 00:57:50.000000000 -0500
+diff -Nrua framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
+--- framework/uiconfig/startmodule/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ framework/uiconfig/startmodule/menubar/menubar.xml	2008-03-01 18:12:16.000000000 -0600
 @@ -75,6 +75,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -90,64 +98,80 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- helpcontent2/helpers/help_hid.lst.old	2007-04-02 09:47:16.000000000 -0500
-+++ helpcontent2/helpers/help_hid.lst	2007-08-06 22:09:15.000000000 -0500
-@@ -5149,6 +5149,8 @@
+diff -Nrua helpcontent2/helpers/help_hid.lst helpcontent2/helpers/help_hid.lst
+--- helpcontent2/helpers/help_hid.lst	2007-11-23 10:10:59.000000000 -0600
++++ helpcontent2/helpers/help_hid.lst	2008-03-01 18:22:25.000000000 -0600
+@@ -5225,8 +5225,10 @@
+ SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
+ SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
  SID_HELP_PI,5962,.uno:HelperDialog
++SID_HELP_REPORTBUG,6712,.uno:HelpReportBug
  SID_HELP_SEARCH,5412,.uno:HelpSearch
  SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
 +SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
-+SID_HELP_REPORTBUG,6712,.uno:HelpReportBug
  SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
  SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
---- helpcontent2/helpers/longnames_commands.csv.old	2005-01-27 08:51:42.000000000 -0600
-+++ helpcontent2/helpers/longnames_commands.csv	2007-08-06 22:10:32.000000000 -0500
-@@ -1246,6 +1246,8 @@
+diff -Nrua helpcontent2/helpers/longnames_commands.csv helpcontent2/helpers/longnames_commands.csv
+--- helpcontent2/helpers/longnames_commands.csv	2005-01-27 08:51:42.000000000 -0600
++++ helpcontent2/helpers/longnames_commands.csv	2008-03-01 18:23:28.000000000 -0600
+@@ -1244,8 +1244,10 @@
+ SID_HELP_DOWNLOAD,.uno:HelpDownload
+ SID_HELP_HELPFILEBOX,.uno:HelpChooseFile
  SID_HELP_PI,.uno:HelperDialog
++SID_HELP_REPORTBUG,.uno:HelpReportBug
  SID_HELP_SEARCH,.uno:HelpSearch
  SID_HELP_SUPPORTPAGE,.uno:HelpSupport
 +SID_HELP_TRANSLATEPAGE,.uno:HelpTranslate
-+SID_HELP_REPORTBUG,.uno:HelpReportBug
  SID_HELP_TUTORIALS,.uno:HelpTutorials
  SID_HELP_ZOOMIN,.uno:HelpZoomIn
  SID_HELP_ZOOMOUT,.uno:HelpZoomOut
---- helpcontent2/helpers/uno_hid.lst.old	2005-03-08 08:13:24.000000000 -0600
-+++ helpcontent2/helpers/uno_hid.lst	2007-08-06 22:12:18.000000000 -0500
-@@ -1244,6 +1244,8 @@
- SID_HELP_PI,5962,.uno:HelperDialog
- SID_HELP_SEARCH,5412,.uno:HelpSearch
- SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
-+SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
-+SID_HELP_REPORTBUG,6712,.uno:HelpReportBug
- SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
- SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
- SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
---- helpcontent2/helpers/uno-commands.csv.old	2005-01-27 08:52:05.000000000 -0600
-+++ helpcontent2/helpers/uno-commands.csv	2007-08-06 22:14:37.000000000 -0500
-@@ -868,6 +868,8 @@
- .uno:HelpOnHelp
- .uno:HelpSupport
- .uno:HelpTip
-+.uno:HelpTranslate
-+.uno:HelpReportBug
- .uno:HelperDialog
- .uno:HelplinesFront
- .uno:HelplinesMove
---- helpcontent2/helpers/unocmds.txt.old	2005-03-08 08:13:36.000000000 -0600
-+++ helpcontent2/helpers/unocmds.txt	2007-08-06 22:16:01.000000000 -0500
-@@ -492,6 +492,8 @@
+diff -Nrua helpcontent2/helpers/unocmds.txt helpcontent2/helpers/unocmds.txt
+--- helpcontent2/helpers/unocmds.txt	2005-03-08 08:13:36.000000000 -0600
++++ helpcontent2/helpers/unocmds.txt	2008-03-01 18:24:50.000000000 -0600
+@@ -490,8 +490,10 @@
+ .uno:HelpIndex;shared/main0108.xhp
+ .uno:HelpMenu;shared/main0108.xhp
  .uno:HelpOnHelp;shared/05/00000110.xhp
++.uno:HelpReportBug;shared/main0108.xhp
  .uno:HelpSupport;shared/main0108.xhp
  .uno:HelpTip;shared/00/00000099.xhp
 +.uno:HelpTranslate;shared/main0108.xhp
-+.uno:HelpReportBug;shared/main0108.xhp
  .uno:HelperDialog;shared/00/00000099.xhp
  .uno:HelplinesFront;shared/optionen/01050100.xhp
  .uno:HelplinesMove;shared/02/01171400.xhp
---- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu.old	2007-07-06 07:26:47.000000000 -0500
-+++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	2007-08-06 22:21:02.000000000 -0500
-@@ -4053,7 +4053,20 @@
+diff -Nrua helpcontent2/helpers/uno-commands.csv helpcontent2/helpers/uno-commands.csv
+--- helpcontent2/helpers/uno-commands.csv	2005-01-27 08:52:05.000000000 -0600
++++ helpcontent2/helpers/uno-commands.csv	2008-03-01 18:25:54.000000000 -0600
+@@ -866,8 +866,10 @@
+ .uno:HelpIndex
+ .uno:HelpMenu
+ .uno:HelpOnHelp
++.uno:HelpReportBug
+ .uno:HelpSupport
+ .uno:HelpTip
++.uno:HelpTranslate
+ .uno:HelperDialog
+ .uno:HelplinesFront
+ .uno:HelplinesMove
+diff -Nrua helpcontent2/helpers/uno_hid.lst helpcontent2/helpers/uno_hid.lst
+--- helpcontent2/helpers/uno_hid.lst	2005-03-08 08:13:24.000000000 -0600
++++ helpcontent2/helpers/uno_hid.lst	2008-03-01 18:27:18.000000000 -0600
+@@ -1242,8 +1242,10 @@
+ SID_HELP_DOWNLOAD,5415,.uno:HelpDownload
+ SID_HELP_HELPFILEBOX,5419,.uno:HelpChooseFile
+ SID_HELP_PI,5962,.uno:HelperDialog
++SID_HELP_REPORTBUG,6712,.uno:HelpReportBug
+ SID_HELP_SEARCH,5412,.uno:HelpSearch
+ SID_HELP_SUPPORTPAGE,6683,.uno:HelpSupport
++SID_HELP_TRANSLATEPAGE,6711,.uno:HelpTranslate
+ SID_HELP_TUTORIALS,6695,.uno:HelpTutorials
+ SID_HELP_ZOOMIN,5417,.uno:HelpZoomIn
+ SID_HELP_ZOOMOUT,5418,.uno:HelpZoomOut
+diff -Nrua officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+--- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	2007-11-23 10:18:58.000000000 -0600
++++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu	2008-03-01 18:30:54.000000000 -0600
+@@ -4058,7 +4058,20 @@
  			</node>
  			<node oor:name=".uno:HelpSupport" oor:op="replace">
  				<prop oor:name="Label" oor:type="xs:string">
@@ -169,20 +193,21 @@
  				</prop>
  			</node>
  			<node oor:name=".uno:StatusBarVisible" oor:op="replace">
---- reportdesign/uiconfig/dbreport/menubar/menubar.xml.old	2007-07-09 06:56:39.000000000 -0500
-+++ reportdesign/uiconfig/dbreport/menubar/menubar.xml	2007-08-06 23:03:39.000000000 -0500
-@@ -159,6 +159,8 @@
+diff -Nrua reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml	2008-03-01 18:28:16.000000000 -0600
+@@ -160,5 +160,7 @@
  			<menu:menuitem menu:id=".uno:HelperDialog"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
 +			<menu:menuitem menu:id=".uno:HelpTranslate"/>
 +			<menu:menuitem menu:id=".uno:HelpReportBug"/>
- 			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- sc/uiconfig/scalc/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ sc/uiconfig/scalc/menubar/menubar.xml	2007-08-07 00:59:47.000000000 -0500
-@@ -431,6 +431,8 @@
+diff -Nrua sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
+--- sc/uiconfig/scalc/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ sc/uiconfig/scalc/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+@@ -440,6 +440,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -191,8 +216,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- scripting/workben/bindings/calcmenubar.xml.old	2003-06-03 07:54:16.000000000 -0500
-+++ scripting/workben/bindings/calcmenubar.xml	2007-08-06 22:27:52.000000000 -0500
+diff -Nrua scripting/workben/bindings/calcmenubar.xml scripting/workben/bindings/calcmenubar.xml
+--- scripting/workben/bindings/calcmenubar.xml	2003-06-03 07:54:16.000000000 -0500
++++ scripting/workben/bindings/calcmenubar.xml	2008-03-01 18:30:54.000000000 -0600
 @@ -310,7 +310,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -204,8 +230,9 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- scripting/workben/bindings/drawmenubar.xml.old	2003-06-03 07:54:16.000000000 -0500
-+++ scripting/workben/bindings/drawmenubar.xml	2007-08-06 22:29:31.000000000 -0500
+diff -Nrua scripting/workben/bindings/drawmenubar.xml scripting/workben/bindings/drawmenubar.xml
+--- scripting/workben/bindings/drawmenubar.xml	2003-06-03 07:54:16.000000000 -0500
++++ scripting/workben/bindings/drawmenubar.xml	2008-03-01 18:30:54.000000000 -0600
 @@ -345,7 +345,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -217,8 +244,9 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- scripting/workben/bindings/impressmenubar.xml.old	2003-06-03 07:54:16.000000000 -0500
-+++ scripting/workben/bindings/impressmenubar.xml	2007-08-06 22:31:15.000000000 -0500
+diff -Nrua scripting/workben/bindings/impressmenubar.xml scripting/workben/bindings/impressmenubar.xml
+--- scripting/workben/bindings/impressmenubar.xml	2003-06-03 07:54:16.000000000 -0500
++++ scripting/workben/bindings/impressmenubar.xml	2008-03-01 18:30:54.000000000 -0600
 @@ -319,7 +319,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -230,8 +258,9 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- scripting/workben/bindings/writermenubar.xml.old	2003-06-03 07:54:17.000000000 -0500
-+++ scripting/workben/bindings/writermenubar.xml	2007-08-06 22:32:38.000000000 -0500
+diff -Nrua scripting/workben/bindings/writermenubar.xml scripting/workben/bindings/writermenubar.xml
+--- scripting/workben/bindings/writermenubar.xml	2003-06-03 07:54:17.000000000 -0500
++++ scripting/workben/bindings/writermenubar.xml	2008-03-01 18:30:54.000000000 -0600
 @@ -272,7 +272,9 @@
     <menu:menuitem menu:id="slot:5404" menu:helpid="5404" menu:label="~Tips"/>
     <menu:menuitem menu:id="slot:5403" menu:helpid="5403" menu:label="~Extended Tips"/>
@@ -243,8 +272,9 @@
     <menu:menuitem menu:id="slot:6537" menu:helpid="6537" menu:label="~Registration..."/>
     <menu:menuseparator/>
     <menu:menuitem menu:id="slot:5301" menu:helpid="5301" menu:label="A~bout OpenOffice.org..."/>
---- sd/uiconfig/sdraw/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ sd/uiconfig/sdraw/menubar/menubar.xml	2007-08-07 01:00:46.000000000 -0500
+diff -Nrua sd/uiconfig/sdraw/menubar/menubar.xml sd/uiconfig/sdraw/menubar/menubar.xml
+--- sd/uiconfig/sdraw/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ sd/uiconfig/sdraw/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
 @@ -317,6 +317,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -254,8 +284,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sd/uiconfig/simpress/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ sd/uiconfig/simpress/menubar/menubar.xml	2007-08-07 01:01:33.000000000 -0500
+diff -Nrua sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
+--- sd/uiconfig/simpress/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ sd/uiconfig/simpress/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
 @@ -292,6 +292,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -265,8 +296,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sfx2/inc/sfx2/sfxsids.hrc.old	2007-07-17 08:38:31.000000000 -0500
-+++ sfx2/inc/sfx2/sfxsids.hrc	2007-08-06 22:39:55.000000000 -0500
+diff -Nrua sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxsids.hrc
+--- sfx2/inc/sfx2/sfxsids.hrc	2008-03-01 16:58:37.000000000 -0600
++++ sfx2/inc/sfx2/sfxsids.hrc	2008-03-01 18:32:58.000000000 -0600
 @@ -210,6 +210,8 @@
  #define SID_HELP_HELPFILEBOX				(SID_SFX_START + 419)
  #define SID_HELP_HELPFILEBOX_SELECTED		(SID_SFX_START + 420)
@@ -276,17 +308,9 @@
  #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
  
  // default-ids for document
-@@ -531,7 +533,7 @@
- #define SID_MAIL_SENDDOCASOOO               (SID_SFX_START + 1709)
- #define SID_ONLINEUPDATE                    (SID_SFX_START + 1710)
- #define SID_NOAUTOSAVE                      (SID_SFX_START + 1711)
--#define SID_SFX_free_START                  (SID_SFX_START + 1712)
-+#define SID_SFX_free_START                  (SID_SFX_START + 1714)
- #define SID_SFX_free_END  					(SID_SFX_START + 3999)
- 
- #define SID_OPEN_NEW_VIEW                   (SID_SFX_START + 520)
---- sfx2/sdi/appslots.sdi.old	2007-07-17 08:39:26.000000000 -0500
-+++ sfx2/sdi/appslots.sdi	2007-08-06 22:42:01.000000000 -0500
+diff -Nrua sfx2/sdi/appslots.sdi sfx2/sdi/appslots.sdi
+--- sfx2/sdi/appslots.sdi	2007-09-21 04:27:27.000000000 -0500
++++ sfx2/sdi/appslots.sdi	2008-03-01 18:30:54.000000000 -0600
 @@ -187,6 +187,14 @@
  	[
  		ExecMethod = MiscExec_Impl ;
@@ -302,9 +326,10 @@
  	SID_RECENTFILELIST
  	[
  	]
---- sfx2/sdi/sfx.sdi.old	2007-06-26 11:50:53.000000000 -0500
-+++ sfx2/sdi/sfx.sdi	2007-08-06 22:44:08.000000000 -0500
-@@ -7860,6 +7860,56 @@
+diff -Nrua sfx2/sdi/sfx.sdi sfx2/sdi/sfx.sdi
+--- sfx2/sdi/sfx.sdi	2008-03-01 16:58:34.000000000 -0600
++++ sfx2/sdi/sfx.sdi	2008-03-01 18:30:54.000000000 -0600
+@@ -7887,6 +7887,56 @@
  ]
  
  //--------------------------------------------------------------------------
@@ -361,8 +386,9 @@
  SfxVoidItem HelpTutorials SID_HELP_TUTORIALS
  ()
  [
---- sfx2/source/appl/appserv.cxx.old	2007-06-27 17:57:17.000000000 -0500
-+++ sfx2/source/appl/appserv.cxx	2007-08-06 22:57:54.000000000 -0500
+diff -Nrua sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
+--- sfx2/source/appl/appserv.cxx	2008-01-15 01:56:07.000000000 -0600
++++ sfx2/source/appl/appserv.cxx	2008-03-01 18:30:54.000000000 -0600
 @@ -119,6 +119,12 @@
  #ifndef _SV_MSGBOX_HXX
  #include <vcl/msgbox.hxx>
@@ -376,7 +402,7 @@
  #ifndef _SFXCANCEL_HXX //autogen
  #include <svtools/cancel.hxx>
  #endif
-@@ -420,9 +426,54 @@
+@@ -419,9 +425,54 @@
  			break;
  		}
  
@@ -432,8 +458,9 @@
          {
              Help* pHelp = Application::GetHelp();
              if ( pHelp )
---- sfx2/source/appl/makefile.mk.old	2007-07-11 08:10:17.000000000 -0500
-+++ sfx2/source/appl/makefile.mk	2007-08-06 22:55:37.000000000 -0500
+diff -Nrua sfx2/source/appl/makefile.mk sfx2/source/appl/makefile.mk
+--- sfx2/source/appl/makefile.mk	2007-09-21 04:28:29.000000000 -0500
++++ sfx2/source/appl/makefile.mk	2008-03-01 18:30:54.000000000 -0600
 @@ -65,6 +65,7 @@
  .ELSE
          CDEFS+=-DDLL_NAME=sfx$(UPD)$(DLLPOSTFIX)$(DLLPOST)
@@ -442,8 +469,9 @@
  
  # --- Files --------------------------------------------------------
  
---- starmath/uiconfig/smath/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ starmath/uiconfig/smath/menubar/menubar.xml	2007-08-07 01:02:25.000000000 -0500
+diff -Nrua starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
+--- starmath/uiconfig/smath/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ starmath/uiconfig/smath/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
 @@ -111,6 +111,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
@@ -453,8 +481,9 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- svx/inc/globlmn_tmpl.hrc.old	2007-06-27 08:36:06.000000000 -0500
-+++ svx/inc/globlmn_tmpl.hrc	2007-08-06 22:48:49.000000000 -0500
+diff -Nrua svx/inc/globlmn_tmpl.hrc svx/inc/globlmn_tmpl.hrc
+--- svx/inc/globlmn_tmpl.hrc	2008-03-01 16:58:41.000000000 -0600
++++ svx/inc/globlmn_tmpl.hrc	2008-03-01 18:30:54.000000000 -0600
 @@ -1065,7 +1065,24 @@
      Identifier = SID_HELP_SUPPORTPAGE ; \
  	Command = ".uno:HelpSupport" ; \
@@ -481,9 +510,10 @@
  
  #define ITEM_HELP_ONLINE_REGISTRATION \
      Identifier = SID_ONLINE_REGISTRATION ; \
---- sw/uiconfig/sglobal/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ sw/uiconfig/sglobal/menubar/menubar.xml	2007-08-07 01:03:07.000000000 -0500
-@@ -437,6 +437,8 @@
+diff -Nrua sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
+--- sw/uiconfig/sglobal/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ sw/uiconfig/sglobal/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+@@ -447,6 +447,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -492,9 +522,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sw/uiconfig/sweb/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ sw/uiconfig/sweb/menubar/menubar.xml	2007-08-07 01:03:55.000000000 -0500
-@@ -364,6 +364,8 @@
+diff -Nrua sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
+--- sw/uiconfig/sweb/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ sw/uiconfig/sweb/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+@@ -375,6 +375,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -503,9 +534,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sw/uiconfig/swform/menubar/menubar.xml.old	2007-04-16 10:41:45.000000000 -0500
-+++ sw/uiconfig/swform/menubar/menubar.xml	2007-08-06 23:05:16.000000000 -0500
-@@ -438,6 +438,8 @@
+diff -Nrua sw/uiconfig/swform/menubar/menubar.xml sw/uiconfig/swform/menubar/menubar.xml
+--- sw/uiconfig/swform/menubar/menubar.xml	2007-11-22 09:48:44.000000000 -0600
++++ sw/uiconfig/swform/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+@@ -444,6 +444,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -514,9 +546,10 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- sw/uiconfig/swreport/menubar/menubar.xml.old	2007-04-16 10:52:21.000000000 -0500
-+++ sw/uiconfig/swreport/menubar/menubar.xml	2007-08-06 23:07:31.000000000 -0500
-@@ -438,6 +438,8 @@
+diff -Nrua sw/uiconfig/swreport/menubar/menubar.xml sw/uiconfig/swreport/menubar/menubar.xml
+--- sw/uiconfig/swreport/menubar/menubar.xml	2007-11-22 09:50:45.000000000 -0600
++++ sw/uiconfig/swreport/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+@@ -444,6 +444,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -525,9 +558,10 @@
  			<menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
---- sw/uiconfig/swriter/menubar/menubar.xml.old	2007-08-07 00:49:36.000000000 -0500
-+++ sw/uiconfig/swriter/menubar/menubar.xml	2007-08-07 01:04:40.000000000 -0500
-@@ -440,6 +440,8 @@
+diff -Nrua sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
+--- sw/uiconfig/swriter/menubar/menubar.xml	2008-03-01 16:58:41.000000000 -0600
++++ sw/uiconfig/swriter/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+@@ -450,6 +450,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>
@@ -536,9 +570,10 @@
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:About"/>
  		</menu:menupopup>
---- sw/uiconfig/swxform/menubar/menubar.xml.old	2007-04-16 11:04:26.000000000 -0500
-+++ sw/uiconfig/swxform/menubar/menubar.xml	2007-08-06 23:08:55.000000000 -0500
-@@ -438,6 +438,8 @@
+diff -Nrua sw/uiconfig/swxform/menubar/menubar.xml sw/uiconfig/swxform/menubar/menubar.xml
+--- sw/uiconfig/swxform/menubar/menubar.xml	2007-11-22 09:54:22.000000000 -0600
++++ sw/uiconfig/swxform/menubar/menubar.xml	2008-03-01 18:30:54.000000000 -0600
+@@ -444,6 +444,8 @@
  			<menu:menuitem menu:id=".uno:ExtendedHelp"/>
  			<menu:menuseparator/>
  			<menu:menuitem menu:id=".uno:HelpSupport"/>

Added: trunk/patches/src680/ubuntu-xulrunner-1.9.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/ubuntu-xulrunner-1.9.diff	Sun Mar  2 10:28:42 2008
@@ -0,0 +1,56 @@
+--- config_office/configure.in.old	2007-11-02 03:25:07.000000000 -0500
++++ config_office/configure.in	2008-02-19 16:54:11.000000000 -0600
+@@ -3521,7 +3521,9 @@
+     AC_MSG_RESULT([external])
+     SYSTEM_MOZILLA=YES
+     AC_MSG_CHECKING([which Mozilla flavour to use])
+-    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
++    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
++      MOZ_FLAVOUR=libxul
++    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
+       MOZ_FLAVOUR=xulrunner
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
+       MOZ_FLAVOUR=seamonkey
+@@ -3535,8 +3537,6 @@
+     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
+     AC_MSG_RESULT($tmp)
+ 
+-    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
+-
+     if $PKG_CONFIG --exists nspr ; then
+       PKG_CHECK_MODULES( MOZ_NSPR, nspr )
+       NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
+@@ -3566,9 +3566,20 @@
+     CPPFLAGS="$save_CPPFLAGS"
+     LIBS="$save_LIBS"
+ 
+-    MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
+-    MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+-    MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
++    if $PKG_CONFIG --exists $MOZ_FLAVOUR-xpcom ; then
++      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
++      MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
++    elif $PKG_CONFIG --exists $MOZ_FLAVOUR-embedding ; then
++      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-embedding )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-embedding`/unstable
++      MOZ_LIB=`$PKG_CONFIG --variable=sdkdir $MOZ_FLAVOUR-embedding`/lib
++      MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
++    else
++      AC_MSG_ERROR([Could not find xpcom.])
++    fi
++
+     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
+       AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
+       if test -d "$MOZ_INC/ldap"; then
+--- extensions/source/plugin/util/makefile.pmk.old	2007-02-06 06:59:38.000000000 -0600
++++ extensions/source/plugin/util/makefile.pmk	2008-02-20 08:31:33.000000000 -0600
+@@ -39,6 +39,6 @@
+ 
+ .IF "$(SYSTEM_MOZILLA)" == "YES"
+ CFLAGS+=-DSYSTEM_MOZILLA
+-PKGCONFIG_MODULES=$(MOZ_FLAVOUR)-plugin
++PKGCONFIG_MODULES=mozilla-plugin
+ .INCLUDE : pkg_config.mk
+ .ENDIF
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]