Bug #125495. Get irc building again in the rpms. Get these patches working again. Doesn't affect the default build.

This commit is contained in:
blizzard%redhat.com 2002-02-19 12:16:50 +00:00
Родитель 15cbb6c6fe
Коммит 0bc12a0620
3 изменённых файлов: 86 добавлений и 68 удалений

Просмотреть файл

@ -1,32 +1,15 @@
--- mozilla/xpfe/browser/resources/content/navigatorOverlay.xul.debug Tue Nov 20 19:50:21 2001
+++ mozilla/xpfe/browser/resources/content/navigatorOverlay.xul Tue Nov 20 19:50:54 2001
@@ -348,120 +348,7 @@
<menu id="tasksMenu"/>
--- mozilla/xpfe/browser/resources/content/navigatorOverlay.xul.debug Thu Feb 14 11:51:59 2002
+++ mozilla/xpfe/browser/resources/content/navigatorOverlay.xul Thu Feb 14 11:52:29 2002
@@ -356,133 +356,6 @@
<menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help"/>
- <!-- Menu for testing. -->
- <menu id="debugMenu" accesskey="D" label="Debug">
- <menupopup>
- <menu label="Verification">
- <menupopup>
- <menuitem label="Mozilla" oncommand="window._content.location.href='http://www.mozilla.org'"/>
- <menuitem label="Yahoo" oncommand="window._content.location.href='http://www.yahoo.com'"/>
- <menuitem label="Netscape" oncommand="window._content.location.href='http://www.netscape.com'"/>
- <menuitem label="Excite" oncommand="window._content.location.href='http://www.excite.com'"/>
- <menuitem label="Microsoft" oncommand="window._content.location.href='http://www.microsoft.com'"/>
- <menuitem label="city.net" oncommand="window._content.location.href='http://www.city.net'"/>
- <menuitem label="Mirabilis" oncommand="window._content.location.href='http://www.mirabilis.com'"/>
- <menuitem label="Time" oncommand="window._content.location.href='http://www.time.com/time/index.html'"/>
- <menuitem label="Warner Bros." oncommand="window._content.location.href='http://www.warnerbros.com/home_moz3_day.html'"/>
- <menuitem label="CNN" oncommand="window._content.location.href='http://www.cnn.com'"/>
- <menuitem label="USA Today" oncommand="window._content.location.href='http://www.usatoday.com'"/>
- <menuitem label="Disney" oncommand="window._content.location.href='http://www.disney.go.com'"/>
- <menuitem label="Hotwired" oncommand="window._content.location.href='http://www.hotwired.com'"/>
- <menuitem label="Hotbot" oncommand="window._content.location.href='http://www.hotbot.com'"/>
- <menuseparator />
- <menuitem label="Frames" oncommand="window._content.location.href='http://www.mozilla.org/quality/browser/debugtc/bft_frame_index.html'"/>
- <menuitem label="Tables" oncommand="window._content.location.href='resource:/res/samples/test6.html'"/>
- <menuitem label="Applets" oncommand="window._content.location.href='http://www.mozilla.org/quality/browser/debugtc/bft_browser_applet.html'"/>
- <menuitem label="JavaScript" oncommand="window._content.location.href='http://mozilla.org/quality/browser/standards/javascript/tcmatrix/index.html'"/>
- <menuitem label="GIF Images" oncommand="window._content.location.href='http://www.mozilla.org/quality/browser/debugtc/bft_browser_imagemap.html'"/>
- <menuitem label="JPEG Images" oncommand="window._content.location.href='resource:/res/samples/test2.html'"/>
@ -35,9 +18,24 @@
- <menuitem label="Animation" oncommand="window._content.location.href='resource:/res/samples/test2.html'"/>
- <menuitem label="Larger page" oncommand="window._content.location.href='http://www.mozilla.org/quality/browser/debugtc/bft_browser_html_mix3.html'"/>
- <menuitem label="Smaller page" oncommand="window._content.location.href='http://www.mozilla.org/quality/browser/debugtc/bft_browser_link.html'"/>
- <menuseparator />
- <menuitem label="Mozilla" oncommand="window._content.location.href='http://www.mozilla.org'"/>
- <menuitem label="Yahoo" oncommand="window._content.location.href='http://www.yahoo.com'"/>
- <menuitem label="Netscape" oncommand="window._content.location.href='http://www.netscape.com'"/>
- <menuitem label="Excite" oncommand="window._content.location.href='http://www.excite.com'"/>
- <menuitem label="Microsoft" oncommand="window._content.location.href='http://www.microsoft.com'"/>
- <menuitem label="city.net" oncommand="window._content.location.href='http://www.city.net'"/>
- <menuitem label="Mirabilis" oncommand="window._content.location.href='http://www.mirabilis.com'"/>
- <menuitem label="Time" oncommand="window._content.location.href='http://www.time.com'"/>
- <menuitem label="Warner Bros." oncommand="window._content.location.href='http://www.warnerbros.com'"/>
- <menuitem label="CNN" oncommand="window._content.location.href='http://www.cnn.com'"/>
- <menuitem label="USA Today" oncommand="window._content.location.href='http://www.usatoday.com'"/>
- <menuitem label="Disney" oncommand="window._content.location.href='http://www.disney.go.com'"/>
- <menuitem label="Hotwired" oncommand="window._content.location.href='http://www.hotwired.com'"/>
- <menuitem label="Hotbot" oncommand="window._content.location.href='http://www.hotbot.com'"/>
- </menupopup>
- </menu>
-
- <menu label="Viewer Demos">
- <menupopup>
- <menuitem label="#0 Basic Styles" oncommand="window._content.location.href='resource:/res/samples/test0.html'"/>
@ -81,30 +79,18 @@
- </menupopup>
- </menu>
-
- <menuitem label="Form Manager Samples" oncommand="window._content.location.href='chrome://communicator/locale/wallet/index.html';"/>
- <menuitem label="Form Manager Samples" oncommand="window._content.location.href='chrome://communicator/locale/wallet/index.html';"/>
-
- <menuitem label="chofmann's browser buster" oncommand="window._content.location.href='http://komodo.mozilla.org/buster/'"/>
- <menuitem label="Composer with test page" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
- <menuitem label="Flush Memory" oncommand="Components.classes['@mozilla.org/xpcom/memory-service;1'].getService(Components.interfaces.nsIMemory).heapMinimize(true);" />
-
- </menupopup>
- </menu>
-
- <menu id="qaMenu" accesskey="Q" label="QA">
- <menupopup>
- <menuitem label="Precheckin Tests" oncommand="window._content.location.href='http://www.mozilla.org/quality/precheckin-tests.html'"/>
- <menuseparator />
- <menuitem label="Bug Writing Guidelines" oncommand="window._content.location.href='http://www.mozilla.org/quality/bug-writing-guidelines.html'"/>
- <menuitem label="Bug Template" oncommand="window._content.location.href='http://www.mozilla.org/quality/help/bug-form.html'"/>
- <menuitem label="Smoke Tests" oncommand="window._content.location.href='http://www.mozilla.org/quality/smoketests/'"/>
- <menuitem label="Known Bugs" oncommand="window._content.location.href='http://www.mozilla.org/quality/most-frequent-bugs/'"/>
- <menuseparator />
- <menuitem label="StringBundle Test" oncommand="window._content.location.href='resource:/res/strres-test.xul'"/>
- <menuitem label="chofmann's Browser Buster" oncommand="window._content.location.href='http://komodo.mozilla.org/buster/'"/>
- <menuitem label="Composer (with test page)" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
- <menuitem label="Flush Memory" oncommand="Components.classes['@mozilla.org/xpcom/memory-service;1'].getService(Components.interfaces.nsIMemory).heapMinimize(true);" />
-
- <menuseparator />
-
- <menuitem label="StringBundle Test" oncommand="window._content.location.href='resource:/res/strres-test.xul'"/>
- <menuitem label="Bloat: Dump New Stats" oncommand="window._content.location.href='about:bloat?new'"/>
- <menuitem label="Bloat: Dump All Stats" oncommand="window._content.location.href='about:bloat'"/>
- <menuitem label="Bloat: Clear Stats" oncommand="window._content.location.href='about:bloat?clear'"/>
- <menuitem label="Bloat: Clear Stats" oncommand="window._content.location.href='about:bloat?clear'"/>
-
- <menuseparator />
-
@ -117,6 +103,33 @@
- </menupopup>
- </menu>
- </menupopup>
- </menu>
-
- <menu id="qaMenu" accesskey="Q" label="QA">
- <menupopup>
- <menuitem label="Getting Involved" oncommand="window._content.location.href='http://www.mozilla.org/start/'"/>
- <menuitem label="Mozilla QA Overview" oncommand="window._content.location.href='http://www.mozilla.org/quality/'"/>
-
- <menuseparator />
-
- <menuitem label="Frequently Reported Bugs" oncommand="window._content.location.href='http://bugzilla.mozilla.org/duplicates.cgi'"/>
- <menuitem label="Bug Writing Guidelines" oncommand="window._content.location.href='http://www.mozilla.org/quality/bug-writing-guidelines.html'"/>
- <menuitem label="File a Bug..." oncommand="window._content.location.href='http://www.mozilla.org/quality/bug-form.html'"/>
-
- <menuseparator />
-
- <menuitem label="Bugs Filed Today" oncommand="window._content.location.href='http://bugzilla.mozilla.org/buglist.cgi?changedin=1&amp;chfield=%5BBug+creation%5D&amp;amp;chfieldto=Now&amp;product=Browser&amp;product=MailNews'"/>
- <menuitem label="CVS Checkins Today" oncommand="window._content.location.href='http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&amp;module=SeaMonkeyAll&amp;branch=HEAD&amp;branchtype=match&amp;sortby=Date&amp;date=day&amp;cvsroot=%2Fcvsroot'"/>
-
- <menuseparator />
-
- <menuitem label="Smoke Tests" oncommand="window._content.location.href='http://www.mozilla.org/quality/smoketests/'"/>
- <menuitem label="Pre-Checkin Tests" oncommand="window._content.location.href='http://www.mozilla.org/quality/precheckin-tests.html'"/>
-
- <menuseparator />
-
- <menuitem label="Latest Builds" oncommand="window._content.location.href='ftp://ftp.mozilla.org/pub/mozilla/nightly/latest/'"/>
- </menupopup>
- </menu>
</menubar>

