[FX] bangbang023: 07-01-30 [Trunk/Win32](O2/GAL)


Recommended Posts

well I tried applying it but I have a feeling the build will fail tomorrow because this is the output I got:

patching file browser/base/content/browser-sets.inc

(Stripping trailing CRs from patch.)

patching file browser/base/content/browser.js

Hunk #1 FAILED at 84.

Hunk #2 succeeded at 198 (offset 2 lines).

Hunk #3 succeeded at 345 (offset 2 lines).

Hunk #4 succeeded at 478 (offset 2 lines).

Hunk #5 FAILED at 773.

Hunk #6 FAILED at 1053.

Hunk #7 succeeded at 3650 (offset 33 lines).

3 out of 7 hunks FAILED -- saving rejects to file browser/base/content/browser.j

s.rej

(Stripping trailing CRs from patch.)

patching file browser/base/content/sanitize.js

(Stripping trailing CRs from patch.)

patching file browser/base/content/sanitize.xul

(Stripping trailing CRs from patch.)

patching file browser/components/Makefile.in

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/.cvsignore

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/Makefile.in

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/jar.mn

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/content/CookieExceptions.js

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/content/CookieExceptions.xul

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/content/CookieViewer.js

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/content/CookieViewer.xul

(Stripping trailing CRs from patch.)

patching file browser/components/cookieviewer/content/treeUtils.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/Makefile.in

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/actionsshared.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/advanced.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/advanced.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/advancedScript.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/changeaction.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/changeaction.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/colors.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/connection.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/connection.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/content.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/content.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/cookies.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/cookies.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/downloadactions.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/downloadactions.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/downloads.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/downloads.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/fontbuilder.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/fonts.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/fonts.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/fontscaling.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/fontscaling.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/general.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/general.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/helperapplications.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/jar.mn

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/languages.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/languages.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/ocsp.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/ocsp.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/permissions.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/permissions.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/permissionsutils.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/preferences.css

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/preferences.xml

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/preferences.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/privacy.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/privacy.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/sanitize.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/sanitize.xul

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/tabs.js

(Stripping trailing CRs from patch.)

patching file browser/components/preferences/tabs.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/.cvsignore

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/Makefile.in

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/jar.mn

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/nsPrefWindow.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/plugins.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/plugins.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-advanced.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-advanced.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-advancedscripts.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-calibrate-screen.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-connection.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-connection.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-extensions.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-extensions.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-features-images.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-features-images.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-features.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-features.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-fonts.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-fonts.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-languages.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-languages.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-masterpass.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-masterpass.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-navigator.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-navigator.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-privacy.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-privacy.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-themes.js

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref-themes.xul

(Stripping trailing CRs from patch.)

patching file browser/components/prefwindow/content/pref.xul

(Stripping trailing CRs from patch.)

patching file browser/locales/jar.mn

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/brand.dtd.in

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/browser.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/browser.properties

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/sanitize.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/cookieviewer/CookieViewer.pro

perties

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/advanced.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/advancedScript.dt

d

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/changeaction.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/colors.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/connection.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/content.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/cookies.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/downloadactions.d

td

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/downloads.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/fonts.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/fontscaling.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/general.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/languages.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/ocsp.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/permissions.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/preferences.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/preferences.prope

rties

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/privacy.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/sanitize.dtd

(Stripping trailing CRs from patch.)

patching file browser/locales/en-US/chrome/browser/preferences/tabs.dtd

(Stripping trailing CRs from patch.)

patching file browser/themes/pinstripe/browser/jar.mn

(Stripping trailing CRs from patch.)

patching file browser/themes/pinstripe/browser/preferences/preferences.css

(Stripping trailing CRs from patch.)

patching file browser/themes/winstripe/browser/jar.mn

(Stripping trailing CRs from patch.)

patching file browser/themes/winstripe/browser/preferences/preferences.css

(Stripping trailing CRs from patch.)

patching file toolkit/components/passwordmgr/resources/content/passwordManager.x

ul

(Stripping trailing CRs from patch.)

patching file toolkit/components/viewconfig/content/config.js

(Stripping trailing CRs from patch.)

patching file toolkit/components/viewconfig/content/config.xul

(Stripping trailing CRs from patch.)

patching file toolkit/content/globalOverlay.js

(Stripping trailing CRs from patch.)

patching file toolkit/content/jar.mn

(Stripping trailing CRs from patch.)

patching file toolkit/content/xul.css

(Stripping trailing CRs from patch.)

patching file toolkit/content/widgets/checkbox.xml

(Stripping trailing CRs from patch.)

patching file toolkit/content/widgets/colorpicker.xml

(Stripping trailing CRs from patch.)

patching file toolkit/content/widgets/listbox.xml

(Stripping trailing CRs from patch.)

patching file toolkit/content/widgets/menulist.xml

(Stripping trailing CRs from patch.)

patching file toolkit/content/widgets/preferences.xml

(Stripping trailing CRs from patch.)

patching file toolkit/content/widgets/stringbundle.xml

(Stripping trailing CRs from patch.)

patching file toolkit/content/widgets/tabbox.xml

(Stripping trailing CRs from patch.)

patching file toolkit/locales/jar.mn

(Stripping trailing CRs from patch.)

patching file toolkit/locales/en-US/chrome/global/config.dtd

(Stripping trailing CRs from patch.)

patching file toolkit/locales/en-US/chrome/global/preferences.dtd

(Stripping trailing CRs from patch.)

patching file toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.

properties

(Stripping trailing CRs from patch.)

patching file toolkit/themes/pinstripe/global/config.css

(Stripping trailing CRs from patch.)

patching file toolkit/themes/pinstripe/global/global.css

(Stripping trailing CRs from patch.)

patching file toolkit/themes/winstripe/global/config.css

(Stripping trailing CRs from patch.)

patching file toolkit/themes/winstripe/global/global.css

(Stripping trailing CRs from patch.)

patching file toolkit/themes/winstripe/global/jar.mn

(Stripping trailing CRs from patch.)

patching file toolkit/themes/winstripe/global/menulist.css

(Stripping trailing CRs from patch.)

patching file toolkit/themes/winstripe/global/preferences.css

(Stripping trailing CRs from patch.)

patching file toolkit/themes/winstripe/global/textbox.css

look at the bolded part :unsure:

awww, damn that sucks...thanks for tryin though

585486000[/snapback]

Im exhausted now so once I finish nuking my tree and setting it all back up, I'm going to bed. But if he releases another patch, I'll try it again.

This topic is now closed to further replies.
  • Recently Browsing   0 members

    • No registered users viewing this page.