Update to 31.0

Changelog: New Add the search field to the new tab page New Support of Prefer:Safe http header for parental control (learn more) New mozilla::pkix as default certificate verifier (learn more) New Block malware from downloaded files (learn more) New Partial implementation of the OpenType MATH table (section 6.3.6) see documentation about mathematical fonts and the MathML Torture Test for details New audio/video .ogg and .pdf files handled by Firefox if no application specified (Windows only) New Upper Sorbian [hsb] locale added Changed Removal of the CAPS infrastructure for specifying site-specific permissions (via capability.policy.* preferences). Most notably, attempts to use this functionality to grant access to the clipboard will no longer work. The sole exception is the checkloaduri permission, which may still be used as before to allow sites to load file:// URIs. HTML5 WebVTT implemented and enabled (learn more) HTML5 CSS3 variables implemented (learn more) Developer Developer Tools: Add-on Debugger (learn more) Developer Developer Tools: Canvas Debugger (learn more) Developer New Array built-in: Array.prototype.fill() (learn more) Developer New Object built-in: Object.setPrototypeOf() (learn more) Developer CSP 1.1 nonce-source and hash-source enabled by default Developer Developer Tools: Eyedropper tool added to the color picker (learn more) Developer Developer Tools: Editable Box Model (learn more) Developer Developer Tools: Code Editor improvements (learn more) Developer Developer Tools: Console stack traces (learn more) Developer Developer Tools: Copy as cURL (learn more) Developer Developer Tools: Styled console logs (learn more) Developer navigator.sendBeacon enabled by default (learn more) Developer Dialogs spawned from the onbeforeunload event no longer block access to the rest of the browser Fixed Search for partially selected link text from context menu (985824) Fixed Various security fixes Fixed in Firefox 31 MFSA 2014-66 IFRAME sandbox same-origin access through redirect MFSA 2014-65 Certificate parsing broken by non-standard character encoding MFSA 2014-64 Crash in Skia library when scaling high quality images MFSA 2014-63 Use-after-free while when manipulating certificates in the trusted cache MFSA 2014-62 Exploitable WebGL crash with Cesium JavaScript library MFSA 2014-61 Use-after-free with FireOnStateChange event MFSA 2014-60 Toolbar dialog customization event spoofing MFSA 2014-59 Use-after-free in DirectWrite font handling MFSA 2014-58 Use-after-free in Web Audio due to incorrect control message ordering MFSA 2014-57 Buffer overflow during Web Audio buffering for playback MFSA 2014-56 Miscellaneous memory safety hazards (rv:31.0 / rv:24.7)
author: ryoon <ryoon@pkgsrc.org> 2014-07-24 14:57:12 +0000
committer: ryoon <ryoon@pkgsrc.org> 2014-07-24 14:57:12 +0000
commit: 3daa6120c58e4858c6f0c473cbaf357fd1a53142 (patch)
tree: 21d8889fd8a6c2d9de3c44f317c8f30d2dab04c8 /www
parent: 1e4177b1d038f3e44e60e1e6d2451584dd16ab9d (diff)
download: pkgsrc-3daa6120c58e4858c6f0c473cbaf357fd1a53142.tar.gz
34 files changed, 587 insertions, 542 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 1c48688a959..4a12c86b796 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.172 2014/07/08 13:14:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.173 2014/07/24 14:57:12 ryoon Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=	30.0
+MOZ_BRANCH=	31.0
 MOZ_BRANCH_MINOR=
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index a781c5141e3..d4d49a314b5 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.82 2014/06/11 00:40:59 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.83 2014/07/24 14:57:12 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -99,6 +99,8 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects
 lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects.xhtml
 lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/template.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/utils.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.xul
 lib/firefox/browser/chrome/browser/content/browser/devtools/cleopatra.html
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/activeline.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/brace-fold.js
@@ -120,11 +122,13 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/matchbrac
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/mozilla.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/search.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/searchcursor.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/sublime.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/trailingspace.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/vim.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/xml-fold.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/xml.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/commandline.css
+lib/firefox/browser/chrome/browser/content/browser/devtools/commandline/commands-index.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/commandlineoutput.xhtml
 lib/firefox/browser/chrome/browser/content/browser/devtools/commandlinetooltip.xhtml
 lib/firefox/browser/chrome/browser/content/browser/devtools/computedview.xhtml
@@ -132,12 +136,17 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/connect.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/connect.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/connect.xhtml
 lib/firefox/browser/chrome/browser/content/browser/devtools/cssruleview.xhtml
+lib/firefox/browser/chrome/browser/content/browser/devtools/d3.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/dagre-d3.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/debugger-controller.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/debugger-panes.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/debugger-toolbar.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/debugger-view.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/debugger.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/debugger.xul
+lib/firefox/browser/chrome/browser/content/browser/devtools/eyedropper.xul
+lib/firefox/browser/chrome/browser/content/browser/devtools/eyedropper/crosshairs.css
+lib/firefox/browser/chrome/browser/content/browser/devtools/eyedropper/nocursor.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.xhtml
@@ -174,7 +183,9 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/j
 lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/strings.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/tree.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/ui.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/responsivedesign/resize-commands.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/ruleview.css
+lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad-commands.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad.xul
 lib/firefox/browser/chrome/browser/content/browser/devtools/shadereditor.js
@@ -185,6 +196,9 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/splitview.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/styleeditor.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/styleeditor.xul
 lib/firefox/browser/chrome/browser/content/browser/devtools/theme-switching.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor-controller.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor-view.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor.xul
 lib/firefox/browser/chrome/browser/content/browser/devtools/webconsole.xul
 lib/firefox/browser/chrome/browser/content/browser/devtools/widgets.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/widgets/VariablesView.xul
@@ -205,6 +219,9 @@ lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.css
 lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.js
 lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xhtml
 lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xml
+lib/firefox/browser/chrome/browser/content/browser/fonts/ClearSans-Regular.woff
+lib/firefox/browser/chrome/browser/content/browser/fonts/FiraSans-Light.woff
+lib/firefox/browser/chrome/browser/content/browser/fonts/FiraSans-Regular.woff
 lib/firefox/browser/chrome/browser/content/browser/hiddenWindow.xul
 lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul
 lib/firefox/browser/chrome/browser/content/browser/license.html
@@ -407,10 +424,13 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/background-nois
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-divider@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/canvasdebugger.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/close.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/close@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-console.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-console@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-eyedropper.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-eyedropper@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-paintflashing.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-paintflashing@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-pick.png
@@ -445,6 +465,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dropmarker.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-breakpoint.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-error.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/eyedropper.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filters.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars-light.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars.css
@@ -456,7 +477,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.s
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemToggle-light.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemToggle.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/layout-background-grid.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/layoutview.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/light-theme.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass-light.png
@@ -466,7 +486,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glas
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/markup-view.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/netmonitor.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/noise.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/option-icon.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-background.png
@@ -506,6 +525,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-delete.pn
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-edit.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-lock.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-open-inspector.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webaudioeditor.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole_networkpanel.css
@@ -582,7 +602,19 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/check.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/check@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown-disabled.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown-disabled@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/header.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/header@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/sorter.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/sorter@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/mail.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png
@@ -633,6 +665,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/search.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/stack-expander.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/tabview.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/tabview.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-arrow.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-64.png
@@ -664,10 +697,13 @@ lib/firefox/browser/chrome/en-US/locale/browser/devtools/VariablesView.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/app-manager.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/app-manager.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/appcacheutils.properties
+lib/firefox/browser/chrome/en-US/locale/browser/devtools/canvasdebugger.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/devtools/canvasdebugger.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/connection-screen.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/connection-screen.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/debugger.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/debugger.properties
+lib/firefox/browser/chrome/en-US/locale/browser/devtools/eyedropper.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/font-inspector.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/gcli.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/gclicommands.properties
@@ -692,6 +728,8 @@ lib/firefox/browser/chrome/en-US/locale/browser/devtools/tilt.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/toolbox.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/toolbox.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/webConsole.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/devtools/webaudioeditor.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/devtools/webaudioeditor.properties
 lib/firefox/browser/chrome/en-US/locale/browser/devtools/webconsole.properties
 lib/firefox/browser/chrome/en-US/locale/browser/downloads/downloads.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/downloads/downloads.properties
@@ -756,6 +794,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/tabbrowser.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/tabbrowser.properties
 lib/firefox/browser/chrome/en-US/locale/browser/tabview.properties
 lib/firefox/browser/chrome/en-US/locale/browser/taskbar.properties
+lib/firefox/browser/chrome/en-US/locale/browser/translation.dtd
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/chrome.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/viewer.properties
 lib/firefox/browser/chrome/icons/default/default16.png
@@ -769,8 +808,176 @@ lib/firefox/browser/chrome/pdfjs/content/PdfRedirector.jsm
 lib/firefox/browser/chrome/pdfjs/content/PdfStreamConverter.jsm
 lib/firefox/browser/chrome/pdfjs/content/build/pdf.js
 lib/firefox/browser/chrome/pdfjs/content/build/pdf.worker.js
-lib/firefox/browser/chrome/pdfjs/content/default_preferences.js
 lib/firefox/browser/chrome/pdfjs/content/network.js
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78ms-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78ms-RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/83pv-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/90ms-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/90ms-RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/90msp-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/90msp-RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/90pv-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/90pv-RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Add-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Add-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Add-RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Add-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-0.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-1.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-3.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-4.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-5.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-6.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-CNS1-UCS2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-GB1-0.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-GB1-1.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-GB1-2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-GB1-3.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-GB1-4.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-GB1-5.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-GB1-UCS2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-0.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-1.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-3.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-4.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-5.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-6.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Japan1-UCS2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Korea1-0.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Korea1-1.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Korea1-2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Adobe-Korea1-UCS2.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/B5pc-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/B5pc-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/CNS-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/CNS-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/CNS1-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/CNS1-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/CNS2-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/CNS2-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/ETHK-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/ETHK-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/ETen-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/ETen-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/ETenms-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/ETenms-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Ext-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Ext-RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Ext-RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Ext-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GB-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GB-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GB-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GB-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBK-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBK-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBK2K-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBK2K-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBKp-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBKp-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBT-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBT-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBT-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBT-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBTpc-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBTpc-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBpc-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/GBpc-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKdla-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKdla-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKdlb-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKdlb-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKgccs-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKgccs-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKm314-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKm314-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKm471-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKm471-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKscs-B5-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/HKscs-B5-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Hankaku.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Hiragana.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSC-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSC-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSC-Johab-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSC-Johab-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSCms-UHC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSCms-UHC-HW-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSCms-UHC-HW-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSCms-UHC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSCpc-EUC-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/KSCpc-EUC-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Katakana.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/LICENSE
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/NWP-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/NWP-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/RKSJ-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/RKSJ-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/Roman.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UCS2-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UCS2-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UTF16-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UTF16-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UTF32-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UTF32-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UTF8-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniCNS-UTF8-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UCS2-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UCS2-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UTF16-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UTF16-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UTF32-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UTF32-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UTF8-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniGB-UTF8-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UCS2-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UCS2-HW-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UCS2-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UTF16-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UTF16-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UTF32-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UTF32-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UTF8-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS-UTF8-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS2004-UTF16-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS2004-UTF16-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS2004-UTF32-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS2004-UTF32-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS2004-UTF8-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJIS2004-UTF8-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJISPro-UCS2-HW-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJISPro-UCS2-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJISPro-UTF8-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJISX0213-UTF32-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJISX0213-UTF32-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniJISX02132004-UTF32-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UCS2-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UCS2-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UTF16-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UTF16-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UTF32-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UTF32-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UTF8-H.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/UniKS-UTF8-V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/V.bcmap
+lib/firefox/browser/chrome/pdfjs/content/web/cmaps/WP-Symbol.bcmap
 lib/firefox/browser/chrome/pdfjs/content/web/debugger.js
 lib/firefox/browser/chrome/pdfjs/content/web/images/annotation-check.svg
 lib/firefox/browser/chrome/pdfjs/content/web/images/annotation-comment.svg