Просмотреть файл

@ -1,27 +1,27 @@
--- mozilla/xpfe/components/prefwindow/resources/content/preftree.xul.debug Fri Jan 4 14:48:46 2002
+++ mozilla/xpfe/components/prefwindow/resources/content/preftree.xul Fri Jan 4 14:49:18 2002
--- mozilla/xpfe/components/prefwindow/resources/content/preftree.xul.debug Wed Jan 16 13:15:13 2002
+++ mozilla/xpfe/components/prefwindow/resources/content/preftree.xul Wed Jan 16 13:15:29 2002
@@ -151,24 +151,6 @@
</outlinerchildren>
</outlineritem>
</outlinerchildren>
</outlineritem>
- <outlineritem container="true" open="true" id="debugItem">
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
- </outlinerrow>
- <outlinerchildren id="debugChildren">
- <outlineritem>
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
- </outlinerrow>
- </outlineritem>
- <outlineritem>
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
- </outlinerrow>
- </outlineritem>
- </outlinerchildren>
- </outlineritem>
- <outlineritem container="true" id="debugItem">
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
- </outlinerrow>
- <outlinerchildren id="debugChildren">
- <outlineritem>
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
- </outlinerrow>
- </outlineritem>
- <outlineritem>
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
- </outlinerrow>
- </outlineritem>
- </outlinerchildren>
- </outlineritem>
-
<outlineritem id="offlineItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
<outlineritem id="offlineItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>

Просмотреть файл

@ -135,9 +135,14 @@ fi
BUILD_OFFICIAL=1 ./configure --prefix=%{_prefix} --enable-optimize \
--disable-debug \
--with-default-mozilla-five-home=/usr/lib/mozilla \
--enable-strip-libs --disable-tests --disable-short-wchar \
--enable-nspr-autoconf --with-extensions --without-mng \
--enable-crypto --disable-xprint
--enable-strip-libs \
--disable-tests \
--disable-short-wchar \
--enable-nspr-autoconf \
--enable-extensions=default,irc \
--without-mng \
--enable-crypto \
--disable-xprint
#BUILD_OFFICIAL=1 make -s export
#BUILD_OFFICIAL=1 make -j$CPUS -s libs