@@ -837,6 +1044,8 @@ lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle-
 lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl@2x.png
 lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle.png
 lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle@2x.png
+lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewAttachments.png
+lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewAttachments@2x.png
 lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewOutline-rtl.png
 lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewOutline-rtl@2x.png
 lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewOutline.png
@@ -855,6 +1064,7 @@ lib/firefox/browser/chrome/pdfjs/pdfjs.manifest
 lib/firefox/browser/components/ChromeProfileMigrator.js
 lib/firefox/browser/components/DownloadsStartup.js
 lib/firefox/browser/components/DownloadsUI.js
+lib/firefox/browser/components/ExperimentsService.js
 lib/firefox/browser/components/FeedConverter.js
 lib/firefox/browser/components/FeedWriter.js
 lib/firefox/browser/components/FirefoxProfileMigrator.js
@@ -889,6 +1099,7 @@ lib/firefox/browser/modules/BrowserNewTabPreloader.jsm
 lib/firefox/browser/modules/BrowserUITelemetry.jsm
 lib/firefox/browser/modules/ContentClick.jsm
 lib/firefox/browser/modules/ContentLinkHandler.jsm
+lib/firefox/browser/modules/ContentSearch.jsm
 lib/firefox/browser/modules/CustomizableUI.jsm
 lib/firefox/browser/modules/CustomizableWidgets.jsm
 lib/firefox/browser/modules/CustomizationTabPreloader.jsm
@@ -903,9 +1114,9 @@ lib/firefox/browser/modules/NetworkPrioritizer.jsm
 lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
 lib/firefox/browser/modules/PlacesUIUtils.jsm
 lib/firefox/browser/modules/RecentWindow.jsm
+lib/firefox/browser/modules/RemotePrompt.jsm
 lib/firefox/browser/modules/ScrollbarSampler.jsm
 lib/firefox/browser/modules/SharedFrame.jsm
-lib/firefox/browser/modules/SignInToWebsite.jsm
 lib/firefox/browser/modules/SitePermissions.jsm
 lib/firefox/browser/modules/Social.jsm
 lib/firefox/browser/modules/TabCrashReporter.jsm
@@ -913,15 +1124,8 @@ lib/firefox/browser/modules/UITour.jsm
 lib/firefox/browser/modules/WebappManager.jsm
 lib/firefox/browser/modules/devtools/AppCacheUtils.jsm
 lib/firefox/browser/modules/devtools/BreadcrumbsWidget.jsm
-lib/firefox/browser/modules/devtools/BuiltinCommands.jsm
 lib/firefox/browser/modules/devtools/Chart.jsm
-lib/firefox/browser/modules/devtools/CmdDebugger.jsm
-lib/firefox/browser/modules/devtools/CmdEdit.jsm
-lib/firefox/browser/modules/devtools/CmdInspect.jsm
-lib/firefox/browser/modules/devtools/CmdResize.jsm
-lib/firefox/browser/modules/devtools/CmdScratchpad.jsm
-lib/firefox/browser/modules/devtools/CmdTilt.jsm
-lib/firefox/browser/modules/devtools/Commands.jsm
+lib/firefox/browser/modules/devtools/Curl.jsm
 lib/firefox/browser/modules/devtools/DOMHelpers.jsm
 lib/firefox/browser/modules/devtools/DeveloperToolbar.jsm
 lib/firefox/browser/modules/devtools/FloatingScrollbars.jsm
@@ -944,7 +1148,12 @@ lib/firefox/browser/modules/devtools/app-manager/connection-store.js
 lib/firefox/browser/modules/devtools/app-manager/device-store.js
 lib/firefox/browser/modules/devtools/app-manager/simulators-store.js
 lib/firefox/browser/modules/devtools/app-manager/webapps-store.js
+lib/firefox/browser/modules/devtools/canvasdebugger/panel.js
+lib/firefox/browser/modules/devtools/commandline/commands-index.js
+lib/firefox/browser/modules/devtools/debugger/debugger-commands.js
 lib/firefox/browser/modules/devtools/debugger/panel.js
+lib/firefox/browser/modules/devtools/eyedropper/commands.js
+lib/firefox/browser/modules/devtools/eyedropper/eyedropper.js
 lib/firefox/browser/modules/devtools/framework/selection.js
 lib/firefox/browser/modules/devtools/framework/sidebar.js
 lib/firefox/browser/modules/devtools/framework/target.js
@@ -953,8 +1162,8 @@ lib/firefox/browser/modules/devtools/framework/toolbox-options.js
 lib/firefox/browser/modules/devtools/framework/toolbox-process-window.js
 lib/firefox/browser/modules/devtools/framework/toolbox.js
 lib/firefox/browser/modules/devtools/gDevTools.jsm
-lib/firefox/browser/modules/devtools/gcli.jsm
 lib/firefox/browser/modules/devtools/inspector/breadcrumbs.js
+lib/firefox/browser/modules/devtools/inspector/inspector-commands.js
 lib/firefox/browser/modules/devtools/inspector/inspector-panel.js
 lib/firefox/browser/modules/devtools/inspector/selector-search.js
 lib/firefox/browser/modules/devtools/main.js
@@ -967,8 +1176,10 @@ lib/firefox/browser/modules/devtools/profiler/consts.js
 lib/firefox/browser/modules/devtools/profiler/controller.js
 lib/firefox/browser/modules/devtools/profiler/panel.js
 lib/firefox/browser/modules/devtools/profiler/sidebar.js
+lib/firefox/browser/modules/devtools/resize-commands.js
 lib/firefox/browser/modules/devtools/responsivedesign.jsm
 lib/firefox/browser/modules/devtools/scratchpad-manager.jsm
+lib/firefox/browser/modules/devtools/scratchpad/scratchpad-commands.js
 lib/firefox/browser/modules/devtools/scratchpad/scratchpad-panel.js
 lib/firefox/browser/modules/devtools/shadereditor/panel.js
 lib/firefox/browser/modules/devtools/shared/autocomplete-popup.js
@@ -986,6 +1197,7 @@ lib/firefox/browser/modules/devtools/sourceeditor/css-autocompleter.js
 lib/firefox/browser/modules/devtools/sourceeditor/css-tokenizer.js
 lib/firefox/browser/modules/devtools/sourceeditor/debugger.js
 lib/firefox/browser/modules/devtools/sourceeditor/editor.js
+lib/firefox/browser/modules/devtools/styleeditor/styleeditor-commands.js
 lib/firefox/browser/modules/devtools/styleeditor/styleeditor-panel.js
 lib/firefox/browser/modules/devtools/styleeditor/utils.js
 lib/firefox/browser/modules/devtools/styleinspector/computed-view.js
@@ -994,18 +1206,22 @@ lib/firefox/browser/modules/devtools/styleinspector/rule-view.js
 lib/firefox/browser/modules/devtools/styleinspector/style-inspector.js
 lib/firefox/browser/modules/devtools/tilt/TiltWorkerCrafter.js
 lib/firefox/browser/modules/devtools/tilt/TiltWorkerPicker.js
+lib/firefox/browser/modules/devtools/tilt/tilt-commands.js
 lib/firefox/browser/modules/devtools/tilt/tilt-gl.js
 lib/firefox/browser/modules/devtools/tilt/tilt-math.js
 lib/firefox/browser/modules/devtools/tilt/tilt-utils.js
 lib/firefox/browser/modules/devtools/tilt/tilt-visualizer-style.js
 lib/firefox/browser/modules/devtools/tilt/tilt-visualizer.js
 lib/firefox/browser/modules/devtools/tilt/tilt.js
+lib/firefox/browser/modules/devtools/webaudioeditor/panel.js
+lib/firefox/browser/modules/devtools/webconsole/console-commands.js
 lib/firefox/browser/modules/devtools/webconsole/console-output.js
 lib/firefox/browser/modules/devtools/webconsole/hudservice.js
 lib/firefox/browser/modules/devtools/webconsole/network-panel.js
 lib/firefox/browser/modules/devtools/webconsole/panel.js
 lib/firefox/browser/modules/devtools/webconsole/webconsole.js
 lib/firefox/browser/modules/distribution.js
+lib/firefox/browser/modules/experiments/Experiments.jsm
 lib/firefox/browser/modules/offlineAppCache.jsm
 lib/firefox/browser/modules/sessionstore/ContentRestore.jsm
 lib/firefox/browser/modules/sessionstore/DocShellCapabilities.jsm
@@ -1210,6 +1426,7 @@ lib/firefox/chrome/marionette/content/marionette-server.js
 lib/firefox/chrome/marionette/content/marionette-simpletest.js
 lib/firefox/chrome/marionette/content/specialpowers.js
 lib/firefox/chrome/marionette/content/specialpowersAPI.js
+lib/firefox/chrome/marionette/modules/Assert.jsm
 lib/firefox/chrome/marionette/modules/MockColorPicker.jsm
 lib/firefox/chrome/marionette/modules/MockFilePicker.jsm
 lib/firefox/chrome/marionette/modules/MockPermissionPrompt.jsm
@@ -1338,6 +1555,7 @@ lib/firefox/chrome/toolkit/content/global/bindings/videocontrols.css
 lib/firefox/chrome/toolkit/content/global/bindings/videocontrols.xml
 lib/firefox/chrome/toolkit/content/global/bindings/wizard.xml
 lib/firefox/chrome/toolkit/content/global/browser-child.js
+lib/firefox/chrome/toolkit/content/global/browser-content.js
 lib/firefox/chrome/toolkit/content/global/buildconfig.html
 lib/firefox/chrome/toolkit/content/global/charsetOverlay.js
 lib/firefox/chrome/toolkit/content/global/charsetOverlay.xul
@@ -1360,6 +1578,7 @@ lib/firefox/chrome/toolkit/content/global/devicestorage.properties
 lib/firefox/chrome/toolkit/content/global/dialogOverlay.js
 lib/firefox/chrome/toolkit/content/global/dialogOverlay.xul
 lib/firefox/chrome/toolkit/content/global/directionDetector.html
+lib/firefox/chrome/toolkit/content/global/directoryLinks.json
 lib/firefox/chrome/toolkit/content/global/editMenuOverlay.js
 lib/firefox/chrome/toolkit/content/global/editMenuOverlay.xul
 lib/firefox/chrome/toolkit/content/global/filepicker.js
@@ -1441,7 +1660,6 @@ lib/firefox/chrome/toolkit/content/mozapps/extensions/blocklist.xml
 lib/firefox/chrome/toolkit/content/mozapps/extensions/blocklist.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/eula.js
 lib/firefox/chrome/toolkit/content/mozapps/extensions/eula.xul
-lib/firefox/chrome/toolkit/content/mozapps/extensions/extensions-content.js
 lib/firefox/chrome/toolkit/content/mozapps/extensions/extensions.css
 lib/firefox/chrome/toolkit/content/mozapps/extensions/extensions.js
 lib/firefox/chrome/toolkit/content/mozapps/extensions/extensions.xml
@@ -1718,6 +1936,7 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/cancel.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-available.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-languages.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-plugins.png
@@ -1730,6 +1949,7 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric-16.
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/discover-logo.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/eula.css
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensions.css
@@ -1779,7 +1999,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
 lib/firefox/components/ActivityMessageConfigurator.js
-lib/firefox/components/ActivityOptions.js
 lib/firefox/components/ActivityProxy.js
 lib/firefox/components/ActivityRequestHandler.js
 lib/firefox/components/ActivityWrapper.js
@@ -1813,11 +2032,13 @@ lib/firefox/components/TCPServerSocket.js
 lib/firefox/components/TCPSocket.js
 lib/firefox/components/TCPSocketParentIntermediary.js
 lib/firefox/components/TelemetryStartup.js
+lib/firefox/components/UnifiedComplete.js
 lib/firefox/components/Weave.js
 lib/firefox/components/WebVTTParserWrapper.js
 lib/firefox/components/Webapps.js
 lib/firefox/components/addonManager.js
 lib/firefox/components/amContentHandler.js
+lib/firefox/components/amInstallTrigger.js
 lib/firefox/components/amWebInstallListener.js
 lib/firefox/components/components.manifest
 lib/firefox/components/contentAreaDropListener.js
@@ -1902,6 +2123,7 @@ lib/firefox/hyphenation/hyph_mn.dic
 lib/firefox/hyphenation/hyph_nb.dic
 lib/firefox/hyphenation/hyph_nl.dic
 lib/firefox/hyphenation/hyph_nn.dic
+lib/firefox/hyphenation/hyph_pl.dic
 lib/firefox/hyphenation/hyph_pt.dic
 lib/firefox/hyphenation/hyph_ru.dic
 lib/firefox/hyphenation/hyph_sh.dic
@@ -1923,6 +2145,7 @@ lib/firefox/modules/AsyncShutdown.jsm
 lib/firefox/modules/AsyncSpellCheckTestHelper.jsm
 lib/firefox/modules/AutoCompleteE10S.jsm
 lib/firefox/modules/BackgroundPageThumbs.jsm
+lib/firefox/modules/BinarySearch.jsm
 lib/firefox/modules/BookmarkHTMLUtils.jsm
 lib/firefox/modules/BookmarkJSONUtils.jsm
 lib/firefox/modules/BrowserElementParent.jsm
@@ -1945,15 +2168,16 @@ lib/firefox/modules/CrashMonitor.jsm
 lib/firefox/modules/Credentials.jsm
 lib/firefox/modules/DOMIdentity.jsm
 lib/firefox/modules/DOMRequestHelper.jsm
-lib/firefox/modules/DataStore.jsm
 lib/firefox/modules/DataStoreChangeNotifier.jsm
-lib/firefox/modules/DataStoreCursor.jsm
+lib/firefox/modules/DataStoreCursorImpl.jsm
 lib/firefox/modules/DataStoreDB.jsm
+lib/firefox/modules/DataStoreImpl.jsm
 lib/firefox/modules/DataStoreServiceInternal.jsm
 lib/firefox/modules/DeferredSave.jsm
 lib/firefox/modules/DeferredTask.jsm
 lib/firefox/modules/Deprecated.jsm
 lib/firefox/modules/Dict.jsm
+lib/firefox/modules/DirectoryLinksProvider.jsm
 lib/firefox/modules/DownloadCore.jsm
 lib/firefox/modules/DownloadImport.jsm
 lib/firefox/modules/DownloadIntegration.jsm
@@ -1976,7 +2200,6 @@ lib/firefox/modules/FreeSpaceWatcher.jsm
 lib/firefox/modules/FxAccounts.jsm
 lib/firefox/modules/FxAccountsClient.jsm
 lib/firefox/modules/FxAccountsCommon.js
-lib/firefox/modules/FxAccountsUtils.jsm
 lib/firefox/modules/Geometry.jsm
 lib/firefox/modules/HealthReport.jsm
 lib/firefox/modules/Http.jsm
@@ -1984,6 +2207,7 @@ lib/firefox/modules/ISO8601DateUtils.jsm
 lib/firefox/modules/IndexedDBHelper.jsm
 lib/firefox/modules/InlineSpellChecker.jsm
 lib/firefox/modules/InsecurePasswordUtils.jsm
+lib/firefox/modules/InterAppCommService.jsm
 lib/firefox/modules/Keyboard.jsm
 lib/firefox/modules/LightweightThemeConsumer.jsm
 lib/firefox/modules/LightweightThemeManager.jsm
@@ -2023,6 +2247,7 @@ lib/firefox/modules/PlacesUtils.jsm
 lib/firefox/modules/PluralForm.jsm
 lib/firefox/modules/PopupNotifications.jsm
 lib/firefox/modules/Preferences.jsm
+lib/firefox/modules/PriorityUrlProvider.jsm
 lib/firefox/modules/PrivateBrowsingUtils.jsm
 lib/firefox/modules/Promise-backend.js
 lib/firefox/modules/Promise.jsm
@@ -2037,6 +2262,7 @@ lib/firefox/modules/RemoteWebNavigation.jsm
 lib/firefox/modules/RemoteWebProgress.jsm
 lib/firefox/modules/ResetProfile.jsm
 lib/firefox/modules/SafeBrowsing.jsm
+lib/firefox/modules/ScriptPreloader.jsm
 lib/firefox/modules/ScrollPosition.jsm
 lib/firefox/modules/SelectContentHelper.jsm
 lib/firefox/modules/SelectParentHelper.jsm
@@ -2044,11 +2270,13 @@ lib/firefox/modules/Services.jsm
 lib/firefox/modules/SettingsChangeNotifier.jsm
 lib/firefox/modules/SettingsDB.jsm
 lib/firefox/modules/SettingsQueue.jsm
+lib/firefox/modules/SharedPromptUtils.jsm
 lib/firefox/modules/ShortcutUtils.jsm
 lib/firefox/modules/Sntp.jsm
 lib/firefox/modules/SocialService.jsm
 lib/firefox/modules/SpatialNavigation.jsm
 lib/firefox/modules/Sqlite.jsm
+lib/firefox/modules/StoreTrustAnchor.jsm
 lib/firefox/modules/SystemMessagePermissionsChecker.jsm
 lib/firefox/modules/Task.jsm
 lib/firefox/modules/TelemetryFile.jsm
@@ -2075,15 +2303,17 @@ lib/firefox/modules/accessibility/AccessFu.jsm
 lib/firefox/modules/accessibility/Constants.jsm
 lib/firefox/modules/accessibility/ContentControl.jsm
 lib/firefox/modules/accessibility/EventManager.jsm
+lib/firefox/modules/accessibility/Gestures.jsm
 lib/firefox/modules/accessibility/OutputGenerator.jsm
+lib/firefox/modules/accessibility/PointerAdapter.jsm
 lib/firefox/modules/accessibility/Presentation.jsm
-lib/firefox/modules/accessibility/TouchAdapter.jsm
 lib/firefox/modules/accessibility/TraversalRules.jsm
 lib/firefox/modules/accessibility/Utils.jsm
 lib/firefox/modules/addons/AddonLogging.jsm
 lib/firefox/modules/addons/AddonRepository.jsm
 lib/firefox/modules/addons/AddonRepository_SQLiteMigrator.jsm
 lib/firefox/modules/addons/AddonUpdateChecker.jsm
+lib/firefox/modules/addons/Content.js
 lib/firefox/modules/addons/LightweightThemeImageOptimizer.jsm
 lib/firefox/modules/addons/PluginProvider.jsm
 lib/firefox/modules/addons/SpellCheckDictionaryBootstrap.js
@@ -2134,7 +2364,9 @@ lib/firefox/modules/commonjs/sdk/context-menu.js
 lib/firefox/modules/commonjs/sdk/core/disposable.js
 lib/firefox/modules/commonjs/sdk/core/heritage.js
 lib/firefox/modules/commonjs/sdk/core/namespace.js
+lib/firefox/modules/commonjs/sdk/core/observer.js
 lib/firefox/modules/commonjs/sdk/core/promise.js
+lib/firefox/modules/commonjs/sdk/core/reference.js
 lib/firefox/modules/commonjs/sdk/deprecated/api-utils.js
 lib/firefox/modules/commonjs/sdk/deprecated/cortex.js
 lib/firefox/modules/commonjs/sdk/deprecated/errors.js
@@ -2191,6 +2423,7 @@ lib/firefox/modules/commonjs/sdk/lang/type.js
 lib/firefox/modules/commonjs/sdk/lang/weak-set.js
 lib/firefox/modules/commonjs/sdk/loader/cuddlefish.js
 lib/firefox/modules/commonjs/sdk/loader/sandbox.js
+lib/firefox/modules/commonjs/sdk/model/core.js
 lib/firefox/modules/commonjs/sdk/net/url.js
 lib/firefox/modules/commonjs/sdk/net/xhr.js
 lib/firefox/modules/commonjs/sdk/notifications.js
@@ -2252,7 +2485,6 @@ lib/firefox/modules/commonjs/sdk/tabs/tab-fennec.js
 lib/firefox/modules/commonjs/sdk/tabs/tab-firefox.js
 lib/firefox/modules/commonjs/sdk/tabs/tab.js
 lib/firefox/modules/commonjs/sdk/tabs/tabs-firefox.js
-lib/firefox/modules/commonjs/sdk/tabs/tabs.js
 lib/firefox/modules/commonjs/sdk/tabs/utils.js
 lib/firefox/modules/commonjs/sdk/tabs/worker.js
 lib/firefox/modules/commonjs/sdk/test.js
@@ -2293,6 +2525,7 @@ lib/firefox/modules/commonjs/sdk/util/array.js
 lib/firefox/modules/commonjs/sdk/util/collection.js
 lib/firefox/modules/commonjs/sdk/util/contract.js
 lib/firefox/modules/commonjs/sdk/util/deprecate.js
+lib/firefox/modules/commonjs/sdk/util/dispatcher.js
 lib/firefox/modules/commonjs/sdk/util/iteration.js
 lib/firefox/modules/commonjs/sdk/util/list.js
 lib/firefox/modules/commonjs/sdk/util/match-pattern.js
@@ -2338,26 +2571,41 @@ lib/firefox/modules/devtools/acorn/walk.js
 lib/firefox/modules/devtools/app-actor-front.js
 lib/firefox/modules/devtools/async-utils.js
 lib/firefox/modules/devtools/client/connection-manager.js
+lib/firefox/modules/devtools/content-observer.js
 lib/firefox/modules/devtools/css-color.js
 lib/firefox/modules/devtools/dbg-client.jsm
 lib/firefox/modules/devtools/dbg-server.jsm
+lib/firefox/modules/devtools/deprecated-sync-thenables.js
 lib/firefox/modules/devtools/event-emitter.js
 lib/firefox/modules/devtools/gcli.jsm
 lib/firefox/modules/devtools/gcli/api.js
 lib/firefox/modules/devtools/gcli/cli.js
+lib/firefox/modules/devtools/gcli/commands/addon.js
+lib/firefox/modules/devtools/gcli/commands/appcache.js
+lib/firefox/modules/devtools/gcli/commands/calllog.js
 lib/firefox/modules/devtools/gcli/commands/clear.js
+lib/firefox/modules/devtools/gcli/commands/cmd.js
 lib/firefox/modules/devtools/gcli/commands/commands.js
 lib/firefox/modules/devtools/gcli/commands/connect.js
 lib/firefox/modules/devtools/gcli/commands/context.js
+lib/firefox/modules/devtools/gcli/commands/cookie.js
 lib/firefox/modules/devtools/gcli/commands/exec.js
 lib/firefox/modules/devtools/gcli/commands/global.js
 lib/firefox/modules/devtools/gcli/commands/help.js
 lib/firefox/modules/devtools/gcli/commands/intro.js
+lib/firefox/modules/devtools/gcli/commands/jsb.js
 lib/firefox/modules/devtools/gcli/commands/lang.js
+lib/firefox/modules/devtools/gcli/commands/listen.js
+lib/firefox/modules/devtools/gcli/commands/media.js
 lib/firefox/modules/devtools/gcli/commands/mocks.js
+lib/firefox/modules/devtools/gcli/commands/pagemod.js
+lib/firefox/modules/devtools/gcli/commands/paintflashing.js
 lib/firefox/modules/devtools/gcli/commands/pref.js
 lib/firefox/modules/devtools/gcli/commands/preflist.js
+lib/firefox/modules/devtools/gcli/commands/restart.js
+lib/firefox/modules/devtools/gcli/commands/screenshot.js
 lib/firefox/modules/devtools/gcli/commands/test.js
+lib/firefox/modules/devtools/gcli/commands/tools.js
 lib/firefox/modules/devtools/gcli/connectors/connectors.js
 lib/firefox/modules/devtools/gcli/connectors/index.js
 lib/firefox/modules/devtools/gcli/connectors/protocol.js
@@ -2414,7 +2662,10 @@ lib/firefox/modules/devtools/gcli/util/spell.js
 lib/firefox/modules/devtools/gcli/util/util.js
 lib/firefox/modules/devtools/output-parser.js
 lib/firefox/modules/devtools/pretty-fast.js
+lib/firefox/modules/devtools/server/actors/call-watcher.js
+lib/firefox/modules/devtools/server/actors/canvas.js
 lib/firefox/modules/devtools/server/actors/childtab.js
+lib/firefox/modules/devtools/server/actors/common.js
 lib/firefox/modules/devtools/server/actors/device.js
 lib/firefox/modules/devtools/server/actors/eventlooplag.js
 lib/firefox/modules/devtools/server/actors/gcli.js
@@ -2433,6 +2684,7 @@ lib/firefox/modules/devtools/server/actors/styles.js
 lib/firefox/modules/devtools/server/actors/stylesheets.js
 lib/firefox/modules/devtools/server/actors/tracer.js
 lib/firefox/modules/devtools/server/actors/webapps.js
+lib/firefox/modules/devtools/server/actors/webaudio.js
 lib/firefox/modules/devtools/server/actors/webbrowser.js
 lib/firefox/modules/devtools/server/actors/webconsole.js
 lib/firefox/modules/devtools/server/actors/webgl.js
@@ -2552,10 +2804,8 @@ lib/firefox/res/entityTables/htmlEntityVersions.properties
 lib/firefox/res/entityTables/mathml20.properties
 lib/firefox/res/entityTables/transliterate.properties
 lib/firefox/res/fonts/mathfont.properties
-lib/firefox/res/fonts/mathfontAsanaMath.properties
 lib/firefox/res/fonts/mathfontMathJax_Main.properties
 lib/firefox/res/fonts/mathfontSTIXNonUnicode.properties
-lib/firefox/res/fonts/mathfontSTIXSize1.properties
 lib/firefox/res/fonts/mathfontSTIXSizeOneSym.properties
 lib/firefox/res/fonts/mathfontStandardSymbolsL.properties
 lib/firefox/res/fonts/mathfontUnicode.properties
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 55d718b151b..df2daacc279 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,19 +1,21 @@
-$NetBSD: distinfo,v 1.156 2014/06/19 20:31:03 martin Exp $
+$NetBSD: distinfo,v 1.157 2014/07/24 14:57:12 ryoon Exp $
 
-SHA1 (firefox-30.0.source.tar.bz2) = 21dce1a2d4b8085c5f7f66b5f4f60bc37598285d
-RMD160 (firefox-30.0.source.tar.bz2) = a1fce7102f9dde33c6db7869ebe600d028998875
-Size (firefox-30.0.source.tar.bz2) = 143171952 bytes
-SHA1 (patch-aa) = b3441219b4d4b34a8ac09be824b89c9b61684823
+SHA1 (firefox-31.0.source.tar.bz2) = a6c3e25ee3aeb7da42db2aaeb50a385d63532beb
+RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564
+Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
+SHA1 (patch-aa) = b58a026dda6b32421f23e206894dfc28dbb9fb86
 SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
 SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
 SHA1 (patch-as) = c197e5bf9ef2f325add320f59c81525b1162a2d3
+SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d94
+SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
 SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
 SHA1 (patch-browser_app_nsBrowserApp.cpp) = 00914f7656fff6785d737ce6e569a97fe39aafe8
 SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3
-SHA1 (patch-browser_installer_package-manifest.in) = d5792a3c5dd7498d24ac0426aacf7d0b9a842c67
+SHA1 (patch-browser_installer_package-manifest.in) = 83a0073525c607e05414688aa07035cc3f08e50a
 SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a
 SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac868e95041b5d87611ee32c2b6330
 SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f
@@ -24,20 +26,16 @@ SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f
 SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1
 SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
 SHA1 (patch-config_external_moz.build) = f437c4802de266caf512dc470879c8ed0961559b
+SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = a582df0242d4347a03e3aa3ca0463bf0e710e654
+SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44
 SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157
-SHA1 (patch-content_media_AudioStream.h) = 101cfc3714e6169753f7c0d21d9c4857d5858180
+SHA1 (patch-content_media_AudioStream.h) = 5cda5329db7bef4c45f3a05a33a5ee7043ec3c2e
 SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13
 SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb
-SHA1 (patch-content_svg_content_src_SVGComponentTransferFunctionElement.h) = 6fb38a9a110271466f155dc4491810efb9be1dc4
-SHA1 (patch-content_svg_content_src_nsSVGFilters.cpp) = 87438dbd3e74a545e3572a2e5e7ddffcf39ce927
-SHA1 (patch-content_svg_content_src_nsSVGFilters.h) = f7bf7dc7635be2961d4ca5c5f7b35b6c93e627d4
-SHA1 (patch-dom_indexedDB_IDBEvents.cpp) = ce1a8f2449f93fa123d56c58526f5e935d829f2d
-SHA1 (patch-dom_indexedDB_IDBEvents.h) = c1da2b3c39f61c8d2ee0d234d56ca7d1a62ed83a
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
 SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4
@@ -71,18 +69,15 @@ SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b14
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 9a158075e31e2c8d6159bd4b97d0b272e193f3db
 SHA1 (patch-ipc_glue_ScopedXREEmbed.cpp) = 97c39f25527dac4c22b38ce446ca2cd4cef08fd0
 SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0
-SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 30ed99c84cc203018bc606208d520c75e1e0d0d9
-SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = 9fc8d9aeadc3677b7adc820a181bfe4aecfc8124
-SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 245733ff4462388d55a1398a4dc3d767bb002236
+SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8
+SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
+SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2
 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
-SHA1 (patch-js_src_Makefile.in) = f6ce5f02a9292e3e524424c5e810850232efe524
+SHA1 (patch-js_src_Makefile.in) = 780e408dfddfd90c6013b316e2e52800c62eee5e
 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
 SHA1 (patch-js_src_gc_Memory.cpp) = 3db31553ec6f7b1fac4fd4ce11b77be1ea4208b8
 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
-SHA1 (patch-layout_base_nsCSSRendering.cpp) = 908475d745c295acbcb2da06571155d9e30e4c0f
-SHA1 (patch-layout_style_crashtests_border-image-visited-link.html) = 97d8f79d6afa0da52d8040f81299497a13b09ad9
-SHA1 (patch-layout_style_crashtests_crashtests.list) = 04561a561632996b3a5eb4516855483a9c46ef7b
 SHA1 (patch-mb) = b661abce429a88554fca6c930b4dbf71ba6bb5cb
 SHA1 (patch-media_libcubeb_src_Makefile.in) = fe880774789b0be54dec6fd83b89457fc8c2cabc
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 5ef0de0ac875334e959ff0d4bfa43a2e5ab087b9
@@ -93,7 +88,7 @@ SHA1 (patch-media_libtheora_Makefile.in) = 80ac9cb20760fe4d94047f7cb1c6a16bbdd6b
 SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
 SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
 SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 087e8788c72b96d2059ca82ce4282d78aed546da
-SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = 12a0d9c3f558c8e84ac865458206c33708b9e684
+SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e
 SHA1 (patch-media_webrtc_signaling_signaling.gyp) = 91d5fcc2409b1398c84dedc9697107f815de48fc
 SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 509e07cba9aeca256ef28674862ce81bac7253bd
 SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 4ff5796e15d9aa6adb8495d6f2e5a7f0445a0fac
@@ -104,19 +99,22 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
 SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 78a9522f0e37cfc3ec8267e6c15de9dba0ec7ff3
 SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543
 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9d9036ddd28c7b8ce37860e0120df2997a3a0c59
-SHA1 (patch-mfbt_Alignment.h) = 07bece1799e15d46d725c3579bf87ec64c32a08b
+SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749
+SHA1 (patch-mfbt_Attributes.h) = e99809555ce743e7e393cdf20efa3a00c0b9098a
 SHA1 (patch-mfbt_Poison.cpp) = b582943c02f57835451c9eecd004c9912d42ce84
+SHA1 (patch-mobile_android_installer_Makefile.in) = b2ea844a0145f4c15ef1b350dde6b000bd231fa5
+SHA1 (patch-mobile_android_installer_package-manifest.in) = 9664858fe3b4593eb29dd0180d5a2df3cd245bb2
 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
 SHA1 (patch-netwerk_dns_Makefile.in) = b6bd9814d909dd6f7cff10dbeac3bedd79c2508e
-SHA1 (patch-netwerk_wifi_moz.build) = 8c88e5bab2a5e164e97ce568686bd280d4b90bec
-SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = c5711adc111dc8413a7234e7d5814a0af9ceeecc
 SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
 SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
+SHA1 (patch-probes_Makefile.in) = 9a8d48556daaaa17996133a6183b1d27f0510361
 SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
+SHA1 (patch-storage_src_moz.build) = 1e08d96f6be012286547c723bfeb445c50d3ad83
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = 78f89457f5ddc958dec607a53800ae8367b94b0c
-SHA1 (patch-toolkit_library_Makefile.in) = fbbd166267a23d840babb0896c24a57e62708c7f
+SHA1 (patch-toolkit_library_libxul.mk) = ceba8edf009787ad68a1d2b284c090d8c140c139
 SHA1 (patch-toolkit_toolkit.mozbuild) = 0993d50cc02c2b421e6de087dfb0a9cb30562c6b
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
 SHA1 (patch-webapprt_moz.build) = cb3d92bc8ada1e2b49877cf7bbe6fbc32278230a
@@ -129,7 +127,7 @@ SHA1 (patch-xl) = 9555b86c72b2e144e341d6af1dbfbc07cc8c94db
 SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657
 SHA1 (patch-xpcom_base_nsDebugImpl.cpp) = dfeb14b000ba435170a17bab98fdf07335f4ef71
 SHA1 (patch-xpcom_base_nsStackWalk.cpp) = fa62f11a97f909ce1c5cea60cf6e58a6071490a5
-SHA1 (patch-xpcom_base_nsUUIDGenerator.cpp) = a170286ef39e44111d3bbfee98515447267dbfad
+SHA1 (patch-xpcom_base_nsUUIDGenerator.cpp) = 8891ad1486384e8bb83b99c64bc3fe009a65e2c0
 SHA1 (patch-xpcom_base_nsUUIDGenerator.h) = 62e334685fcefc3d1c708e1436c7bf2a40d87ab7
 SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
 SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = fdb961a615e5c66a1d0a3c724cf124a2b47f2ed6
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 839cecd71b6..db21805fcba 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.40 2014/07/08 13:14:43 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.41 2014/07/24 14:57:12 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -198,7 +198,7 @@ PLIST_SUBST+=	DLL_SUFFIX=".so"
 #.include "../../audio/libopus/buildlink3.mk"
 #.include "../../audio/tremor/buildlink3.mk"
 #.include "../../audio/libvorbis/buildlink3.mk"
-BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.8.3.1
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.8.4.2
 CONFIGURE_ENV+=	ac_cv_sqlite_secure_delete=yes	# c.f. patches/patch-al
 .include "../../databases/sqlite3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index c4432c23e61..bdaa8675e7d 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
 
 * The profiler does not support Darwin/PPC so don't try to enable it
   on that platform.
@@ -13,9 +13,18 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
   heavy patching. Ideally they should be fixed individually but that
   will be an extremely hard work, so don't define XP_MACOSX for now.
 
---- configure.in.orig	2014-05-29 23:30:30.000000000 +0000
+--- configure.in.orig	2014-07-17 01:45:08.000000000 +0000
 +++ configure.in
-@@ -1673,7 +1673,13 @@ Linux)
+@@ -962,7 +962,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH
+ MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation
+ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
+ 
+-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)'
+ MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+ XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
+@@ -1676,7 +1676,13 @@ Linux)
          MOZ_ENABLE_PROFILER_SPS=
      esac
      ;;
@@ -30,7 +39,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  *)
      MOZ_ENABLE_PROFILER_SPS=
      ;;
-@@ -1777,7 +1783,7 @@ case "$host" in
+@@ -1780,7 +1786,7 @@ case "$host" in
      ;;
  
  *-darwin*)
@@ -39,7 +48,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
      HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
      ;;
-@@ -1909,7 +1915,6 @@ case "$target" in
+@@ -1912,7 +1918,6 @@ case "$target" in
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
      else
@@ -47,7 +56,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
          # The ExceptionHandling framework is needed for Objective-C exception
-@@ -2514,118 +2519,15 @@ MOZ_CXX11
+@@ -2522,118 +2527,15 @@ MOZ_CXX11
  
  AC_LANG_C
  
@@ -173,7 +182,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  fi         # GNU_CC
  
  # visibility hidden flag for Sun Studio on Solaris
-@@ -2996,7 +2898,7 @@ dnl Checks for library functions.
+@@ -3004,7 +2906,7 @@ dnl Checks for library functions.
  dnl ========================================================
  AC_PROG_GCC_TRADITIONAL
  AC_FUNC_MEMCMP
@@ -182,7 +191,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  
  dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
  AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
-@@ -3683,6 +3585,14 @@ if test -n "$YASM"; then
+@@ -3691,6 +3593,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -197,7 +206,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -3710,11 +3620,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3718,11 +3628,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -210,7 +219,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
                     MOZ_NATIVE_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4378,6 +4284,10 @@ cairo-gonk)
+@@ -4387,6 +4293,10 @@ cairo-gonk)
  
  esac
  
@@ -221,7 +230,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  AC_SUBST(MOZ_PDF_PRINTING)
  if test "$MOZ_PDF_PRINTING"; then
     PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5098,6 +5008,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5106,6 +5016,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_VPX=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -231,7 +240,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5122,15 +5035,18 @@ AC_SUBST(MOZ_SRTP)
+@@ -5130,15 +5043,18 @@ AC_SUBST(MOZ_SRTP)
  
  dnl Use integers over floats for audio on B2G and Android, because audio
  dnl backends for those platforms don't support floats.
@@ -253,7 +262,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  
  dnl ========================================================
  dnl = Disable Speech API code
-@@ -5182,6 +5098,114 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5190,6 +5106,63 @@ if test "${ac_cv_c_attribute_aligned}" !
  fi
  
  dnl ========================================================
@@ -314,61 +323,10 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
 +AC_SUBST(MOZ_TREMOR_LIBS)
 +
 +dnl ========================================================
-+dnl Check for libogg
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-ogg,
-+[  --with-system-ogg       Use system libogg (located with pkgconfig)],
-+MOZ_NATIVE_OGG=1,
-+MOZ_NATIVE_OGG=)
-+
-+if test -n "$MOZ_NATIVE_OGG"; then
-+    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_OGG)
-+AC_SUBST(MOZ_OGG_CFLAGS)
-+AC_SUBST(MOZ_OGG_LIBS)
-+
-+dnl ========================================================
-+dnl Check for libvorbis
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-vorbis,
-+[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
-+MOZ_NATIVE_VORBIS=1,
-+MOZ_NATIVE_VORBIS=)
-+
-+if test -n "$MOZ_NATIVE_VORBIS"; then
-+    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_VORBIS)
-+AC_SUBST(MOZ_VORBIS_CFLAGS)
-+AC_SUBST(MOZ_VORBIS_LIBS)
-+
-+dnl ========================================================
-+dnl Check for integer-only libvorbis aka tremor
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-tremor,
-+[  --with-system-tremor    Use system libtremor (located with pkgconfig)],
-+MOZ_NATIVE_TREMOR=1,
-+MOZ_NATIVE_TREMOR=)
-+
-+if test -n "$MOZ_NATIVE_TREMOR"; then
-+    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_TREMOR)
-+AC_SUBST(MOZ_TREMOR_CFLAGS)
-+AC_SUBST(MOZ_TREMOR_LIBS)
-+
-+dnl ========================================================
  dnl = Disable Opus audio codec support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5190,6 +5214,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5198,6 +5171,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
      MOZ_OPUS=1)
  
  dnl ========================================================
@@ -434,7 +392,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
 +MOZ_NATIVE_SOUNDTOUCH=)
 +
 +if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
-+    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
 +
 +    AC_LANG_SAVE
 +    AC_LANG_CPLUSPLUS
@@ -466,7 +424,7 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  dnl = Disable VP8 decoder support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5839,7 +5954,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
+@@ -5938,7 +6002,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
  if test "$MOZ_GAMEPAD"; then
      case "$OS_TARGET" in
      Darwin)
@@ -476,8 +434,8 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
 +        fi
          ;;
      WINNT)
-         if test -n "$MOZ_DIRECTX_SDK_PATH" ; then
-@@ -7912,6 +8029,52 @@ if test "$USE_FC_FREETYPE"; then
+         if test -z "$MOZ_HAS_WINSDK_WITH_D3D"; then
+@@ -8036,6 +8102,52 @@ if test "$USE_FC_FREETYPE"; then
  fi
  
  dnl ========================================================
@@ -530,12 +488,3 @@ $NetBSD: patch-aa,v 1.28 2014/06/11 00:40:59 ryoon Exp $
  dnl Check for pixman and cairo
  dnl ========================================================
  
-@@ -8161,7 +8324,7 @@ case "$OS_TARGET" in
-       NECKO_WIFI=1
-     fi
-     ;;
--  Darwin|SunOS|WINNT)
-+  Darwin|FreeBSD|SunOS|WINNT)
-     NECKO_WIFI=1
-     ;;
-   Linux)
diff --git a/www/firefox/patches/patch-b2g_installer_Makefile.in b/www/firefox/patches/patch-b2g_installer_Makefile.in
new file mode 100644
index 00000000000..9adca6c63a6
--- /dev/null
+++ b/www/firefox/patches/patch-b2g_installer_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-b2g_installer_Makefile.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- b2g/installer/Makefile.in.orig	2014-07-17 01:45:05.000000000 +0000
++++ b2g/installer/Makefile.in
+@@ -61,6 +61,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS)
+ DEFINES += -DMOZ_RTSP
+ endif
+ 
++ifdef MOZ_DEBUG
++DEFINES += -DMOZ_DEBUG=1
++endif
++
+ ifdef GKMEDIAS_SHARED_LIBRARY
+ DEFINES += -DGKMEDIAS_SHARED_LIBRARY
+ endif
diff --git a/www/firefox/patches/patch-b2g_installer_package-manifest.in b/www/firefox/patches/patch-b2g_installer_package-manifest.in
new file mode 100644
index 00000000000..23140f55fa4
--- /dev/null
+++ b/www/firefox/patches/patch-b2g_installer_package-manifest.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-b2g_installer_package-manifest.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- b2g/installer/package-manifest.in.orig	2014-07-17 01:45:05.000000000 +0000
++++ b2g/installer/package-manifest.in
+@@ -565,7 +565,7 @@
+ @BINPATH@/components/MozKeyboard.js
+ @BINPATH@/components/InputMethod.manifest
+ 
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @BINPATH@/components/TestInterfaceJS.js
+ @BINPATH@/components/TestInterfaceJS.manifest
+ #endif
diff --git a/www/firefox/patches/patch-browser_installer_package-manifest.in b/www/firefox/patches/patch-browser_installer_package-manifest.in
index 666d95fab8d..b8b9a9236a6 100644
--- a/www/firefox/patches/patch-browser_installer_package-manifest.in
+++ b/www/firefox/patches/patch-browser_installer_package-manifest.in
@@ -1,10 +1,19 @@
-$NetBSD: patch-browser_installer_package-manifest.in,v 1.4 2014/03/20 21:02:00 ryoon Exp $
+$NetBSD: patch-browser_installer_package-manifest.in,v 1.5 2014/07/24 14:57:12 ryoon Exp $
 
 Limit SPARC bits to just SPARC (untested, but fixes x86).
 
---- browser/installer/package-manifest.in.orig	2014-03-15 05:19:09.000000000 +0000
+--- browser/installer/package-manifest.in.orig	2014-07-17 01:45:07.000000000 +0000
 +++ browser/installer/package-manifest.in
-@@ -732,7 +732,7 @@
+@@ -575,7 +575,7 @@
+ @BINPATH@/components/MozKeyboard.js
+ @BINPATH@/components/InputMethod.manifest
+ 
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @BINPATH@/components/TestInterfaceJS.js
+ @BINPATH@/components/TestInterfaceJS.manifest
+ #endif
+@@ -737,7 +737,7 @@
  #endif
  
  ; for Solaris SPARC
diff --git a/www/firefox/patches/patch-config_rules.mk b/www/firefox/patches/patch-config_rules.mk
new file mode 100644
index 00000000000..81d9426b9dc
--- /dev/null
+++ b/www/firefox/patches/patch-config_rules.mk
@@ -0,0 +1,30 @@
+$NetBSD: patch-config_rules.mk,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- config/rules.mk.orig	2014-07-17 01:45:08.000000000 +0000
++++ config/rules.mk
+@@ -832,6 +832,7 @@ endif
+ ifdef DTRACE_PROBE_OBJ
+ EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
+ OBJS += $(DTRACE_PROBE_OBJ)
++EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ)
+ endif
+ 
+ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
+@@ -867,7 +868,7 @@ ifdef DTRACE_PROBE_OBJ
+ ifndef DTRACE_LIB_DEPENDENT
+ NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
+ $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
+-	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
++	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
+ endif
+ endif
+ endif
+@@ -885,7 +886,7 @@ ifndef INCREMENTAL_LINKER
+ endif
+ ifdef DTRACE_LIB_DEPENDENT
+ ifndef XP_MACOSX
+-	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
++	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
+ endif
+ 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
+ 	@$(RM) $(DTRACE_PROBE_OBJ)
diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers
index 6ab1cd4d132..2c44133a37a 100644
--- a/www/firefox/patches/patch-config_system-headers
+++ b/www/firefox/patches/patch-config_system-headers
@@ -1,17 +1,17 @@
-$NetBSD: patch-config_system-headers,v 1.9 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.10 2014/07/24 14:57:12 ryoon Exp $
 
---- config/system-headers.orig	2014-05-29 23:30:30.000000000 +0000
+--- config/system-headers.orig	2014-07-17 01:45:08.000000000 +0000
 +++ config/system-headers
-@@ -1050,8 +1050,6 @@ X11/Xutil.h
- xpt_struct.h
- xpt_xdr.h
+@@ -1048,8 +1048,6 @@ X11/Xlocale.h
+ X11/Xos.h
+ X11/Xutil.h
  zmouse.h
 -speex/speex_resampler.h
 -soundtouch/SoundTouch.h
  #if MOZ_NATIVE_PNG==1
  png.h
  #endif
-@@ -1119,6 +1117,8 @@ ogg/ogg.h
+@@ -1117,6 +1115,8 @@ ogg/ogg.h
  ogg/os_types.h
  nestegg/nestegg.h
  cubeb/cubeb.h
@@ -20,11 +20,10 @@ $NetBSD: patch-config_system-headers,v 1.9 2014/06/11 00:40:59 ryoon Exp $
  #endif
  gst/gst.h
  gst/app/gstappsink.h
-@@ -1147,3 +1147,38 @@ unicode/utypes.h
+@@ -1145,3 +1145,37 @@ unicode/utypes.h
  #endif
  libutil.h
  unwind.h
-+cairo-qt.h
 +#if MOZ_NATIVE_GRAPHITE2==1
 +graphite2/Font.h
 +graphite2/Segment.h
diff --git a/www/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h
index 54654b26f8a..f3d4203541c 100644
--- a/www/firefox/patches/patch-content_media_AudioStream.h
+++ b/www/firefox/patches/patch-content_media_AudioStream.h
@@ -1,23 +1,21 @@
-$NetBSD: patch-content_media_AudioStream.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
+$NetBSD: patch-content_media_AudioStream.h,v 1.4 2014/07/24 14:57:12 ryoon Exp $
 
---- content/media/AudioStream.h.orig	2014-06-06 01:15:20.000000000 +0000
+--- content/media/AudioStream.h.orig	2014-07-17 01:45:09.000000000 +0000
 +++ content/media/AudioStream.h
-@@ -15,6 +15,7 @@
- #include "mozilla/StaticMutex.h"
+@@ -17,6 +17,7 @@
+ #include "mozilla/RefPtr.h"
  
  #include "cubeb/cubeb.h"
 +#include "soundtouch/SoundTouch.h"
  
  template <>
  class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream>
-@@ -23,10 +24,6 @@ public:
-   static void Release(cubeb_stream* aStream) { cubeb_stream_destroy(aStream); }
+@@ -26,7 +27,7 @@ public:
  };
  
--namespace soundtouch {
+ namespace soundtouch {
 -class SoundTouch;
--}
--
- namespace mozilla {
++class MOZ_IMPORT_API SoundTouch;
+ }
  
- class AudioStream;
+ namespace mozilla {
diff --git a/www/firefox/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h b/www/firefox/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h
deleted file mode 100644
index 8008e296813..00000000000
--- a/www/firefox/patches/patch-content_svg_content_src_SVGComponentTransferFunctionElement.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_svg_content_src_SVGComponentTransferFunctionElement.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
-
---- content/svg/content/src/SVGComponentTransferFunctionElement.h.orig	2014-06-06 01:15:20.000000000 +0000
-+++ content/svg/content/src/SVGComponentTransferFunctionElement.h
-@@ -77,6 +77,8 @@ protected:
-   static EnumInfo sEnumInfo[1];
- };
- 
-+NS_DEFINE_STATIC_IID_ACCESSOR(SVGComponentTransferFunctionElement, NS_SVG_FE_COMPONENT_TRANSFER_FUNCTION_ELEMENT_CID)
-+
- } // namespace dom
- } // namespace mozilla
- 
diff --git a/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.cpp b/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.cpp
deleted file mode 100644
index 4a1ec96c542..00000000000
--- a/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-content_svg_content_src_nsSVGFilters.cpp,v 1.3 2014/06/14 16:20:07 joerg Exp $
-
---- content/svg/content/src/nsSVGFilters.cpp.orig	2014-06-06 01:15:20.000000000 +0000
-+++ content/svg/content/src/nsSVGFilters.cpp
-@@ -67,7 +67,7 @@ nsSVGElement::LengthInfo nsSVGFE::sLengt
- NS_IMPL_ADDREF_INHERITED(nsSVGFE,nsSVGFEBase)
- NS_IMPL_RELEASE_INHERITED(nsSVGFE,nsSVGFEBase)
- 
--NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
-+//NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
- 
- NS_INTERFACE_MAP_BEGIN(nsSVGFE)
-    // nsISupports is an ambiguous base of nsSVGFE so we have to work
-@@ -248,8 +248,6 @@ nsSVGElement::EnumInfo SVGComponentTrans
- NS_IMPL_ADDREF_INHERITED(SVGComponentTransferFunctionElement,SVGComponentTransferFunctionElementBase)
- NS_IMPL_RELEASE_INHERITED(SVGComponentTransferFunctionElement,SVGComponentTransferFunctionElementBase)
- 
--NS_DEFINE_STATIC_IID_ACCESSOR(SVGComponentTransferFunctionElement, NS_SVG_FE_COMPONENT_TRANSFER_FUNCTION_ELEMENT_CID)
--
- NS_INTERFACE_MAP_BEGIN(SVGComponentTransferFunctionElement)
-    // nsISupports is an ambiguous base of nsSVGFE so we have to work
-    // around that
diff --git a/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.h b/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.h
deleted file mode 100644
index e45b347c978..00000000000
--- a/www/firefox/patches/patch-content_svg_content_src_nsSVGFilters.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_svg_content_src_nsSVGFilters.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
-
---- content/svg/content/src/nsSVGFilters.h.orig	2014-06-06 01:15:20.000000000 +0000
-+++ content/svg/content/src/nsSVGFilters.h
-@@ -148,6 +148,8 @@ protected:
-   static LengthInfo sLengthInfo[4];
- };
- 
-+NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGFE, NS_SVG_FE_CID)
-+
- typedef nsSVGElement SVGFEUnstyledElementBase;
- 
- class SVGFEUnstyledElement : public SVGFEUnstyledElementBase
diff --git a/www/firefox/patches/patch-dom_indexedDB_IDBEvents.cpp b/www/firefox/patches/patch-dom_indexedDB_IDBEvents.cpp
deleted file mode 100644
index 1395ae74c5e..00000000000
--- a/www/firefox/patches/patch-dom_indexedDB_IDBEvents.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dom_indexedDB_IDBEvents.cpp,v 1.3 2014/06/14 16:20:07 joerg Exp $
-
---- dom/indexedDB/IDBEvents.cpp.orig	2014-06-14 15:18:52.000000000 +0000
-+++ dom/indexedDB/IDBEvents.cpp
-@@ -15,8 +15,6 @@
- USING_INDEXEDDB_NAMESPACE
- using namespace mozilla::dom;
- 
--NS_DEFINE_STATIC_IID_ACCESSOR(IDBVersionChangeEvent, IDBVERSIONCHANGEEVENT_IID)
--
- namespace {
- 
- class EventFiringRunnable : public nsRunnable
diff --git a/www/firefox/patches/patch-dom_indexedDB_IDBEvents.h b/www/firefox/patches/patch-dom_indexedDB_IDBEvents.h
deleted file mode 100644
index 3393783998b..00000000000
--- a/www/firefox/patches/patch-dom_indexedDB_IDBEvents.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dom_indexedDB_IDBEvents.h,v 1.3 2014/06/14 16:20:07 joerg Exp $
-
---- dom/indexedDB/IDBEvents.h.orig	2014-06-14 15:18:50.000000000 +0000
-+++ dom/indexedDB/IDBEvents.h
-@@ -158,6 +158,8 @@ protected:
-   uint64_t mNewVersion;
- };
- 
-+NS_DEFINE_STATIC_IID_ACCESSOR(IDBVersionChangeEvent, IDBVERSIONCHANGEEVENT_IID)
-+
- END_INDEXEDDB_NAMESPACE
- 
- #endif // mozilla_dom_indexeddb_idbevents_h__
diff --git a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_ast.py b/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
index e2853e665c9..b99c1a8c303 100644
--- a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
+++ b/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_ast.py,v 1.1 2014/06/19 20:31:03 martin Exp $
+$NetBSD: patch-ipc_ipdl_ipdl_cxx_ast.py,v 1.2 2014/07/24 14:57:12 ryoon Exp $
 
 Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
 Make sure storage provided for attributes is properly aligned
 in the generated C++ code.
 
---- ipc/ipdl/ipdl/cxx/ast.py.orig	2014-06-06 03:15:27.000000000 +0200
-+++ ipc/ipdl/ipdl/cxx/ast.py	2014-06-17 21:33:50.000000000 +0200
-@@ -336,12 +336,13 @@
+--- ipc/ipdl/ipdl/cxx/ast.py.orig	2014-07-17 01:45:18.000000000 +0000
++++ ipc/ipdl/ipdl/cxx/ast.py
+@@ -336,12 +336,13 @@ Type.VOID = Type('void')
  Type.VOIDPTR = Type('void', ptr=1)
  
  class TypeArray(Node):
@@ -16,11 +16,10 @@ in the generated C++ code.
 +        '''the type |basetype DECLNAME[nmemb]|.  |nmemb| is an Expr, |alignType| is a type'''
          self.basetype = basetype
          self.nmemb = nmemb
-+	self.alignType = alignType
++        self.alignType = alignType
      def __deepcopy__(self, memo):
 -        return TypeArray(deepcopy(self.basetype, memo), nmemb)
 +        return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
  
  class TypeEnum(Node):
      def __init__(self, name=None):
-
diff --git a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py b/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
index 9d12d0e9984..22b3e525b34 100644
--- a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
+++ b/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
@@ -1,28 +1,27 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_cgen.py,v 1.1 2014/06/19 20:31:03 martin Exp $
+$NetBSD: patch-ipc_ipdl_ipdl_cxx_cgen.py,v 1.2 2014/07/24 14:57:12 ryoon Exp $
 
 Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
 Make sure storage provided for attributes is properly aligned
 in the generated C++ code.
 
---- ipc/ipdl/ipdl/cxx/cgen.py.orig	2014-06-06 03:15:27.000000000 +0200
-+++ ipc/ipdl/ipdl/cxx/cgen.py	2014-06-18 18:10:27.000000000 +0200
-@@ -101,6 +101,7 @@
+--- ipc/ipdl/ipdl/cxx/cgen.py.orig	2014-07-17 01:45:18.000000000 +0000
++++ ipc/ipdl/ipdl/cxx/cgen.py
+@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
      def visitDecl(self, d):
          # C-syntax arrays make code generation much more annoying
          if isinstance(d.type, TypeArray):
-+	    self.write('MOZ_ALIGNED_DECL(')
++            self.write('MOZ_ALIGNED_DECL(')
              d.type.basetype.accept(self)
          else:
              d.type.accept(self)
-@@ -111,7 +112,9 @@
+@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
          if isinstance(d.type, TypeArray):
              self.write('[')
              d.type.nmemb.accept(self)
 -            self.write(']')
 +            self.write('], MOZ_ALIGNOF(')
-+	    d.type.alignType.accept(self)
-+	    self.write('))')
++            d.type.alignType.accept(self)
++            self.write('))')
  
      def visitParam(self, p):
          self.visitDecl(p)
-
diff --git a/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py b/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py
index a3fb9f3540a..c1a0f87173a 100644
--- a/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py
+++ b/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.5 2014/06/19 20:31:03 martin Exp $
+$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.6 2014/07/24 14:57:12 ryoon Exp $
 
 Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
 Make sure storage provided for attributes is properly aligned
 in the generated C++ code.
 
---- ipc/ipdl/ipdl/lower.py.orig	2014-06-06 03:15:27.000000000 +0200
-+++ ipc/ipdl/ipdl/lower.py	2014-06-17 22:35:35.000000000 +0200
-@@ -768,7 +768,7 @@
+--- ipc/ipdl/ipdl/lower.py.orig	2014-07-17 01:45:18.000000000 +0000
++++ ipc/ipdl/ipdl/lower.py
+@@ -768,7 +768,7 @@ IPDL union type."""
          if self.recursive:
              return self.ptrToType()
          else:
@@ -15,4 +15,3 @@ in the generated C++ code.
  
      def unionValue(self):
          # NB: knows that Union's storage C union is named |mValue|
-
diff --git a/www/firefox/patches/patch-js_src_Makefile.in b/www/firefox/patches/patch-js_src_Makefile.in
index f3cd1fd2e8f..f5ee7f4fdd3 100644
--- a/www/firefox/patches/patch-js_src_Makefile.in
+++ b/www/firefox/patches/patch-js_src_Makefile.in
@@ -1,8 +1,17 @@
-$NetBSD: patch-js_src_Makefile.in,v 1.7 2014/03/20 21:02:00 ryoon Exp $
+$NetBSD: patch-js_src_Makefile.in,v 1.8 2014/07/24 14:57:12 ryoon Exp $
 
---- js/src/Makefile.in.orig	2014-03-15 05:19:19.000000000 +0000
+--- js/src/Makefile.in.orig	2014-07-17 01:45:18.000000000 +0000
 +++ js/src/Makefile.in
-@@ -379,7 +379,7 @@ endif
+@@ -20,8 +20,6 @@ run_for_side_effects := $(shell echo 'MA
+ STATIC_LIBRARY_NAME = js_static
+ LIBS		= $(NSPR_LIBS)
+ 
+-DIST_INSTALL = 1
+-
+ ifdef JS_STANDALONE
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
+ endif
+@@ -226,7 +224,7 @@ endif
  ifdef MOZ_SHARED_ICU
  EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
  else
@@ -11,3 +20,12 @@ $NetBSD: patch-js_src_Makefile.in,v 1.7 2014/03/20 21:02:00 ryoon Exp $
  endif
  
  # Prevent floating point errors caused by VC++ optimizations
+@@ -350,7 +348,7 @@ endif
+ 
+ ifdef HAVE_DTRACE
+ $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
+-	dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
++	dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
+ 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
+ 	    -e '/const/!s/char \*/const char */g' \
+ 	    javascript-trace.h.in > javascript-trace.h
diff --git a/www/firefox/patches/patch-layout_base_nsCSSRendering.cpp b/www/firefox/patches/patch-layout_base_nsCSSRendering.cpp
deleted file mode 100644
index 5293f13ad8c..00000000000
--- a/www/firefox/patches/patch-layout_base_nsCSSRendering.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-layout_base_nsCSSRendering.cpp,v 1.1 2014/06/11 00:41:36 ryoon Exp $
-
---- layout/base/nsCSSRendering.cpp.orig	2014-05-29 23:31:05.000000000 +0000
-+++ layout/base/nsCSSRendering.cpp
-@@ -419,6 +419,10 @@ nsCSSRendering::PaintBorder(nsPresContex
-   }
- 
-   nsStyleBorder newStyleBorder(*styleBorder);
-+  // We could do something fancy to avoid the TrackImage/UntrackImage
-+  // work, but it doesn't seem worth it.  (We need to call TrackImage
-+  // since we're not going through nsRuleNode::ComputeBorderData.)
-+  newStyleBorder.TrackImage(aPresContext);
- 
-   NS_FOR_CSS_SIDES(side) {
-     newStyleBorder.SetBorderColor(side,
-@@ -428,6 +432,11 @@ nsCSSRendering::PaintBorder(nsPresContex
-   PaintBorderWithStyleBorder(aPresContext, aRenderingContext, aForFrame,
-                              aDirtyRect, aBorderArea, newStyleBorder,
-                              aStyleContext, aSkipSides);
-+
-+  // We could do something fancy to avoid the TrackImage/UntrackImage
-+  // work, but it doesn't seem worth it.  (We need to call UntrackImage
-+  // since we're not going through nsStyleBorder::Destroy.)
-+  newStyleBorder.UntrackImage(aPresContext);
- }
- 
- void
diff --git a/www/firefox/patches/patch-layout_style_crashtests_border-image-visited-link.html b/www/firefox/patches/patch-layout_style_crashtests_border-image-visited-link.html
deleted file mode 100644
index 639785d28e7..00000000000
--- a/www/firefox/patches/patch-layout_style_crashtests_border-image-visited-link.html
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-layout_style_crashtests_border-image-visited-link.html,v 1.1 2014/06/11 00:41:36 ryoon Exp $
-
---- layout/style/crashtests/border-image-visited-link.html.orig	2014-06-09 02:26:27.000000000 +0000
-+++ layout/style/crashtests/border-image-visited-link.html
-@@ -0,0 +1,10 @@
-+<!DOCTYPE HTML>
-+<title>border-image on link with visited styles</title>
-+<style>
-+
-+:link { color: blue }
-+:visited { color: purple }
-+:link, :visited { border: medium solid; border-image: url(blue-32x32.png) 4 4 4 4; }
-+
-+</style>
-+<a href="http://example.com/">test</a>
diff --git a/www/firefox/patches/patch-layout_style_crashtests_crashtests.list b/www/firefox/patches/patch-layout_style_crashtests_crashtests.list
deleted file mode 100644
index 99a86e89b99..00000000000
--- a/www/firefox/patches/patch-layout_style_crashtests_crashtests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-layout_style_crashtests_crashtests.list,v 1.1 2014/06/11 00:41:36 ryoon Exp $
-
---- layout/style/crashtests/crashtests.list.orig	2014-05-29 23:31:17.000000000 +0000
-+++ layout/style/crashtests/crashtests.list
-@@ -104,3 +104,4 @@ load 945048-1.html
- load 972199-1.html
- load 989965-1.html
- load large_border_image_width.html
-+load border-image-visited-link.html
diff --git a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h b/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
index 1f64f6ea975..dd1c40d6d72 100644
--- a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
+++ b/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.6 2014/04/30 15:07:18 ryoon Exp $
+$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.7 2014/07/24 14:57:12 ryoon Exp $
 
---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig	2014-04-18 02:03:49.000000000 +0000
+--- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig	2014-07-17 01:45:31.000000000 +0000
 +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -30,12 +30,19 @@
+@@ -30,7 +30,13 @@
   * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $
   */
  
@@ -16,30 +16,4 @@ $NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_s
 +#elif !defined(_SYS_QUEUE_H_)
  #define	_SYS_QUEUE_H_
  
--#if !defined(__FreeBSD__) && !defined(DARWIN)
  #include <stddef.h>
--#define __offsetof offsetof
-+
-+#ifndef offsetof
-+#define offsetof(type, field) ((size_t)(&((type *)0)->field))
- #endif
- 
- #define STAILQ_FOREACH_SAFE(var, head, field, tvar)                     \
-@@ -43,8 +50,6 @@
-              (var) && ((tvar) = STAILQ_NEXT((var), field), 1);           \
-              (var) = (tvar))
- 
--// #define __offsetof(type, field) ((size_t)(&((type *)0)->field))
--
- /*
-  * This file defines four types of data structures: singly-linked lists,
-  * singly-linked tail queues, lists and tail queues.
-@@ -285,7 +290,7 @@ struct {								\
- 	(STAILQ_EMPTY((head)) ?						\
- 		NULL :							\
- 	        ((struct type *)					\
--		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+		((char *)((head)->stqh_last) - offsetof(struct type, field))))
- 
- #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
- 
diff --git a/www/firefox/patches/patch-mfbt_Alignment.h b/www/firefox/patches/patch-mfbt_Alignment.h
index 32aabe6cc3f..f2c6380d873 100644
--- a/www/firefox/patches/patch-mfbt_Alignment.h
+++ b/www/firefox/patches/patch-mfbt_Alignment.h
@@ -1,21 +1,32 @@
-$NetBSD: patch-mfbt_Alignment.h,v 1.1 2014/06/19 20:31:03 martin Exp $
+$NetBSD: patch-mfbt_Alignment.h,v 1.2 2014/07/24 14:57:12 ryoon Exp $
 
 Make MOZ_ALIGNOF() use gcc's builtin __alignof__.
 From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
 
---- mfbt/Alignment.h.orig	2014-06-06 03:15:37.000000000 +0200
-+++ mfbt/Alignment.h	2014-06-18 18:12:22.000000000 +0200
-@@ -14,6 +14,9 @@
+--- mfbt/Alignment.h.orig	2014-07-17 01:45:32.000000000 +0000
++++ mfbt/Alignment.h
+@@ -9,11 +9,20 @@
+ #ifndef mozilla_Alignment_h
+ #define mozilla_Alignment_h
+ 
++#include "mozilla/Attributes.h"
++
+ #include <stddef.h>
+ #include <stdint.h>
  
  namespace mozilla {
  
-+#if defined(__GNUC__)
++#if defined(MOZ_HAVE_CXX11_ALIGNAS)
++#define MOZ_ALIGNOF(T) alignof(T)
++#elif defined(__GNUC__)
 +#define MOZ_ALIGNOF(T) __alignof__(T)
++#elif defined(_MSC_VER)
++#define MOZ_ALIGNOF(T) __alignof(T)
 +#else
  /*
   * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
   * bytes of alignment a given type needs.
-@@ -32,6 +35,7 @@
+@@ -32,6 +41,7 @@ class AlignmentFinder
  };
  
  #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
@@ -23,4 +34,15 @@ From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
  
  /*
   * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-
+@@ -43,7 +53,10 @@ class AlignmentFinder
+  * will declare a two-character array |arr| aligned to 8 bytes.
+  */
+ 
+-#if defined(__GNUC__)
++#if defined(MOZ_HAVE_CXX11_ALIGNAS)
++#  define MOZ_ALIGNED_DECL(_type, _align) \
++     alignas(_align) _type
++#elif defined(__GNUC__)
+ #  define MOZ_ALIGNED_DECL(_type, _align) \
+      _type __attribute__((aligned(_align)))
+ #elif defined(_MSC_VER)
diff --git a/www/firefox/patches/patch-mfbt_Attributes.h b/www/firefox/patches/patch-mfbt_Attributes.h
new file mode 100644
index 00000000000..fa549e6b960
--- /dev/null
+++ b/www/firefox/patches/patch-mfbt_Attributes.h
@@ -0,0 +1,32 @@
+$NetBSD: patch-mfbt_Attributes.h,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- mfbt/Attributes.h.orig	2014-07-17 01:45:32.000000000 +0000
++++ mfbt/Attributes.h
+@@ -54,6 +54,9 @@
+ #  ifndef __has_extension
+ #    define __has_extension __has_feature /* compatibility, for older versions of clang */
+ #  endif
++#  if __has_extension(cxx_alignas)
++#    define MOZ_HAVE_CXX11_ALIGNAS
++#  endif
+ #  if __has_extension(cxx_constexpr)
+ #    define MOZ_HAVE_CXX11_CONSTEXPR
+ #  endif
+@@ -75,6 +78,9 @@
+ #  endif
+ #elif defined(__GNUC__)
+ #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
++#    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
++#      define MOZ_HAVE_CXX11_ALIGNAS
++#    endif
+ #    if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
+ #      define MOZ_HAVE_CXX11_OVERRIDE
+ #      define MOZ_HAVE_CXX11_FINAL       final
+@@ -96,6 +102,7 @@
+ #  define MOZ_HAVE_NORETURN              __attribute__((noreturn))
+ #elif defined(_MSC_VER)
+ #  if _MSC_VER >= 1800
++#    define MOZ_HAVE_CXX11_ALIGNAS
+ #    define MOZ_HAVE_CXX11_DELETE
+ #  endif
+ #  if _MSC_VER >= 1700
diff --git a/www/firefox/patches/patch-mobile_android_installer_Makefile.in b/www/firefox/patches/patch-mobile_android_installer_Makefile.in
new file mode 100644
index 00000000000..a3f67aa418e
--- /dev/null
+++ b/www/firefox/patches/patch-mobile_android_installer_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-mobile_android_installer_Makefile.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- mobile/android/installer/Makefile.in.orig	2014-07-17 01:45:33.000000000 +0000
++++ mobile/android/installer/Makefile.in
+@@ -41,6 +41,10 @@ BINPATH = bin
+ endif
+ DEFINES += -DBINPATH=$(BINPATH)
+ 
++ifdef MOZ_DEBUG
++DEFINES += -DMOZ_DEBUG=1
++endif
++
+ ifdef ENABLE_MARIONETTE
+ DEFINES += -DENABLE_MARIONETTE=1
+ endif
diff --git a/www/firefox/patches/patch-mobile_android_installer_package-manifest.in b/www/firefox/patches/patch-mobile_android_installer_package-manifest.in
new file mode 100644
index 00000000000..b520e841f34
--- /dev/null
+++ b/www/firefox/patches/patch-mobile_android_installer_package-manifest.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-mobile_android_installer_package-manifest.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- mobile/android/installer/package-manifest.in.orig	2014-07-17 01:45:33.000000000 +0000
++++ mobile/android/installer/package-manifest.in
+@@ -424,7 +424,7 @@
+ @BINPATH@/components/dom_webspeechsynth.xpt
+ #endif
+ 
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @BINPATH@/components/TestInterfaceJS.js
+ @BINPATH@/components/TestInterfaceJS.manifest
+ #endif
diff --git a/www/firefox/patches/patch-netwerk_wifi_moz.build b/www/firefox/patches/patch-netwerk_wifi_moz.build
deleted file mode 100644
index 9a7758f7ed0..00000000000
--- a/www/firefox/patches/patch-netwerk_wifi_moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-netwerk_wifi_moz.build,v 1.6 2014/03/20 21:02:00 ryoon Exp $
-
---- netwerk/wifi/moz.build.orig	2014-03-15 05:19:33.000000000 +0000
-+++ netwerk/wifi/moz.build
-@@ -35,6 +35,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
-     UNIFIED_SOURCES += [
-         'osx_corewlan.mm',
-     ]
-+elif CONFIG['OS_ARCH'] == 'FreeBSD':
-+    UNIFIED_SOURCES += [
-+        'nsWifiScannerFreeBSD.cpp',
-+    ]
- elif CONFIG['OS_ARCH'] == 'WINNT':
-     UNIFIED_SOURCES += [
-         'nsWifiScannerWin.cpp',
diff --git a/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp b/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp
deleted file mode 100644
index c22f84d1c30..00000000000
--- a/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-$NetBSD: patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp,v 1.4 2014/03/20 21:02:00 ryoon Exp $
-
---- netwerk/wifi/nsWifiScannerFreeBSD.cpp.orig	2014-03-20 11:09:40.000000000 +0000
-+++ netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,167 @@
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+// Developed by J.R. Oldroyd <fbsd@opal.com>, December 2012.
-+
-+// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
-+// and then check for those with an 802.11 media type and able to return
-+// a list of stations. This is similar to ifconfig(8).
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#include <net/if_media.h>
-+#include <net80211/ieee80211_ioctl.h>
-+
-+#include <ifaddrs.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include "nsWifiAccessPoint.h"
-+
-+using namespace mozilla;
-+
-+static nsresult
-+FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints)
-+{
-+  // get list of interfaces
-+  struct ifaddrs *ifal;
-+  if (getifaddrs(&ifal) < 0) {
-+    return NS_ERROR_FAILURE;
-+  }
-+
-+  accessPoints.Clear();
-+
-+  // loop through the interfaces
-+  nsresult rv = NS_ERROR_FAILURE;
-+  struct ifaddrs *ifa;
-+  for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
-+    // limit to one interface per address
-+    if (ifa->ifa_addr->sa_family != AF_LINK) {
-+      continue;
-+    }
-+
-+    // store interface name in socket structure
-+    struct ifreq ifr;
-+    memset(&ifr, 0, sizeof(ifr));
-+    strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
-+    ifr.ifr_addr.sa_family = AF_LOCAL;
-+
-+    // open socket to interface
-+    int s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0);
-+    if (s < 0) {
-+      continue;
-+    }
-+
-+    // clear interface media structure
-+    struct ifmediareq ifmr;
-+    memset(&ifmr, 0, sizeof(ifmr));
-+    strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
-+
-+    // get interface media information
-+    if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+      close(s);
-+      continue;
-+    }
-+
-+    // check interface is a WiFi interface
-+    if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
-+      close(s);
-+      continue;
-+    }
-+
-+    // perform WiFi scan
-+    struct ieee80211req i802r;
-+    char iscanbuf[32*1024];
-+    memset(&i802r, 0, sizeof(i802r));
-+    strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
-+    i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
-+    i802r.i_data = iscanbuf;
-+    i802r.i_len = sizeof(iscanbuf);
-+    if (ioctl(s, SIOCG80211, &i802r) < 0) {
-+      close(s);
-+      continue;
-+    }
-+
-+    // close socket
-+    close(s);
-+
-+    // loop through WiFi networks and build geoloc-lookup structure
-+    char *vsr = (char *) i802r.i_data;
-+    unsigned len = i802r.i_len;
-+    while (len >= sizeof(struct ieee80211req_scan_result)) {
-+      struct ieee80211req_scan_result *isr =
-+        (struct ieee80211req_scan_result *) vsr;
-+
-+      // determine size of this entry
-+      char *id;
-+      int idlen;
-+      if (isr->isr_meshid_len) {
-+        id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
-+        idlen = isr->isr_meshid_len;
-+      } else {
-+        id = vsr + isr->isr_ie_off;
-+        idlen = isr->isr_ssid_len;
-+      }
-+
-+      // copy network data
-+      char ssid[IEEE80211_NWID_LEN+1];
-+      strncpy(ssid, id, idlen);
-+      ssid[idlen] = '\0';
-+      nsWifiAccessPoint *ap = new nsWifiAccessPoint();
-+      ap->setSSID(ssid, strlen(ssid));
-+      ap->setMac(isr->isr_bssid);
-+      ap->setSignal(isr->isr_rssi);
-+      accessPoints.AppendObject(ap);
-+      rv = NS_OK;
-+
-+      // log the data
-+      LOG(( "FreeBSD access point: "
-+            "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, "
-+            "Strength: %d, Channel: %dMHz\n",
-+            ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2],
-+            isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5],
-+            isr->isr_rssi, isr->isr_freq));
-+
-+      // increment pointers
-+      len -= isr->isr_len;
-+      vsr += isr->isr_len;
-+    }
-+  }
-+
-+  freeifaddrs(ifal);
-+
-+  return rv;
-+}
-+
-+nsresult
-+nsWifiMonitor::DoScan()
-+{
-+  // Regularly get the access point data.
-+
-+  nsCOMArray<nsWifiAccessPoint> lastAccessPoints;
-+  nsCOMArray<nsWifiAccessPoint> accessPoints;
-+
-+  do {
-+    nsresult rv = FreeBSDGetAccessPointData(accessPoints);
-+    if (NS_FAILED(rv))
-+      return rv;
-+
-+    bool accessPointsChanged = !AccessPointsEqual(accessPoints, lastAccessPoints);
-+    ReplaceArray(lastAccessPoints, accessPoints);
-+
-+    rv = CallWifiListeners(lastAccessPoints, accessPointsChanged);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    // wait for some reasonable amount of time. pref?
-+    LOG(("waiting on monitor\n"));
-+
-+    ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-+    mon.Wait(PR_SecondsToInterval(60));
-+  }
-+  while (mKeepGoing);
-+
-+  return NS_OK;
-+}
diff --git a/www/firefox/patches/patch-probes_Makefile.in b/www/firefox/patches/patch-probes_Makefile.in
new file mode 100644
index 00000000000..dc2effa3588
--- /dev/null
+++ b/www/firefox/patches/patch-probes_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-probes_Makefile.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- probes/Makefile.in.orig	2014-07-17 01:45:36.000000000 +0000
++++ probes/Makefile.in
+@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h
+ 
+ # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE
+ $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile
+-	dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
++	dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
+ 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
+ 	    mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h
+ 	rm mozilla-trace.h.tmp
diff --git a/www/firefox/patches/patch-storage_src_moz.build b/www/firefox/patches/patch-storage_src_moz.build
new file mode 100644
index 00000000000..9d3dda749eb
--- /dev/null
+++ b/www/firefox/patches/patch-storage_src_moz.build
@@ -0,0 +1,20 @@
+$NetBSD: patch-storage_src_moz.build,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+
+--- storage/src/moz.build.orig	2014-07-17 01:45:38.000000000 +0000
++++ storage/src/moz.build
+@@ -48,11 +48,14 @@ FINAL_LIBRARY = 'storagecomps'
+ # (such as NSS) might trigger an initialization of sqlite and allocation
+ # of memory using the default allocator, prior to the storage service
+ # registering its allocator, causing memory management failures (bug 938730).
++# However, this is not an issue if both the jemalloc allocator and the default
++# allocator are the same thing.
+ #
+ # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
+ # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
+ # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
+-if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']:
++if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
++                             or CONFIG['MOZ_NATIVE_JEMALLOC']):
+     if CONFIG['OS_TARGET'] != 'Android':
+         DEFINES['MOZ_STORAGE_MEMORY'] = True
+ 
diff --git a/www/firefox/patches/patch-toolkit_library_Makefile.in b/www/firefox/patches/patch-toolkit_library_libxul.mk
index 38fad7a1492..310a5beecae 100644
--- a/www/firefox/patches/patch-toolkit_library_Makefile.in
+++ b/www/firefox/patches/patch-toolkit_library_libxul.mk
@@ -1,15 +1,8 @@
-$NetBSD: patch-toolkit_library_Makefile.in,v 1.7 2014/05/30 03:03:36 pho Exp $
+$NetBSD: patch-toolkit_library_libxul.mk,v 1.1 2014/07/24 14:57:12 ryoon Exp $
 
-* It's true Mach-O systems aren't supported by
-  ${WRKSRC}/content/media/gstreamer/GStreamerLoader.cpp so
-  $(GSTREAMER_LIBS) must be directly appended to $(EXTRA_DSO_LDOPTS)
-  on such platforms. The problem is that "ifeq
-  (cocoa,$(MOZ_WIDGET_TOOLKIT))" ain't the right thing to do when
-  testing for Mach-O is what we need.
-
---- toolkit/library/Makefile.in.orig	2014-05-06 22:56:33.000000000 +0000
-+++ toolkit/library/Makefile.in
-@@ -149,6 +149,34 @@ ifdef MOZ_NATIVE_HUNSPELL
+--- toolkit/library/libxul.mk.orig	2014-07-17 01:45:41.000000000 +0000
++++ toolkit/library/libxul.mk
+@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL
  EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
  endif
  
@@ -44,7 +37,7 @@ $NetBSD: patch-toolkit_library_Makefile.in,v 1.7 2014/05/30 03:03:36 pho Exp $
  ifdef MOZ_NATIVE_LIBEVENT
  EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
  endif
-@@ -161,12 +189,24 @@ ifndef MOZ_TREE_PIXMAN
+@@ -89,12 +117,24 @@ ifndef MOZ_TREE_PIXMAN
  EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
  endif
  
@@ -68,8 +61,8 @@ $NetBSD: patch-toolkit_library_Makefile.in,v 1.7 2014/05/30 03:03:36 pho Exp $
 +
  ifdef MOZ_WEBRTC
  ifeq (WINNT,$(OS_TARGET))
- EXTRA_DSO_LDOPTS += \
-@@ -351,7 +391,7 @@ ifdef MOZ_ENABLE_QT
+ ifndef MOZ_HAS_WINSDK_WITH_D3D
+@@ -231,7 +271,7 @@ ifdef MOZ_ENABLE_QT
  EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS)
  endif
  
diff --git a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
index 6040c246d42..0a3c13c6b76 100644
--- a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
+++ b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-xpcom_base_nsUUIDGenerator.cpp,v 1.3 2014/06/11 00:41:36 ryoon Exp $
+$NetBSD: patch-xpcom_base_nsUUIDGenerator.cpp,v 1.4 2014/07/24 14:57:12 ryoon Exp $
 
---- xpcom/base/nsUUIDGenerator.cpp.orig	2014-05-29 23:31:50.000000000 +0000
+--- xpcom/base/nsUUIDGenerator.cpp.orig	2014-07-17 01:45:42.000000000 +0000
 +++ xpcom/base/nsUUIDGenerator.cpp
 @@ -15,6 +15,10 @@
  
@@ -12,7 +12,7 @@ $NetBSD: patch-xpcom_base_nsUUIDGenerator.cpp,v 1.3 2014/06/11 00:41:36 ryoon Ex
 +
  using namespace mozilla;
  
- NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator)
+ NS_IMPL_ISUPPORTS(nsUUIDGenerator, nsIUUIDGenerator)
 @@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
      // We're a service, so we're guaranteed that Init() is not going
      // to be reentered while we're inside Init().
author	ryoon <ryoon@pkgsrc.org>	2014-07-24 14:57:12 +0000
committer	ryoon <ryoon@pkgsrc.org>	2014-07-24 14:57:12 +0000
commit	3daa6120c58e4858c6f0c473cbaf357fd1a53142 (patch)
tree	21d8889fd8a6c2d9de3c44f317c8f30d2dab04c8 /www
parent	1e4177b1d038f3e44e60e1e6d2451584dd16ab9d (diff)
download	pkgsrc-3daa6120c58e4858c6f0c473cbaf357fd1a53142.tar.gz