Update to 51.0

Changelog: New Users can view passwords in the save password prompt before saving them Added a zoom button in the URL bar: Displays percent above or below 100 percent when a user has changed the page zoom setting from the default Lets users return to the default setting by clicking on the button Improved video performance for users without GPU acceleration for less CPU usage and a better full screen experience Firefox will save passwords even in forms that do not have “submit” events Added support for FLAC (Free Lossless Audio Codec) playback Added support for WebGL 2, with advanced graphics rendering features like transform feedback, improved texturing capabilities, and a new sophisticated shading language A warning is displayed when a login page does not have a secure connection Added Georgian (ka) and Kabyle (kab) locales An even faster E10s! Tab Switching is better! Improved reliability of browser data sync Remove Belarusian (be) locale Fixed Various security fixes Changed Use 2D graphics library (Skia) for content rendering on Linux Re-enabled E10s support for Russian (ru) locale Updated to NSS 3.28.1 Security fixes: #CVE-2017-5375: Excessive JIT code allocation allows bypass of ASLR and DEP #CVE-2017-5376: Use-after-free in XSL #CVE-2017-5377: Memory corruption with transforms to create gradients in Skia #CVE-2017-5378: Pointer and frame data leakage of Javascript objects #CVE-2017-5379: Use-after-free in Web Animations #CVE-2017-5380: Potential use-after-free during DOM manipulations #CVE-2017-5390: Insecure communication methods in Developer Tools JSON viewer #CVE-2017-5389: WebExtensions can install additional add-ons via modified host requests #CVE-2017-5396: Use-after-free with Media Decoder #CVE-2017-5381: Certificate Viewer exporting can be used to navigate and save to arbitrary filesystem locations #CVE-2017-5382: Feed preview can expose privileged content errors and exceptions #CVE-2017-5383: Location bar spoofing with unicode characters #CVE-2017-5384: Information disclosure via Proxy Auto-Config (PAC) #CVE-2017-5385: Data sent in multipart channels ignores referrer-policy response headers #CVE-2017-5386: WebExtensions can use data: protocol to affect other extensions #CVE-2017-5394: Android location bar spoofing using fullscreen and JavaScript events #CVE-2017-5391: Content about: pages can load privileged about: pages #CVE-2017-5392: Weak references using multiple threads on weak proxy objects lead to unsafe memory usage #CVE-2017-5393: Remove addons.mozilla.org CDN from whitelist for mozAddonManager #CVE-2017-5395: Android location bar spoofing during scrolling #CVE-2017-5387: Disclosure of local file existence through TRACK tag error messages #CVE-2017-5388: WebRTC can be used to generate a large amount of UDP traffic for DDOS attacks #CVE-2017-5374: Memory safety bugs fixed in Firefox 51 #CVE-2017-5373: Memory safety bugs fixed in Firefox 51 and Firefox ESR 45.7
author: ryoon <ryoon@pkgsrc.org> 2017-01-25 13:24:51 +0000
committer: ryoon <ryoon@pkgsrc.org> 2017-01-25 13:24:51 +0000
commit: 09d3a395f93e4a2f0358d05e16e068a12624f871 (patch)
tree: c53612d38218d056ff3d1d8c1b92561d26ee83ca
parent: 965b4f4ea409dcf8b3b6183028c580a760190953 (diff)
download: pkgsrc-09d3a395f93e4a2f0358d05e16e068a12624f871.tar.gz
33 files changed, 518 insertions, 498 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index b25ce697704..5f03e4135ba 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.278 2017/01/21 20:06:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.279 2017/01/25 13:24:51 ryoon Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=		50.1
-MOZ_BRANCH_MINOR=	.0
+MOZ_BRANCH=		51.0
+MOZ_BRANCH_MINOR=	
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=	3
 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 0f4d4afb8c5..900693cccf3 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.114 2016/12/18 01:31:00 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.115 2017/01/25 13:24:51 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -103,7 +103,6 @@ lib/firefox/browser/chrome/browser/content/browser/browser-trackingprotection.js
 lib/firefox/browser/chrome/browser/content/browser/browser.css
 lib/firefox/browser/chrome/browser/content/browser/browser.js
 lib/firefox/browser/chrome/browser/content/browser/browser.xul
-lib/firefox/browser/chrome/browser/content/browser/chatWindow.xul
 lib/firefox/browser/chrome/browser/content/browser/content-UITour.js
 lib/firefox/browser/chrome/browser/content/browser/content-sessionStore.js
 lib/firefox/browser/chrome/browser/content/browser/content.js
@@ -148,6 +147,7 @@ lib/firefox/browser/chrome/browser/content/browser/downloads/indicator.js
 lib/firefox/browser/chrome/browser/content/browser/downloads/indicatorOverlay.xul
 lib/firefox/browser/chrome/browser/content/browser/ext-bookmarks.js
 lib/firefox/browser/chrome/browser/content/browser/ext-browserAction.js
+lib/firefox/browser/chrome/browser/content/browser/ext-c-tabs.js
 lib/firefox/browser/chrome/browser/content/browser/ext-commands.js
 lib/firefox/browser/chrome/browser/content/browser/ext-contextMenus.js
 lib/firefox/browser/chrome/browser/content/browser/ext-desktop-runtime.js
@@ -167,9 +167,9 @@ 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
 lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png
-lib/firefox/browser/chrome/browser/content/browser/migration/automigration.properties
 lib/firefox/browser/chrome/browser/content/browser/migration/migration.js
 lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul
+lib/firefox/browser/chrome/browser/content/browser/newtab/alternativeDefaultSites.json
 lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.css
 lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.inadjacent.json
 lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.js
@@ -261,8 +261,6 @@ lib/firefox/browser/chrome/browser/content/browser/search/searchbarBindings.css
 lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.js
 lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.xul
 lib/firefox/browser/chrome/browser/content/browser/social-content.js
-lib/firefox/browser/chrome/browser/content/browser/socialchat.xml
-lib/firefox/browser/chrome/browser/content/browser/socialmarks.xml
 lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs-bindings.xml
 lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.css
 lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.js
@@ -324,16 +322,17 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme
 lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/cert-error.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/click-to-play-warning-stripes.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-active-loaded.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-passive-loaded.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/connection-secure.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/content-contextmenu.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/arrow-subview-back.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/arrow-subview.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/conn-degraded.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/conn-not-secure.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/conn-secure.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/connection.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/mcb-disabled.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/panel.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/permissions.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/tracking-protection-disabled.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/tracking-protection.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/warning-gray.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/warning-yellow.svg
@@ -369,8 +368,9 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-block
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow-menuPanel.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-finish.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-start.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-summary.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-summary.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/downloads.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/menubutton-dropmarker.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/drm-icon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/error-pages.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/favicon-search-16.svg
@@ -391,15 +391,12 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/logo@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/gear.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-icon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-star-lit.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-star-off.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/icon-search-64.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/identity-mixed-active-loaded.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/identity-mixed-passive-loaded.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/identity-not-secure.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/identity-secure.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize@2x.png
@@ -407,10 +404,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-exit.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-exit@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help@2x.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-small.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-small@2x.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-small.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/monitor.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/monitor_16-10.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/close.png
@@ -482,7 +477,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/searchbar.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/session-restore.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/social/chat-icons.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/social/gear_clicked.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/social/gear_default.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-16.png
@@ -539,8 +533,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-st
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/theme-switcher-icon.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/theme-switcher-icon@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/toolbarbutton-dropdown-arrow.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tracking-protection-16.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tracking-protection-disabled-16.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16.png
@@ -580,6 +574,28 @@ lib/firefox/browser/chrome/devtools/content/debugger/debugger-controller.js
 lib/firefox/browser/chrome/devtools/content/debugger/debugger-view.js
 lib/firefox/browser/chrome/devtools/content/debugger/debugger.css
 lib/firefox/browser/chrome/devtools/content/debugger/debugger.xul
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/angle-brackets.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/arrow.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/blackBox.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/breakpoint.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/close.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/disableBreakpoints.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/domain.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/file.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/folder.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/globe.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/pause-circle.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/pause.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/play.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/prettyPrint.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/resume.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/settings.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/stepIn.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/stepOut.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/stepOver.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/subSettings.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/images/worker.svg
+lib/firefox/browser/chrome/devtools/content/debugger/new/index.html
 lib/firefox/browser/chrome/devtools/content/debugger/utils.js
 lib/firefox/browser/chrome/devtools/content/debugger/views/filter-view.js
 lib/firefox/browser/chrome/devtools/content/debugger/views/global-search-view.js
@@ -608,9 +624,7 @@ lib/firefox/browser/chrome/devtools/content/framework/toolbox-process-window.xul
 lib/firefox/browser/chrome/devtools/content/framework/toolbox-window.xul
 lib/firefox/browser/chrome/devtools/content/framework/toolbox.xul
 lib/firefox/browser/chrome/devtools/content/inspector/fonts/fonts.js
-lib/firefox/browser/chrome/devtools/content/inspector/inspector.css
 lib/firefox/browser/chrome/devtools/content/inspector/inspector.xul
-lib/firefox/browser/chrome/devtools/content/inspector/layout/layout.js
 lib/firefox/browser/chrome/devtools/content/inspector/markup/markup.xhtml
 lib/firefox/browser/chrome/devtools/content/memory/initializer.js
 lib/firefox/browser/chrome/devtools/content/memory/memory.xhtml
@@ -657,36 +671,13 @@ lib/firefox/browser/chrome/devtools/content/shared/widgets/graphs-frame.xhtml
 lib/firefox/browser/chrome/devtools/content/shared/widgets/mdn-docs.css
 lib/firefox/browser/chrome/devtools/content/shared/widgets/spectrum.css
 lib/firefox/browser/chrome/devtools/content/shared/widgets/widgets.css
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/comment/comment.js
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/dialog/dialog.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/edit/closebrackets.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/edit/matchbrackets.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/edit/trailingspace.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/brace-fold.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/comment-fold.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/foldcode.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/foldgutter.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/xml-fold.js
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/hint/show-hint.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/search/search.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/search/searchcursor.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/selection/active-line.js
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/tern/tern.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/emacs.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/sublime.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/vim.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/codemirror.bundle.js
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/lib/codemirror.css
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/lib/codemirror.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/clike.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/css.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/htmlmixed.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/javascript.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/wasm.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/xml.js
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mozilla.css
 lib/firefox/browser/chrome/devtools/content/storage/storage.xul
-lib/firefox/browser/chrome/devtools/content/styleeditor/styleeditor.css
 lib/firefox/browser/chrome/devtools/content/styleeditor/styleeditor.xul
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/controller.js
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/includes.js
@@ -740,6 +731,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/uti
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/views/event-listeners-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/views/sources-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/debugger-commands.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/bundle.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/pretty-print-worker.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/source-map-worker.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/styles.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/definitions.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/filter.js
@@ -782,6 +778,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-ho
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/breadcrumbs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/box-model.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
@@ -789,7 +786,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/font
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-search.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/html-editor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/element-style.js
@@ -891,6 +887,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/toolb
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations-item.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/recording-button.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/recording-controls.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/events.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/actors.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/compatibility.js
@@ -909,6 +907,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-dom-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-formatters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/markers.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/graphs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/marker-details.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/marker-view.js
@@ -1001,7 +1000,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpa
 lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shadereditor/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/AppCacheUtils.jsm
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/Curl.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/DOMHelpers.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/Jsbeautify.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/SplitView.jsm
@@ -1052,6 +1050,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tr
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-angle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-reload.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/curl.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/demangle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/developer-toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/devices.js
@@ -1063,7 +1062,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/frame-script-
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/getjson.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/inplace-editor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/key-shortcuts.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/l10n.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/keycodes.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/node-attribute-parser.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/options-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/output-parser.js
@@ -1077,6 +1076,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middlew
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/thunk.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/wait-service.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/non-react-subscriber.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/scroll.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/shim/Services.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/suggestion-picker.js
@@ -1121,6 +1121,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/toolt
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/EventTooltipHelper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/TooltipToggle.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/VariableContentHelper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/view-helpers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/zoom-keys.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/sourceeditor/autocomplete.js
@@ -1175,8 +1176,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/net-r
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/events.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/json.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/net.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/filters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/messages.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/ui.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/collapse-button.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/console-output.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-bar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-button.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/grip-message-body.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-container.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-icon.js
@@ -1190,16 +1196,23 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-conso
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/main.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/filters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/prefs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/reducers/ui.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/filters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/prefs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/ui.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/store.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/types.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/id-generator.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/variables-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/addons.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-manager.js
@@ -1230,6 +1243,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/csscoverage.j
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/device.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-registry.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/emulation.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/environment.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/errordocs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/eventlooplag.js
@@ -1241,6 +1255,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters.
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/auto-refresh.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/css-grid.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/css-transform.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/eye-dropper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/geometry-editor.js
@@ -1281,6 +1296,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-de
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-worker-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webapps.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webaudio.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webbrowser.js
@@ -1302,6 +1319,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/timeline
 lib/firefox/browser/chrome/devtools/modules/devtools/server/primitive.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/protocol.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/service-worker-child.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/websocket-server.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/worker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/DevToolsUtils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/Loader.jsm
@@ -1316,17 +1334,19 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/builtin-modules.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/connection-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/main.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/content-observer.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/css-color-db.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/css-color.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/css-lexer.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/css-parsing-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/css-properties-db.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/color-db.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/color.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/generated/properties-db.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/lexer.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/parsing-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/properties-db.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/defer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/deprecated-sync-thenables.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/discovery/discovery.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/dom-node-constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/dom-node-filter-constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/event-emitter.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/flags.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/actor-registry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/addons.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/animation.js
@@ -1337,6 +1357,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/csscoverage.j
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/device.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/director-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/director-registry.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/emulation.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/eventlooplag.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/framerate.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/gcli.js
@@ -1344,6 +1365,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/highlighters.
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/inspector.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/memory.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance-entries.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance-recording.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/preference.js
@@ -1457,10 +1479,18 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beaut
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-html.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-js.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-tests.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/l10n.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/layout/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/loader-plugin-raw.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/node-properties/node-properties.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/path.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/performance/recording-common.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/performance/recording-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/chrome/clipboard.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/chrome/stack.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/content/clipboard.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/content/stack.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/plural-form.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/pretty-fast/pretty-fast.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/protocol.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/qrcode/decoder/index.js
@@ -1482,6 +1512,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/csscoverage.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/device.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/director-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/director-registry.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/emulation.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/environment.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/eventlooplag.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/frame.js
@@ -1493,6 +1524,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/inspector.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/memory.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/node.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance-entries.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance-recording.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/preference.js
@@ -1510,25 +1542,28 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/timeline.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webaudio.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webgl.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/worker.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/sprintfjs/sprintf.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/system.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/task.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator-content.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator-core.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/packets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/stream-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/transport.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/websocket-transport.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/client.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/js-property-provider.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/network-helper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/network-monitor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/server-logger-monitor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/server-logger.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/worker-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/webconsole/throttle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/worker/helper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/worker/loader.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/worker/worker.js
 lib/firefox/browser/chrome/devtools/skin/animationinspector.css
+lib/firefox/browser/chrome/devtools/skin/boxmodel.css
 lib/firefox/browser/chrome/devtools/skin/canvasdebugger.css
 lib/firefox/browser/chrome/devtools/skin/commandline.css
 lib/firefox/browser/chrome/devtools/skin/common.css
@@ -1539,7 +1574,6 @@ lib/firefox/browser/chrome/devtools/skin/dark-theme.css
 lib/firefox/browser/chrome/devtools/skin/debugger.css
 lib/firefox/browser/chrome/devtools/skin/devtools-browser.css
 lib/firefox/browser/chrome/devtools/skin/dom.css
-lib/firefox/browser/chrome/devtools/skin/eyedropper.css
 lib/firefox/browser/chrome/devtools/skin/firebug-theme.css
 lib/firefox/browser/chrome/devtools/skin/floating-scrollbars-dark-theme.css
 lib/firefox/browser/chrome/devtools/skin/floating-scrollbars-responsive-design.css
@@ -1723,7 +1757,6 @@ lib/firefox/browser/chrome/devtools/skin/images/vview-open-inspector@2x.png
 lib/firefox/browser/chrome/devtools/skin/images/webconsole.svg
 lib/firefox/browser/chrome/devtools/skin/inspector.css
 lib/firefox/browser/chrome/devtools/skin/jit-optimizations.css
-lib/firefox/browser/chrome/devtools/skin/layout.css
 lib/firefox/browser/chrome/devtools/skin/light-theme.css
 lib/firefox/browser/chrome/devtools/skin/markup.css
 lib/firefox/browser/chrome/devtools/skin/memory.css
@@ -1853,7 +1886,6 @@ lib/firefox/browser/chrome/en-US/locale/browser/webrtcIndicator.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/VariablesView.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/aboutdebugging.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/aboutdebugging.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/animationinspector.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/animationinspector.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/app-manager.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/appcacheutils.properties
@@ -1885,7 +1917,6 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/performance.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/performance.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/projecteditor.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/promisedebugger.dtd
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/promisedebugger.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/responsive.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/responsiveUI.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/scratchpad.dtd
@@ -1895,6 +1926,7 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/shadereditor.prope
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/shared.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/sourceeditor.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/sourceeditor.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/startup.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/storage.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/storage.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.dtd
@@ -1913,6 +1945,7 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/csscoverage.proper
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/debugger.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/gcli.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/gclicommands.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/shared.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/styleinspector.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/chrome.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/viewer.properties
@@ -2270,6 +2303,7 @@ lib/firefox/browser/features/e10srollout@mozilla.org/bootstrap.js
 lib/firefox/browser/features/e10srollout@mozilla.org/install.rdf
 lib/firefox/browser/features/firefox@getpocket.com/bootstrap.js
 lib/firefox/browser/features/firefox@getpocket.com/chrome.manifest
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/AboutPocket.jsm
 lib/firefox/browser/features/firefox@getpocket.com/chrome/content/Pocket.jsm
 lib/firefox/browser/features/firefox@getpocket.com/chrome/content/main.js
 lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/css/firasans.css
@@ -2318,6 +2352,7 @@ lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/sa
 lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/signup_shell.handlebars
 lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/signupstoryboard_shell.handlebars
 lib/firefox/browser/features/firefox@getpocket.com/chrome/content/pktApi.jsm
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/pocket-content-process.js
 lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/Toolbar-inverted.png
 lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/Toolbar-inverted@2x.png
 lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/Toolbar.png
@@ -2365,7 +2400,6 @@ lib/firefox/browser/modules/BrowserUITelemetry.jsm
 lib/firefox/browser/modules/BrowserUsageTelemetry.jsm
 lib/firefox/browser/modules/CaptivePortalWatcher.jsm
 lib/firefox/browser/modules/CastingApps.jsm
-lib/firefox/browser/modules/Chat.jsm
 lib/firefox/browser/modules/ContentClick.jsm
 lib/firefox/browser/modules/ContentCrashHandlers.jsm
 lib/firefox/browser/modules/ContentLinkHandler.jsm
@@ -2394,7 +2428,6 @@ lib/firefox/browser/modules/NewTabRemoteResources.jsm
 lib/firefox/browser/modules/NewTabSearchProvider.jsm
 lib/firefox/browser/modules/NewTabURL.jsm
 lib/firefox/browser/modules/NewTabWebChannel.jsm
-lib/firefox/browser/modules/PanelFrame.jsm
 lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
 lib/firefox/browser/modules/PlacesProvider.jsm
 lib/firefox/browser/modules/PlacesUIUtils.jsm
@@ -2410,9 +2443,11 @@ lib/firefox/browser/modules/SelfSupportBackend.jsm
 lib/firefox/browser/modules/ShellService.jsm
 lib/firefox/browser/modules/SitePermissions.jsm
 lib/firefox/browser/modules/Social.jsm
+lib/firefox/browser/modules/SocialService.jsm
 lib/firefox/browser/modules/TabGroupsMigrator.jsm
 lib/firefox/browser/modules/TransientPrefs.jsm
 lib/firefox/browser/modules/UITour.jsm
+lib/firefox/browser/modules/URLBarZoom.jsm
 lib/firefox/browser/modules/devtools/client/framework/gDevTools.jsm
 lib/firefox/browser/modules/devtools/gDevTools.jsm
 lib/firefox/browser/modules/distribution.js
@@ -2566,7 +2601,6 @@ lib/firefox/chrome/en-US/locale/en-US/global/tree.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/videocontrols.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/viewSource.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/viewSource.properties
-lib/firefox/chrome/en-US/locale/en-US/global/webapps.properties
 lib/firefox/chrome/en-US/locale/en-US/global/wizard.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/wizard.properties
 lib/firefox/chrome/en-US/locale/en-US/global/xbl.properties
@@ -2612,14 +2646,6 @@ lib/firefox/chrome/en-US/locale/en-US/places/places.properties
 lib/firefox/chrome/en-US/locale/en-US/pluginproblem/pluginproblem.dtd
 lib/firefox/chrome/en-US/locale/en-US/services/errors.properties
 lib/firefox/chrome/en-US/locale/en-US/services/sync.properties
-lib/firefox/chrome/marionette/content/Assert.jsm
-lib/firefox/chrome/marionette/content/ChromePowers.js
-lib/firefox/chrome/marionette/content/MockColorPicker.jsm
-lib/firefox/chrome/marionette/content/MockFilePicker.jsm
-lib/firefox/chrome/marionette/content/MockPermissionPrompt.jsm
-lib/firefox/chrome/marionette/content/MozillaLogger.js
-lib/firefox/chrome/marionette/content/SpecialPowersObserver.jsm
-lib/firefox/chrome/marionette/content/SpecialPowersObserverAPI.js
 lib/firefox/chrome/marionette/content/accessibility.js
 lib/firefox/chrome/marionette/content/action.js
 lib/firefox/chrome/marionette/content/atom.js
@@ -2634,6 +2660,7 @@ lib/firefox/chrome/marionette/content/evaluate.js
 lib/firefox/chrome/marionette/content/event.js
 lib/firefox/chrome/marionette/content/frame.js
 lib/firefox/chrome/marionette/content/interaction.js
+lib/firefox/chrome/marionette/content/legacyaction.js
 lib/firefox/chrome/marionette/content/listener.js
 lib/firefox/chrome/marionette/content/logging.js
 lib/firefox/chrome/marionette/content/message.js
@@ -2642,8 +2669,6 @@ lib/firefox/chrome/marionette/content/navigate.js
 lib/firefox/chrome/marionette/content/proxy.js
 lib/firefox/chrome/marionette/content/server.js
 lib/firefox/chrome/marionette/content/simpletest.js
-lib/firefox/chrome/marionette/content/specialpowers.js
-lib/firefox/chrome/marionette/content/specialpowersAPI.js
 lib/firefox/chrome/pippki/content/pippki/CAOverlay.xul
 lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul
 lib/firefox/chrome/pippki/content/pippki/OrphanOverlay.xul
@@ -2688,11 +2713,14 @@ lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.js
 lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.xul
 lib/firefox/chrome/toolkit/content/extensions/ext-alarms.js
 lib/firefox/chrome/toolkit/content/extensions/ext-backgroundPage.js
+lib/firefox/chrome/toolkit/content/extensions/ext-c-extension.js
+lib/firefox/chrome/toolkit/content/extensions/ext-c-runtime.js
 lib/firefox/chrome/toolkit/content/extensions/ext-cookies.js
 lib/firefox/chrome/toolkit/content/extensions/ext-downloads.js
 lib/firefox/chrome/toolkit/content/extensions/ext-extension.js
 lib/firefox/chrome/toolkit/content/extensions/ext-i18n.js
 lib/firefox/chrome/toolkit/content/extensions/ext-idle.js
+lib/firefox/chrome/toolkit/content/extensions/ext-management.js
 lib/firefox/chrome/toolkit/content/extensions/ext-notifications.js
 lib/firefox/chrome/toolkit/content/extensions/ext-runtime.js
 lib/firefox/chrome/toolkit/content/extensions/ext-storage.js
@@ -2703,10 +2731,12 @@ lib/firefox/chrome/toolkit/content/extensions/schemas/alarms.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/cookies.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/downloads.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/events.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/experiments.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/extension.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/extension_types.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/i18n.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/idle.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/management.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/manifest.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/native_host_manifest.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/notifications.json
@@ -2941,12 +2971,8 @@ lib/firefox/chrome/toolkit/content/mozapps/xpinstall/xpinstallConfirm.css
 lib/firefox/chrome/toolkit/content/mozapps/xpinstall/xpinstallConfirm.js
 lib/firefox/chrome/toolkit/content/mozapps/xpinstall/xpinstallConfirm.xul
 lib/firefox/chrome/toolkit/content/mozapps/xpinstall/xpinstallItem.xml
-lib/firefox/chrome/toolkit/content/passwordmgr/login.xml
 lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.js
 lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.xul
-lib/firefox/chrome/toolkit/content/passwordmgr/passwordManagerCommon.js
-lib/firefox/chrome/toolkit/content/passwordmgr/passwordManagerExceptions.js
-lib/firefox/chrome/toolkit/content/passwordmgr/passwordManagerExceptions.xul
 lib/firefox/chrome/toolkit/content/passwordmgr/recipes.json
 lib/firefox/chrome/toolkit/content/satchel/formSubmitListener.js
 lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.css
@@ -3079,8 +3105,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/information-24.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/information-32.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/loading.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/loading@2x.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/panelarrow-horizontal.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/panelarrow-vertical.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/question-16.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/question-64.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/resizer-rtl.png
@@ -3157,10 +3181,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/popup.css
 lib/firefox/chrome/toolkit/skin/classic/global/preferences.css
 lib/firefox/chrome/toolkit/skin/classic/global/printPageSetup.css
 lib/firefox/chrome/toolkit/skin/classic/global/printPreview.css
-lib/firefox/chrome/toolkit/skin/classic/global/printpreview/arrow-left-end.png
-lib/firefox/chrome/toolkit/skin/classic/global/printpreview/arrow-left.png
-lib/firefox/chrome/toolkit/skin/classic/global/printpreview/arrow-right-end.png
-lib/firefox/chrome/toolkit/skin/classic/global/printpreview/arrow-right.png
 lib/firefox/chrome/toolkit/skin/classic/global/progressmeter.css
 lib/firefox/chrome/toolkit/skin/classic/global/radio.css
 lib/firefox/chrome/toolkit/skin/classic/global/radio/radio-check-dis.gif
@@ -3203,11 +3223,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/tree/sort-dsc.png
 lib/firefox/chrome/toolkit/skin/classic/global/tree/twisty-clsd.png
 lib/firefox/chrome/toolkit/skin/classic/global/tree/twisty-open.png
 lib/firefox/chrome/toolkit/skin/classic/global/wizard.css
-lib/firefox/chrome/toolkit/skin/classic/help/Toolbar-rtl.png
-lib/firefox/chrome/toolkit/skin/classic/help/Toolbar.png
-lib/firefox/chrome/toolkit/skin/classic/help/Weblink-rtl.png
-lib/firefox/chrome/toolkit/skin/classic/help/Weblink.png
-lib/firefox/chrome/toolkit/skin/classic/help/helpFileLayout.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutNetworking.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutProfiles.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutServiceWorkers.css
@@ -3272,7 +3287,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/update/updates.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
-lib/firefox/components/AlarmsManager.js
 lib/firefox/components/AppsService.js
 lib/firefox/components/BrowserElementParent.js
 lib/firefox/components/BrowserElementProxy.js
@@ -3298,8 +3312,6 @@ lib/firefox/components/PACGenerator.js
 lib/firefox/components/PackagedAppUtils.js
 lib/firefox/components/PageIconProtocolHandler.js
 lib/firefox/components/PageThumbsProtocol.js
-lib/firefox/components/Payment.js
-lib/firefox/components/PaymentFlowInfo.js
 lib/firefox/components/PermissionSettings.js
 lib/firefox/components/PhoneNumberService.js
 lib/firefox/components/PlacesCategoriesStarter.js
@@ -3321,6 +3333,7 @@ lib/firefox/components/UnifiedComplete.js
 lib/firefox/components/Weave.js
 lib/firefox/components/WebVTTParserWrapper.js
 lib/firefox/components/Webapps.js
+lib/firefox/components/WellKnownOpportunisticUtils.js
 lib/firefox/components/XULStore.js
 lib/firefox/components/addonManager.js
 lib/firefox/components/amContentHandler.js
@@ -3334,7 +3347,7 @@ lib/firefox/components/crypto-SDR.js
 lib/firefox/components/defaultShims.js
 lib/firefox/components/htmlMenuBuilder.js
 lib/firefox/components/interfaces.xpt
-lib/firefox/components/marionettecomponent.js
+lib/firefox/components/marionette.js
 lib/firefox/components/messageWakeupService.js
 lib/firefox/components/multiprocessShims.js
 lib/firefox/components/nsAsyncShutdown.js
@@ -3343,6 +3356,7 @@ lib/firefox/components/nsBlocklistServiceContent.js
 lib/firefox/components/nsContentDispatchChooser.js
 lib/firefox/components/nsContentPrefService.js
 lib/firefox/components/nsCrashMonitor.js
+lib/firefox/components/nsDNSServiceDiscovery.js
 lib/firefox/components/nsDefaultCLH.js
 lib/firefox/components/nsFilePicker.js
 lib/firefox/components/nsFormAutoComplete.js
@@ -3427,8 +3441,6 @@ lib/firefox/libxul.so
 lib/firefox/modules/AboutReader.jsm
 lib/firefox/modules/AddonManager.jsm
 lib/firefox/modules/AddonWatcher.jsm
-lib/firefox/modules/AlarmDB.jsm
-lib/firefox/modules/AlarmService.jsm
 lib/firefox/modules/AppConstants.jsm
 lib/firefox/modules/AppDownloadManager.jsm
 lib/firefox/modules/AppsServiceChild.jsm
@@ -3436,7 +3448,7 @@ lib/firefox/modules/AppsUtils.jsm
 lib/firefox/modules/AsyncPrefs.jsm
 lib/firefox/modules/AsyncShutdown.jsm
 lib/firefox/modules/AsyncSpellCheckTestHelper.jsm
-lib/firefox/modules/AutoCompleteE10S.jsm
+lib/firefox/modules/AutoCompletePopup.jsm
 lib/firefox/modules/BackgroundPageThumbs.jsm
 lib/firefox/modules/Battery.jsm
 lib/firefox/modules/BinarySearch.jsm
@@ -3498,6 +3510,7 @@ lib/firefox/modules/DownloadUIHelper.jsm
 lib/firefox/modules/DownloadUtils.jsm
 lib/firefox/modules/Downloads.jsm
 lib/firefox/modules/Extension.jsm
+lib/firefox/modules/ExtensionAPI.jsm
 lib/firefox/modules/ExtensionContent.jsm
 lib/firefox/modules/ExtensionManagement.jsm
 lib/firefox/modules/ExtensionStorage.jsm
@@ -3543,7 +3556,6 @@ lib/firefox/modules/LightweightThemeManager.jsm
 lib/firefox/modules/LoadContextInfo.jsm
 lib/firefox/modules/Locale.jsm
 lib/firefox/modules/Log.jsm
-lib/firefox/modules/LoginDoorhangers.jsm
 lib/firefox/modules/LoginHelper.jsm
 lib/firefox/modules/LoginImport.jsm
 lib/firefox/modules/LoginManagerContent.jsm
@@ -3555,10 +3567,11 @@ lib/firefox/modules/ManifestFinder.jsm
 lib/firefox/modules/ManifestObtainer.jsm
 lib/firefox/modules/ManifestProcessor.jsm
 lib/firefox/modules/MatchPattern.jsm
+lib/firefox/modules/Memory.jsm
 lib/firefox/modules/MessageBroadcaster.jsm
 lib/firefox/modules/MessageChannel.jsm
-lib/firefox/modules/MozSocialAPI.jsm
 lib/firefox/modules/MulticastDNS.jsm
+lib/firefox/modules/NLP.jsm
 lib/firefox/modules/NativeMessaging.jsm
 lib/firefox/modules/NetUtil.jsm
 lib/firefox/modules/NewTabUtils.jsm
@@ -3572,7 +3585,6 @@ lib/firefox/modules/PageMetadata.jsm
 lib/firefox/modules/PageThumbUtils.jsm
 lib/firefox/modules/PageThumbs.jsm
 lib/firefox/modules/PageThumbsWorker.js
-lib/firefox/modules/Payment.jsm
 lib/firefox/modules/PerfMeasurement.jsm
 lib/firefox/modules/PerformanceStats-content.js
 lib/firefox/modules/PerformanceStats.jsm
@@ -3590,6 +3602,7 @@ lib/firefox/modules/PlacesBackups.jsm
 lib/firefox/modules/PlacesDBUtils.jsm
 lib/firefox/modules/PlacesRemoteTabsAutocompleteProvider.jsm
 lib/firefox/modules/PlacesSearchAutocompleteProvider.jsm
+lib/firefox/modules/PlacesSyncUtils.jsm
 lib/firefox/modules/PlacesTransactions.jsm
 lib/firefox/modules/PlacesUtils.jsm
 lib/firefox/modules/PluralForm.jsm
@@ -3633,6 +3646,7 @@ lib/firefox/modules/SearchStaticData.jsm
 lib/firefox/modules/SearchSuggestionController.jsm
 lib/firefox/modules/SelectContentHelper.jsm
 lib/firefox/modules/SelectParentHelper.jsm
+lib/firefox/modules/ServiceRequest.jsm
 lib/firefox/modules/Services.jsm
 lib/firefox/modules/SessionRecorder.jsm
 lib/firefox/modules/SettingsDB.jsm
@@ -3642,7 +3656,6 @@ lib/firefox/modules/ShimWaiver.jsm
 lib/firefox/modules/ShortcutUtils.jsm
 lib/firefox/modules/SimpleServiceDiscovery.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
@@ -3693,6 +3706,7 @@ lib/firefox/modules/accessibility/PointerAdapter.jsm
 lib/firefox/modules/accessibility/Presentation.jsm
 lib/firefox/modules/accessibility/Traversal.jsm
 lib/firefox/modules/accessibility/Utils.jsm
+lib/firefox/modules/addons/APIExtensionBootstrap.js
 lib/firefox/modules/addons/AddonConstants.jsm
 lib/firefox/modules/addons/AddonLogging.jsm
 lib/firefox/modules/addons/AddonRepository.jsm
@@ -3873,8 +3887,6 @@ lib/firefox/modules/commonjs/sdk/stylesheet/utils.js
 lib/firefox/modules/commonjs/sdk/system.js
 lib/firefox/modules/commonjs/sdk/system/child_process.js
 lib/firefox/modules/commonjs/sdk/system/child_process/subprocess.js
-lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_unix.js
-lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_win.js
 lib/firefox/modules/commonjs/sdk/system/environment.js
 lib/firefox/modules/commonjs/sdk/system/events-shimmed.js
 lib/firefox/modules/commonjs/sdk/system/events.js
@@ -3945,6 +3957,7 @@ lib/firefox/modules/commonjs/sdk/util/rules.js
 lib/firefox/modules/commonjs/sdk/util/sequence.js
 lib/firefox/modules/commonjs/sdk/util/uuid.js
 lib/firefox/modules/commonjs/sdk/view/core.js
+lib/firefox/modules/commonjs/sdk/webextension.js
 lib/firefox/modules/commonjs/sdk/window/browser.js
 lib/firefox/modules/commonjs/sdk/window/events.js
 lib/firefox/modules/commonjs/sdk/window/helpers.js
@@ -4011,6 +4024,7 @@ lib/firefox/modules/osfile/ospath_win.jsm
 lib/firefox/modules/presentation/ControllerStateMachine.jsm
 lib/firefox/modules/presentation/ReceiverStateMachine.jsm
 lib/firefox/modules/presentation/StateMachineHelper.jsm
+lib/firefox/modules/psm/DER.jsm
 lib/firefox/modules/reader/JSDOMParser.js
 lib/firefox/modules/reader/Readability.js
 lib/firefox/modules/reader/ReaderWorker.js
@@ -4040,6 +4054,7 @@ lib/firefox/modules/services-sync/addonutils.js
 lib/firefox/modules/services-sync/bookmark_utils.js
 lib/firefox/modules/services-sync/bookmark_validator.js
 lib/firefox/modules/services-sync/browserid_identity.js
+lib/firefox/modules/services-sync/collection_validator.js
 lib/firefox/modules/services-sync/constants.js
 lib/firefox/modules/services-sync/engines.js
 lib/firefox/modules/services-sync/engines/addons.js
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 4916be7250a..b3adc8beef6 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,36 +1,38 @@
-$NetBSD: distinfo,v 1.266 2017/01/20 15:03:36 ryoon Exp $
+$NetBSD: distinfo,v 1.267 2017/01/25 13:24:51 ryoon Exp $
 
-SHA1 (firefox-50.1.0.source.tar.xz) = 6024dc49a566ed6296ad6cd707a199d41f090176
-RMD160 (firefox-50.1.0.source.tar.xz) = 8931f3ad4e8a2543b8cfc1c191289b5897e081de
-SHA512 (firefox-50.1.0.source.tar.xz) = 370d2e9b8c4b1b59c3394659c3a7f0f79e6a911ccd9f32095b50b3a22d087132b1f7cb87b734f7497c4381b1df6df80d120b4b87c13eecc425cc66f56acccba5
-Size (firefox-50.1.0.source.tar.xz) = 195823768 bytes
-SHA1 (patch-aa) = 272331d89f966ea83c4ee3a49b1933b9ce31672b
+SHA1 (firefox-51.0.source.tar.xz) = e7219a81b16d34d92872b4604051ce5ddb818126
+RMD160 (firefox-51.0.source.tar.xz) = e6552e5cbc71edc3028dc11271822a598e243ce6
+SHA512 (firefox-51.0.source.tar.xz) = 4406f840a7a2b4e76a74e846d702b717618fb5b677f1c6df864c3428033dd22aad295d656f1fc57e581fd202d894c5483a16691a60b6ca7710315b157b812467
+Size (firefox-51.0.source.tar.xz) = 202517224 bytes
+SHA1 (patch-aa) = 42dbb30745fc0e40cf582376c8fbfcd0715fcf5e
 SHA1 (patch-ao) = 1564bc503670dc07ec8b9b43927f0c5879f3a44d
-SHA1 (patch-as) = bebba8483c1881198066f4022a0da8f95398f38f
-SHA1 (patch-bf) = f56fce1b1e5e697ba2425655b6417b69f197f6cf
+SHA1 (patch-as) = d01c9173f1055cbafff4b08bcd5bbbc2eca63044
+SHA1 (patch-browser_app_nsBrowserApp.cpp) = f109f5430e1b9fd11f8263d756bea0572b8ffa20
 SHA1 (patch-browser_components_nsBrowserGlue.js) = 01eef808fadc361215e60e44d79cfc8a4336107f
-SHA1 (patch-browser_installer_package-manifest.in) = 7c4f1822cd78a5ed465b954f4b62514c64ad7b84
-SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
+SHA1 (patch-browser_installer_package-manifest.in) = d1f003f9ac65e12eb04b1d19a4d9a780bded9fd9
+SHA1 (patch-browser_themes_shared_icon-colors.inc.svg) = 222924b45ceb00d712cbc5b0a9cb064e3ee44fa5
+SHA1 (patch-build_autoconf_toolchain.m4) = f7f5ad59a7cefbc7989e99f10b48520f1bd4bad1
 SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
 SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e
-SHA1 (patch-build_moz.configure_old.configure) = edbc886b5c1c0ae1371854b3e895c7bdd9e72f2d
-SHA1 (patch-config_Makefile.in) = a0fd349caf4c4f5d70fef8a4f1f07438ed84ad88
-SHA1 (patch-config_baseconfig.mk) = 4ec046aea29c6c03df49246371774ed3fd082f4f
+SHA1 (patch-build_moz.configure_old.configure) = 143e1d0b416b33ae92950f347898cf6ed22d0f6f
+SHA1 (patch-build_moz.configure_toolchain.configure) = f02501a573b65f3e9c793c6146f26dd1d3e19222
+SHA1 (patch-build_pgo_profileserver.py) = 48ad50f716eda2157cbc225298f6672f164b4207
+SHA1 (patch-config_Makefile.in) = e2c3b3d142a3c0d0e9b1800e9000e5fe5548e2d0
+SHA1 (patch-config_baseconfig.mk) = 480269a28836351dfd204f6f7694bdcfe129e282
 SHA1 (patch-config_external_moz.build) = 4912a9ef13c7793e2734e5f49ca7fd56be09fe48
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
 SHA1 (patch-config_system-headers) = dbfa6dec0f046be9e390175bf754747fee28f8b7
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c
+SHA1 (patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py) = 91a4de9ab68fc2a0304ab29c0ada756362a7f037
 SHA1 (patch-dom_media_AudioStream.cpp) = 3d2e3d92849a355c05d7ec0ded61d551ffe0c581
 SHA1 (patch-dom_media_AudioStream.h) = 26f70000cc4810834204d15b45e1469dd5f23617
-SHA1 (patch-dom_media_moz.build) = 37d045fa319b90ed50e0c1da9283020360c00c78
+SHA1 (patch-dom_media_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 9961e956016f274a1b9b52b489bd749e8e2bbcb6
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 15c01df2fa7f989b533ef769ce77438b5e9bfdb9
 SHA1 (patch-dom_system_OSFileConstants.cpp) = 6e5a347c317947c869415d740f25813332ee9597
-SHA1 (patch-extensions_spellcheck_hunspell_glue_moz.build) = 783a2372fc929cf96205af595e1e38e2649bfe27
-SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 0c1151708420bec7700724b1f298590601f1762b
-SHA1 (patch-extensions_spellcheck_src_moz.build) = b907fca74cf50ee566c524cb1f05166696914ab9
+SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 5678e4a44927326de55f1f0fd2907102b314ca10
 SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
 SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = 09eb2fa66109d38a3aedc940fcaaee5f91e216ae
@@ -40,9 +42,10 @@ SHA1 (patch-gfx_skia_generate__mozbuild.py) = 0c1faddbda7d819a82a4f1bd97a753c835
 SHA1 (patch-gfx_skia_moz.build) = 1def6cf3bce77e9294c0f05f62a33b7baed12b12
 SHA1 (patch-gfx_skia_skia_src_core_SkUtilsArm.cpp) = 94a5a88f1177e09ef7b8dbdb6439153933004356
 SHA1 (patch-gfx_thebes_gfxFontUtils.cpp) = 639c610a3a1441d5c7e2e9fa0f42b8df1c8e4319
-SHA1 (patch-gfx_thebes_moz.build) = 7c0610d8e6595de2333162a46c9f4f94834e4dc5
+SHA1 (patch-gfx_thebes_moz.build) = 9c20c1e804ffeb739d37631ef9766ae3fe0b8e85
 SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf
 SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 79587891c2a1716a27d4dca0e5b5880069a430eb
+SHA1 (patch-image_Downscaler.h) = c92aa17c22310d0b16cdc4bb778d3029c4b154e3
 SHA1 (patch-image_decoders_nsIconDecoder.cpp) = 804e3bdade8b0c56979e811a0e44df5eaf158381
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f
 SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655
@@ -65,13 +68,12 @@ SHA1 (patch-js_src_jit-LIR.cpp) = 84bf136ba96653d8a3aa283c8e4e9f1722a6901f
 SHA1 (patch-js_src_jit_MIR.cpp) = 71676b2510b2cc5bd97c2e872645780fdb680ff3
 SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = 25cf7d202fc56968225e6f20fb4b292002ccaa4a
 SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = b44992a869d6d08809a9edc28f1ad6f40632d392
-SHA1 (patch-js_src_jsdate.cpp) = a71f55bc9a5bf68867c294e0c9e07d9ae55251d1
-SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59
 SHA1 (patch-js_src_moz.build) = 42d9aba521881cb08065d37889ca29a0071eb632
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e
+SHA1 (patch-layout_style_GenerateCSSPropsGenerated.py) = 6e2267d2ffda97923e6e39ed2517f86fb7316b86
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 91eb24595c423b7e086670bb67e73cfd0bfb5559
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = cd510e274e2eca1fb045f996d42cbe546fccb726
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 4c5bb4b095048fb34695f04a052f8fee0c8a44ed
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = e15cc2d0c220738ccfd57f79eec242095c8ea536
 SHA1 (patch-media_libcubeb_src_moz.build) = 2b6d7e3bb265220decf9629b1d4b980cadb363fb
 SHA1 (patch-media_libcubeb_tests_moz.build) = 63d8b749a6ebbe8fd662ce1e2bde6aa9cb0b807d
@@ -93,17 +95,17 @@ SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf
 SHA1 (patch-media_libyuv_source_mjpeg__decoder.cc) = d3b301dcec965b8f3efdd202db07fd75b503bc20
 SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e
 SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7
-SHA1 (patch-media_webrtc_signaling_test_common.build) = c0d5003858e0c9e93247e3132274c2a4db3ad22e
+SHA1 (patch-media_webrtc_signaling_test_common.build) = 7c3e9b1009d486a50c0498b44330ee3e6b239597
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 4d85eefde7dafa195d10587e5dfaf59d8cee18d3
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 07158ae777fc4743f17cedc106cc9c85fb327d55
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 9fb89480e47fce4df99a82fe90259bf444bd2e11
 SHA1 (patch-memory_build_mozjemalloc__compat.c) = c27c745fd6e0bbb120ef34d8a984937d5f2e1319
 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9e94002b01664a42af415639dc94caa127a73ac0
-SHA1 (patch-mfbt_Attributes.h) = e5dc6bcaaf0ed7ef5b32a367c42298169793cf2b
 SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
 SHA1 (patch-mobile_android_installer_Makefile.in) = fcf4ab03ab033f8637813e30b75a0a2050450933
 SHA1 (patch-mobile_android_installer_package-manifest.in) = e978af41ff0c4b5e477bd3387594e238dc2ec224
 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 133b1658839d9b0f932a601670862c1f4cd70881
+SHA1 (patch-modules_libmar_tests_moz.build) = 88620bb6be30f8b1168e1000784070f4cbbc7d79
 SHA1 (patch-modules_libpref_init_all.js) = 3bc5962fdabb5aecb72ffc7e73bb56392d1ea717
 SHA1 (patch-modules_woff2_src_store_bytes.h) = f7081a6ffadc79e19f30137ca805b962e60821e8
 SHA1 (patch-modules_woff2_src_woff2_common.cc) = 77dec15dad41d47a3f85e578587c3a137a8dc7f3
@@ -111,7 +113,6 @@ SHA1 (patch-moz.configure) = cd4d3851e9dc2c1adb6a92b6f3cd1966adcd5beb
 SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249
 SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
 SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
-SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 9a2170e60aff96abda22c0784f5ee7dd00d79586
 SHA1 (patch-python_mozbuild_mozbuild_configure_options.py) = f862ee425ae016df6fe12b55050a8dc075ecce89
 SHA1 (patch-rc) = 9628b038f036f3fc0e37bdf84fa0abf99dbc8d2a
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 27e90fdfd5587f670958d832cd56107740b226ee
@@ -120,7 +121,7 @@ SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) =
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h) = bd4388323851fcb7b10392d6a27f9bc56633a52e
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
 SHA1 (patch-toolkit_library_libxul.mk) = 98d79e7ae52d4b54111512a98a03810e2bbe454d
-SHA1 (patch-toolkit_library_moz.build) = 34a05c9b32151a955ad0014ba0ccbee6f41d30f5
+SHA1 (patch-toolkit_library_moz.build) = 14bfa40d02f760fb738266c4d63e010e34a28f90
 SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 29ae1476560623bf1871c927d3728761112529e9
 SHA1 (patch-toolkit_moz.configure) = 851a9ed80072de0215863cf81cdbf674bf31271d
 SHA1 (patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js) = eacc4f45f724eb42869a1dba015e127e049fdec4
@@ -130,7 +131,7 @@ SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
 SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54
 SHA1 (patch-xpcom_components_Module.h) = 892f8d6a9cb868e5cdc3c6f6be233055dd1ca529
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 950874fbc255c93a828bddd84ffe8478094214cc
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 82026e72559334810be2f8a510d22f0553a353c2
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 85046b0893b68f95b55a9d3b5aea1d7a60cf0ade
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 13555e44f13..1f0a8b02970 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
 
 * MOZ_ENABLE_PROFILER_SPS is not for users, Disable it
 * Disable libjpeg-turbo check
 * Add system libraries option
 * Add OSS audio support
 
---- old-configure.in.orig	2016-10-31 20:15:28.000000000 +0000
+--- old-configure.in.orig	2017-01-23 04:07:13.206599109 +0000
 +++ old-configure.in
-@@ -2304,11 +2304,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
+@@ -2195,11 +2195,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
                     MOZ_SYSTEM_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -3220,6 +3216,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -2938,6 +2934,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_RAW=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -3262,7 +3261,7 @@ dnl Use integers over floats for audio o
+@@ -2980,7 +2979,7 @@ dnl Use integers over floats for audio o
  dnl (regarless of the CPU architecture, because audio
  dnl backends for those platforms don't support floats. We also
  dnl use integers on ARM with other OS, because it's more efficient.
@@ -39,8 +39,8 @@ $NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
      MOZ_SAMPLE_TYPE_S16=1
      AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
      AC_SUBST(MOZ_SAMPLE_TYPE_S16)
-@@ -3362,6 +3361,155 @@ if test "${ac_cv_c_attribute_aligned}" !
- fi
+@@ -3005,6 +3004,155 @@ fi
+ AC_SUBST(MOZ_RAW)
  
  dnl ========================================================
 +dnl Check for libogg
@@ -195,7 +195,7 @@ $NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
  dnl = Apple platform decoder support
  dnl ========================================================
  if test "$COMPILE_ENVIRONMENT"; then
-@@ -3445,6 +3593,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
+@@ -3088,6 +3236,216 @@ if test -n "$MOZ_OMX_PLUGIN"; then
      fi
  fi
  
@@ -304,10 +304,115 @@ $NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
 +fi
 +AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
 +
++dnl ========================================================
++dnl Check for libogg
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-ogg,
++[  --with-system-ogg       Use system libogg (located with pkgconfig)],
++MOZ_SYSTEM_OGG=1,
++MOZ_SYSTEM_OGG=)
++
++if test -n "$MOZ_SYSTEM_OGG"; then
++    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
++
++    _SAVE_LIBS=$LIBS
++    LIBS="$LIBS $MOZ_OGG_LIBS"
++    AC_CHECK_FUNC(ogg_set_mem_functions, [],
++      [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
++    LIBS=$_SAVE_LIBS
++fi
++
++AC_SUBST(MOZ_SYSTEM_OGG)
++
++dnl ========================================================
++dnl Check for libvorbis
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-vorbis,
++[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
++MOZ_SYSTEM_VORBIS=1,
++MOZ_SYSTEM_VORBIS=)
++
++if test -n "$MOZ_SYSTEM_VORBIS"; then
++    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
++fi
++
++AC_SUBST(MOZ_SYSTEM_VORBIS)
++
++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_SYSTEM_TREMOR=1,
++MOZ_SYSTEM_TREMOR=)
++
++if test -n "$MOZ_SYSTEM_TREMOR"; then
++    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
++fi
++
++AC_SUBST(MOZ_SYSTEM_TREMOR)
++
++dnl ========================================================
++dnl Check for libtheora
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-theora,
++[  --with-system-theora    Use system libtheora (located with pkgconfig)],
++MOZ_SYSTEM_THEORA=1,
++MOZ_SYSTEM_THEORA=)
++
++if test -n "$MOZ_SYSTEM_THEORA"; then
++    PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
++fi
++
++AC_SUBST(MOZ_SYSTEM_THEORA)
++
++dnl ========================================================
++dnl Check for libSoundTouch
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-soundtouch,
++[  --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)],
++MOZ_SYSTEM_SOUNDTOUCH=1,
++MOZ_SYSTEM_SOUNDTOUCH=)
++
++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
++    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)
++
++    AC_LANG_SAVE
++    AC_LANG_CPLUSPLUS
++    _SAVE_CXXFLAGS=$CXXFLAGS
++    CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++    AC_CACHE_CHECK(for soundtouch sample type,
++                   ac_cv_soundtouch_sample_type,
++                   [AC_TRY_COMPILE([#include <SoundTouch.h>
++                                    #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++                                    #error soundtouch expects float samples
++                                    #endif],
++                                   [],
++                                   [ac_cv_soundtouch_sample_type=short],
++                                   [ac_cv_soundtouch_sample_type=float])])
++    CXXFLAGS=$_SAVE_CXXFLAGS
++    AC_LANG_RESTORE
++
++    if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++         -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++        AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++    fi
++fi
++
++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
++    AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH)
++fi
++AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
++
  dnl system libvpx Support
  dnl ========================================================
  MOZ_ARG_WITH_BOOL(system-libvpx,
-@@ -3609,6 +3862,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
+@@ -3252,6 +3610,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -375,7 +480,7 @@ $NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -3622,12 +3936,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+@@ -3265,12 +3684,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
     MOZ_ALSA=1,
     MOZ_ALSA=)
  
@@ -399,7 +504,7 @@ $NetBSD: patch-aa,v 1.48 2016/12/03 09:58:26 ryoon Exp $
  AC_SUBST(MOZ_ALSA)
  
  dnl ========================================================
-@@ -5764,6 +6089,27 @@ if test "$USE_FC_FREETYPE"; then
+@@ -5220,6 +5650,27 @@ if test "$USE_FC_FREETYPE"; then
  fi
  
  dnl ========================================================
diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as
index 209608f6072..e46511ca518 100644
--- a/www/firefox/patches/patch-as
+++ b/www/firefox/patches/patch-as
@@ -1,34 +1,17 @@
-$NetBSD: patch-as,v 1.20 2016/08/06 08:46:59 ryoon Exp $
+$NetBSD: patch-as,v 1.21 2017/01/25 13:24:51 ryoon Exp $
 
 * Treat DragonFly like FreeBSD.
 * Add system ICU support
 
---- js/src/old-configure.in.orig	2016-07-25 20:22:08.000000000 +0000
+--- js/src/old-configure.in.orig	2017-01-16 16:16:52.000000000 +0000
 +++ js/src/old-configure.in
-@@ -1263,8 +1263,7 @@ AC_LANG_CPLUSPLUS
+@@ -140,6 +140,9 @@ fi
  
- MOZ_CXX11
+ MOZ_TOOL_VARIABLES
  
--dnl Check for .hidden assembler directive and visibility attribute.
--dnl Borrowed from glibc configure.in
-+dnl Setup default hidden visibility and wrapped system headers.
- dnl ===============================================================
- if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
-   AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -2613,6 +2612,16 @@ MOZ_CONFIG_ICU()
- dnl ========================================================
- dnl JavaScript shell
- dnl ========================================================
-+ICU_LIB_NAMES=
-+MOZ_SYSTEM_ICU=
-+MOZ_ARG_WITH_BOOL(system-icu,
-+[  --with-system-icu
-+                          Use system icu (located with pkgconfig)],
-+    MOZ_SYSTEM_ICU=1)
++AC_PROG_CPP
++AC_PROG_CXXCPP
 +
-+if test -n "$MOZ_SYSTEM_ICU"; then
-+    PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-+fi
- 
- MOZ_CHECK_ALLOCATOR
+ dnl Special win32 checks
+ dnl ========================================================
  
diff --git a/www/firefox/patches/patch-bf b/www/firefox/patches/patch-bf
deleted file mode 100644
index 2fd2f67e7d7..00000000000
--- a/www/firefox/patches/patch-bf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bf,v 1.5 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD, use pthread_attr_get_np
-
---- js/src/jsnativestack.cpp.orig	2013-09-10 03:43:36.000000000 +0000
-+++ js/src/jsnativestack.cpp
-@@ -114,7 +114,7 @@ js::GetNativeStackBaseImpl()
-     pthread_attr_init(&sattr);
- #  if defined(__OpenBSD__)
-     stack_t ss;
--#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-+#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
-     /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
-     pthread_attr_get_np(thread, &sattr);
- #  else
diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
new file mode 100644
index 00000000000..e09240732c8
--- /dev/null
+++ b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.10 2017/01/25 13:24:51 ryoon Exp $
+
+--- browser/app/nsBrowserApp.cpp.orig	2017-01-16 16:16:49.000000000 +0000
++++ browser/app/nsBrowserApp.cpp
+@@ -358,6 +358,9 @@ int main(int argc, char* argv[], char* e
+ {
+   mozilla::TimeStamp start = mozilla::TimeStamp::Now();
+ 
++  setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
++  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
++
+ #ifdef HAS_DLL_BLOCKLIST
+   DllBlocklist_Initialize();
+ 
diff --git a/www/firefox/patches/patch-browser_installer_package-manifest.in b/www/firefox/patches/patch-browser_installer_package-manifest.in
index 9252bb33fc1..56d833cb200 100644
--- a/www/firefox/patches/patch-browser_installer_package-manifest.in
+++ b/www/firefox/patches/patch-browser_installer_package-manifest.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-browser_installer_package-manifest.in,v 1.7 2015/11/03 15:52:57 ryoon Exp $
+$NetBSD: patch-browser_installer_package-manifest.in,v 1.8 2017/01/25 13:24:51 ryoon Exp $
 
 Limit SPARC bits to just SPARC (untested, but fixes x86).
 
---- browser/installer/package-manifest.in.orig	2015-10-22 22:30:28.000000000 +0000
+--- browser/installer/package-manifest.in.orig	2017-01-16 16:16:50.000000000 +0000
 +++ browser/installer/package-manifest.in
-@@ -620,7 +620,7 @@
+@@ -575,7 +575,7 @@
  @RESPATH@/components/MozKeyboard.js
  @RESPATH@/components/InputMethod.manifest
  
@@ -13,12 +13,3 @@ Limit SPARC bits to just SPARC (untested, but fixes x86).
  @RESPATH@/components/TestInterfaceJS.js
  @RESPATH@/components/TestInterfaceJS.manifest
  @RESPATH@/components/TestInterfaceJSMaplike.js
-@@ -822,7 +822,7 @@
- #endif
- 
- ; for Solaris SPARC
--#ifdef SOLARIS
-+#if defined(SOLARIS) && defined(SPARC)
- bin/libfreebl_32fpu_3.so
- bin/libfreebl_32int_3.so
- bin/libfreebl_32int64_3.so
diff --git a/www/firefox/patches/patch-browser_themes_shared_icon-colors.inc.svg b/www/firefox/patches/patch-browser_themes_shared_icon-colors.inc.svg
new file mode 100644
index 00000000000..94eab78367a
--- /dev/null
+++ b/www/firefox/patches/patch-browser_themes_shared_icon-colors.inc.svg
@@ -0,0 +1,13 @@
+$NetBSD: patch-browser_themes_shared_icon-colors.inc.svg,v 1.1 2017/01/25 13:24:51 ryoon Exp $
+
+--- browser/themes/shared/icon-colors.inc.svg.orig	2017-01-16 16:16:51.000000000 +0000
++++ browser/themes/shared/icon-colors.inc.svg
+@@ -2,7 +2,7 @@
+ 
+ .fieldtext {
+   fill: -moz-fieldtext;
+-#ifdef XP_LINUX
++#ifdef MOZ_WIDGET_GTK
+   /* The fill-opacity needs to be sufficient for high-contrast settings, and
+      pathological Gtk themes where -moz-fieldtext provides low contrast by
+      default. */
diff --git a/www/firefox/patches/patch-build_autoconf_compiler-opts.m4 b/www/firefox/patches/patch-build_autoconf_compiler-opts.m4
deleted file mode 100644
index 05683e62cfa..00000000000
--- a/www/firefox/patches/patch-build_autoconf_compiler-opts.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-build_autoconf_compiler-opts.m4,v 1.1 2014/05/28 04:34:52 pho Exp $
-
-It's true Clang is required if we use the cocoa toolkit, but we don't
-do that anyway. GCC is perfectly working as long as we use cairo-gtk2.
-
---- build/autoconf/compiler-opts.m4.orig	2014-05-06 22:55:14.000000000 +0000
-+++ build/autoconf/compiler-opts.m4
-@@ -53,14 +53,6 @@ case "$target" in
-     if test -z "$CXX"; then
-         MOZ_PATH_PROGS(CXX, clang++)
-     fi
--    IS_GCC=$($CC -v 2>&1 | grep gcc)
--    if test -n "$IS_GCC"
--    then
--      echo gcc is known to be broken on OS X, please use clang.
--      echo see http://developer.mozilla.org/en-US/docs/Developer_Guide/Build_Instructions/Mac_OS_X_Prerequisites
--      echo for more information.
--      exit 1
--    fi
-     ;;
- esac
- fi
diff --git a/www/firefox/patches/patch-build_autoconf_toolchain.m4 b/www/firefox/patches/patch-build_autoconf_toolchain.m4
new file mode 100644
index 00000000000..e31376dc1d7
--- /dev/null
+++ b/www/firefox/patches/patch-build_autoconf_toolchain.m4
@@ -0,0 +1,19 @@
+$NetBSD: patch-build_autoconf_toolchain.m4,v 1.1 2017/01/25 13:24:51 ryoon Exp $
+
+--- build/autoconf/toolchain.m4.orig	2017-01-16 16:16:51.000000000 +0000
++++ build/autoconf/toolchain.m4
+@@ -2,14 +2,6 @@ dnl This Source Code Form is subject to 
+ dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+ dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-dnl Several autoconf functions AC_REQUIRE AC_PROG_CPP/AC_PROG_CXXCPP,
+-dnl meaning they are called even when we don't call them explicitly.
+-dnl However, theses checks are not necessary and python configure sets
+-dnl the corresponding variables already, so just skip those tests
+-dnl entirely.
+-define([AC_PROG_CPP],[])
+-define([AC_PROG_CXXCPP],[])
+-
+ AC_DEFUN([MOZ_TOOL_VARIABLES],
+ [
+ GNU_AS=
diff --git a/www/firefox/patches/patch-build_moz.configure_old.configure b/www/firefox/patches/patch-build_moz.configure_old.configure
index 301d13ea062..c7ca4096286 100644
--- a/www/firefox/patches/patch-build_moz.configure_old.configure
+++ b/www/firefox/patches/patch-build_moz.configure_old.configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-build_moz.configure_old.configure,v 1.3 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-build_moz.configure_old.configure,v 1.4 2017/01/25 13:24:51 ryoon Exp $
 
---- build/moz.configure/old.configure.orig	2016-10-31 20:15:27.000000000 +0000
+--- build/moz.configure/old.configure.orig	2017-01-16 16:16:51.000000000 +0000
 +++ build/moz.configure/old.configure
 @@ -159,6 +159,7 @@ def old_configure_options(*options):
      '--enable-accessibility',
@@ -8,24 +8,23 @@ $NetBSD: patch-build_moz.configure_old.configure,v 1.3 2016/12/03 09:58:26 ryoon
      '--enable-alsa',
 +    '--enable-alsa-dlopen',
      '--enable-android-omx',
-     '--enable-approximate-location',
      '--enable-b2g-bt',
-@@ -259,6 +260,7 @@ def old_configure_options(*options):
+     '--enable-b2g-camera',
+@@ -241,6 +242,7 @@ def old_configure_options(*options):
+     '--enable-url-classifier',
+     '--enable-valgrind',
      '--enable-verify-mar',
-     '--enable-warnings-as-errors',
-     '--enable-webapp-runtime',
 +    '--enable-webm',
      '--enable-webrtc',
-     '--enable-websms-backend',
-     '--enable-webspeech',
-@@ -306,19 +308,27 @@ def old_configure_options(*options):
+     '--enable-xul',
+     '--enable-zipwriter',
+@@ -279,18 +281,26 @@ def old_configure_options(*options):
      '--with-nspr-prefix',
      '--with-nss-exec-prefix',
      '--with-nss-prefix',
 +    '--with-oss',
      '--with-pthreads',
      '--with-qemu-exe',
-     '--with-servo',
      '--with-sixgill',
      '--with-soft-float',
      '--with-system-bz2',
diff --git a/www/firefox/patches/patch-build_moz.configure_toolchain.configure b/www/firefox/patches/patch-build_moz.configure_toolchain.configure
new file mode 100644
index 00000000000..1ba9dd8839b
--- /dev/null
+++ b/www/firefox/patches/patch-build_moz.configure_toolchain.configure
@@ -0,0 +1,28 @@
+$NetBSD: patch-build_moz.configure_toolchain.configure,v 1.1 2017/01/25 13:24:51 ryoon Exp $
+
+--- build/moz.configure/toolchain.configure.orig	2017-01-16 16:16:51.000000000 +0000
++++ build/moz.configure/toolchain.configure
+@@ -756,23 +756,6 @@ def compiler(language, host_or_target, c
+     valid_compiler.try_compile(check_msg='%s works' % what,
+                                onerror=compiler_error)
+ 
+-
+-    # Set CPP/CXXCPP for both the build system and old-configure. We don't
+-    # need to check this works for preprocessing, because we already relied
+-    # on $CC -E/$CXX -E doing preprocessing work to validate the compiler
+-    # in the first place.
+-    if host_or_target == target:
+-        pp_var = {
+-            'C': 'CPP',
+-            'C++': 'CXXCPP',
+-        }[language]
+-
+-        preprocessor = depends_if(valid_compiler)(
+-                lambda x: list(x.wrapper) + [x.compiler, '-E'] + list(x.flags))
+-
+-        set_config(pp_var, preprocessor)
+-        add_old_configure_assignment(pp_var, preprocessor)
+-
+     return valid_compiler
+ 
+ 
diff --git a/www/firefox/patches/patch-build_pgo_profileserver.py b/www/firefox/patches/patch-build_pgo_profileserver.py
new file mode 100644
index 00000000000..e7fe31ddc1c
--- /dev/null
+++ b/www/firefox/patches/patch-build_pgo_profileserver.py
@@ -0,0 +1,13 @@
+$NetBSD: patch-build_pgo_profileserver.py,v 1.5 2017/01/25 13:24:51 ryoon Exp $
+
+--- build/pgo/profileserver.py.orig	2017-01-16 16:16:51.000000000 +0000
++++ build/pgo/profileserver.py
+@@ -80,7 +80,7 @@ if __name__ == '__main__':
+       env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
+       print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"]
+ 
+-    cmdargs = ["http://localhost:%d/index.html" % PORT]
++    cmdargs = ["http://127.0.0.1:%d/index.html" % PORT]
+     runner = FirefoxRunner(profile=profile,
+                            binary=build.get_binary_path(where="staged-package"),
+                            cmdargs=cmdargs,
diff --git a/www/firefox/patches/patch-config_Makefile.in b/www/firefox/patches/patch-config_Makefile.in
index 7ec81ea26f1..46dc03423b5 100644
--- a/www/firefox/patches/patch-config_Makefile.in
+++ b/www/firefox/patches/patch-config_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-config_Makefile.in,v 1.8 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-config_Makefile.in,v 1.9 2017/01/25 13:24:51 ryoon Exp $
 
 * Support system libraries
 
---- config/Makefile.in.orig	2016-10-31 20:15:27.000000000 +0000
+--- config/Makefile.in.orig	2017-01-22 22:50:48.440016062 +0000
 +++ config/Makefile.in
 @@ -49,6 +49,13 @@ export:: $(export-preqs)
  		-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
diff --git a/www/firefox/patches/patch-config_baseconfig.mk b/www/firefox/patches/patch-config_baseconfig.mk
index f2592232576..a563cacf566 100644
--- a/www/firefox/patches/patch-config_baseconfig.mk
+++ b/www/firefox/patches/patch-config_baseconfig.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-config_baseconfig.mk,v 1.8 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-config_baseconfig.mk,v 1.9 2017/01/25 13:24:51 ryoon Exp $
 
 * Set pkgsrc directory structure
 
---- config/baseconfig.mk.orig	2016-02-25 23:01:53.000000000 +0000
+--- config/baseconfig.mk.orig	2016-10-31 20:15:27.000000000 +0000
 +++ config/baseconfig.mk
 @@ -2,10 +2,10 @@
  # directly in python/mozbuild/mozbuild/base.py for gmake validation.
diff --git a/www/firefox/patches/patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py b/www/firefox/patches/patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py
new file mode 100644
index 00000000000..5a50a5e6e31
--- /dev/null
+++ b/www/firefox/patches/patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py
@@ -0,0 +1,13 @@
+$NetBSD: patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py,v 1.1 2017/01/25 13:24:51 ryoon Exp $
+
+--- dom/bindings/GenerateCSS2PropertiesWebIDL.py.orig	2017-01-16 16:16:52.000000000 +0000
++++ dom/bindings/GenerateCSS2PropertiesWebIDL.py
+@@ -16,7 +16,7 @@ def generateLine(propName, extendedAttrs
+     return "  [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
+                                                  propName)
+ def generate(output, idlFilename, preprocessorHeader):
+-    cpp = list(buildconfig.substs['CPP'])
++    cpp = shellutil.split(buildconfig.substs['CPP'])
+     cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
+     cpp.append(preprocessorHeader)
+     preprocessed = subprocess.check_output(cpp)
diff --git a/www/firefox/patches/patch-dom_media_moz.build b/www/firefox/patches/patch-dom_media_moz.build
index a037d149551..d3ac780baf1 100644
--- a/www/firefox/patches/patch-dom_media_moz.build
+++ b/www/firefox/patches/patch-dom_media_moz.build
@@ -1,10 +1,10 @@
-$NetBSD: patch-dom_media_moz.build,v 1.6 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-dom_media_moz.build,v 1.7 2017/01/25 13:24:51 ryoon Exp $
 
 * Support system libraries
 
---- dom/media/moz.build.orig	2016-10-31 20:15:34.000000000 +0000
+--- dom/media/moz.build.orig	2017-01-16 16:16:53.000000000 +0000
 +++ dom/media/moz.build
-@@ -319,6 +319,21 @@ if CONFIG['MOZ_WEBRTC']:
+@@ -316,6 +316,21 @@ if CONFIG['MOZ_WEBRTC']:
  
  DEFINES['MOZILLA_INTERNAL_API'] = True
  
@@ -26,31 +26,3 @@ $NetBSD: patch-dom_media_moz.build,v 1.6 2016/12/03 09:58:26 ryoon Exp $
  if CONFIG['OS_TARGET'] == 'WINNT':
      DEFINES['WEBRTC_WIN'] = True
  else:
-@@ -333,6 +348,27 @@ if CONFIG['ANDROID_VERSION'] > '15':
- if CONFIG['MOZ_GONK_MEDIACODEC']:
-     DEFINES['MOZ_GONK_MEDIACODEC'] = True
- 
-+if CONFIG['MOZ_SYSTEM_OGG']:
-+    CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']
-+
-+if CONFIG['MOZ_SYSTEM_THEORA']:
-+    CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS']
-+
-+if CONFIG['MOZ_SYSTEM_VORBIS']:
-+    CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS']
-+
-+if CONFIG['MOZ_SYSTEM_TREMOR']:
-+    CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']
-+
-+if CONFIG['MOZ_SYSTEM_OPUS']:
-+    CXXFLAGS += CONFIG['MOZ_OPUS_CFLAGS']
-+
-+if CONFIG['MOZ_SYSTEM_SPEEX']:
-+    CXXFLAGS += CONFIG['MOZ_SPEEX_CFLAGS']
-+
-+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
-+    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
-+
- include('/ipc/chromium/chromium-config.mozbuild')
- 
- # Suppress some GCC warnings being treated as errors:
diff --git a/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_moz.build b/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_moz.build
deleted file mode 100644
index 840328b7aaf..00000000000
--- a/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_moz.build
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-extensions_spellcheck_hunspell_glue_moz.build,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-
---- extensions/spellcheck/hunspell/glue/moz.build.orig	2016-10-31 20:15:27.000000000 +0000
-+++ extensions/spellcheck/hunspell/glue/moz.build
-@@ -11,12 +11,14 @@ SOURCES += [
-     'RemoteSpellCheckEngineParent.cpp',
- ]
- 
--CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
--
- FINAL_LIBRARY = 'xul'
- 
-+if CONFIG['MOZ_SYSTEM_HUNSPELL']:
-+    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
-+else:
-+    LOCAL_INCLUDES += ['../src']
-+
- LOCAL_INCLUDES += [
--    '../src',
-     '/dom/base',
-     '/extensions/spellcheck/src',
- ]
diff --git a/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp b/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
index 57c3e8b9197..4098550dbe6 100644
--- a/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
+++ b/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.2 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.3 2017/01/25 13:24:51 ryoon Exp $
 
 * Read pkgsrc hunspell dictionaries
 
---- extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig	2015-12-04 00:37:13.000000000 +0000
+--- extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig	2017-01-16 16:16:49.000000000 +0000
 +++ extensions/spellcheck/hunspell/glue/mozHunspell.cpp
-@@ -392,6 +392,14 @@ mozHunspell::LoadDictionaryList(bool aNo
+@@ -358,6 +358,14 @@ mozHunspell::LoadDictionaryList(bool aNo
      }
    }
  
diff --git a/www/firefox/patches/patch-extensions_spellcheck_src_moz.build b/www/firefox/patches/patch-extensions_spellcheck_src_moz.build
deleted file mode 100644
index 5daa104c84e..00000000000
--- a/www/firefox/patches/patch-extensions_spellcheck_src_moz.build
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-extensions_spellcheck_src_moz.build,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-
---- extensions/spellcheck/src/moz.build.orig	2016-10-31 20:15:27.000000000 +0000
-+++ extensions/spellcheck/src/moz.build
-@@ -17,9 +17,13 @@ SOURCES += [
- 
- FINAL_LIBRARY = 'xul'
- 
-+if CONFIG['MOZ_SYSTEM_HUNSPELL']:
-+    CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
-+else:
-+    LOCAL_INCLUDES += ['../hunspell/src']
-+
- LOCAL_INCLUDES += [
-     '../hunspell/glue',
--    '../hunspell/src',
-     '/dom/base',
- ]
- EXPORTS.mozilla += [
diff --git a/www/firefox/patches/patch-gfx_thebes_moz.build b/www/firefox/patches/patch-gfx_thebes_moz.build
index dc9e0dc2ba6..2864338728c 100644
--- a/www/firefox/patches/patch-gfx_thebes_moz.build
+++ b/www/firefox/patches/patch-gfx_thebes_moz.build
@@ -1,10 +1,10 @@
-$NetBSD: patch-gfx_thebes_moz.build,v 1.5 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-gfx_thebes_moz.build,v 1.6 2017/01/25 13:24:51 ryoon Exp $
 
---- gfx/thebes/moz.build.orig	2016-10-31 20:15:32.000000000 +0000
+--- gfx/thebes/moz.build.orig	2017-01-16 16:16:51.000000000 +0000
 +++ gfx/thebes/moz.build
-@@ -289,7 +289,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
- 
+@@ -286,7 +286,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
  LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
+ LOCAL_INCLUDES += ['/media/libyuv/include']
  
 -DEFINES['GRAPHITE2_STATIC'] = True
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
diff --git a/www/firefox/patches/patch-image_Downscaler.h b/www/firefox/patches/patch-image_Downscaler.h
new file mode 100644
index 00000000000..d91b109cb8d
--- /dev/null
+++ b/www/firefox/patches/patch-image_Downscaler.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-image_Downscaler.h,v 1.1 2017/01/25 13:24:51 ryoon Exp $
+
+--- image/Downscaler.h.orig	2016-10-31 20:15:32.000000000 +0000
++++ image/Downscaler.h
+@@ -154,14 +154,14 @@ private:
+ class Downscaler
+ {
+ public:
+-  explicit Downscaler(const nsIntSize&)
++  explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0)
+   {
+     MOZ_RELEASE_ASSERT(false, "Skia is not enabled");
+   }
+ 
+-  const nsIntSize& OriginalSize() const { return nsIntSize(); }
+-  const nsIntSize& TargetSize() const { return nsIntSize(); }
+-  const gfxSize& Scale() const { return gfxSize(1.0, 1.0); }
++  const nsIntSize& OriginalSize() const { return mSize; }
++  const nsIntSize& TargetSize() const { return mSize; }
++  const gfxSize& Scale() const { return mScale; }
+ 
+   nsresult BeginFrame(const nsIntSize&, const Maybe<nsIntRect>&, uint8_t*, bool, bool = false)
+   {
+@@ -177,6 +177,9 @@ public:
+   DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
+   void ResetForNextProgressivePass() { }
+   const nsIntSize FrameSize() const { return nsIntSize(0, 0); }
++private:
++  nsIntSize mSize;
++  gfxSize mScale;
+ };
+ 
+ #endif // MOZ_ENABLE_SKIA
diff --git a/www/firefox/patches/patch-js_src_jsdate.cpp b/www/firefox/patches/patch-js_src_jsdate.cpp
deleted file mode 100644
index 438bd10023d..00000000000
--- a/www/firefox/patches/patch-js_src_jsdate.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-js_src_jsdate.cpp,v 1.4 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD
-
---- js/src/jsdate.cpp.orig	2016-02-25 23:02:04.000000000 +0000
-+++ js/src/jsdate.cpp
-@@ -2672,8 +2672,8 @@ ToLocaleFormatHelper(JSContext* cx, Hand
-         if (strcmp(format, "%x") == 0 && result_len >= 6 &&
-             /* Format %x means use OS settings, which may have 2-digit yr, so
-                hack end of 3/11/22 or 11.03.22 or 11Mar22 to use 4-digit yr...*/
--            !isdigit(buf[result_len - 3]) &&
--            isdigit(buf[result_len - 2]) && isdigit(buf[result_len - 1]) &&
-+            !isdigit(((unsigned char)buf[result_len - 3])) &&
-+            isdigit(((unsigned char)buf[result_len - 2])) && isdigit(((unsigned char)buf[result_len - 1])) &&
-             /* ...but not if starts with 4-digit year, like 2022/3/11. */
-             !(isdigit(buf[0]) && isdigit(buf[1]) &&
-               isdigit(buf[2]) && isdigit(buf[3]))) {
diff --git a/www/firefox/patches/patch-js_src_jskwgen.cpp b/www/firefox/patches/patch-js_src_jskwgen.cpp
deleted file mode 100644
index c76209501bf..00000000000
--- a/www/firefox/patches/patch-js_src_jskwgen.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-js_src_jskwgen.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
-
---- js/src/jskwgen.cpp.orig	2015-01-23 06:00:01.000000000 +0000
-+++ js/src/jskwgen.cpp	2015-02-05 11:42:30.000000000 +0000
-@@ -181,7 +181,7 @@
-         *s++ = '\\';
-         break;
-       default:
--        if (!isprint(c)) {
-+        if (!isprint(((unsigned char)c))) {
-             *s++ = '\\';
-             *s++ = (char)('0' + (0x3 & (((unsigned char)c) >> 6)));
-             *s++ = (char)('0' + (0x7 & (((unsigned char)c) >> 3)));
diff --git a/www/firefox/patches/patch-layout_style_GenerateCSSPropsGenerated.py b/www/firefox/patches/patch-layout_style_GenerateCSSPropsGenerated.py
new file mode 100644
index 00000000000..cd4ca344fe0
--- /dev/null
+++ b/www/firefox/patches/patch-layout_style_GenerateCSSPropsGenerated.py
@@ -0,0 +1,13 @@
+$NetBSD: patch-layout_style_GenerateCSSPropsGenerated.py,v 1.1 2017/01/25 13:24:51 ryoon Exp $
+
+--- layout/style/GenerateCSSPropsGenerated.py.orig	2017-01-16 16:16:54.000000000 +0000
++++ layout/style/GenerateCSSPropsGenerated.py
+@@ -10,7 +10,7 @@ import buildconfig
+ from mozbuild import shellutil
+ 
+ def get_properties(preprocessorHeader):
+-    cpp = list(buildconfig.substs['CPP'])
++    cpp = shellutil.split(buildconfig.substs['CPP'])
+     cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
+     cpp.append(preprocessorHeader)
+     preprocessed = subprocess.check_output(cpp)
diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
index 3dfd741627f..615b53fa99c 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.18 2017/01/25 13:24:51 ryoon Exp $
 
 * Support alsa audio under NetBSD
 
 --- media/libcubeb/src/cubeb_alsa.c.orig	2016-10-31 20:15:39.000000000 +0000
 +++ media/libcubeb/src/cubeb_alsa.c
-@@ -7,12 +7,18 @@
+@@ -7,11 +7,15 @@
  #undef NDEBUG
  #define _DEFAULT_SOURCE
  #define _BSD_SOURCE
@@ -18,12 +18,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
  #include <limits.h>
 +#include <dlfcn.h>
  #include <poll.h>
-+#include <stdlib.h>
-+#include <stdio.h>
  #include <unistd.h>
  #include <alsa/asoundlib.h>
- #include "cubeb/cubeb.h"
-@@ -25,6 +31,50 @@
+@@ -25,6 +29,50 @@
  
  #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
  
@@ -74,7 +71,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
  /* ALSA is not thread-safe.  snd_pcm_t instances are individually protected
     by the owning cubeb_stream's mutex.  snd_pcm_t creation and destruction
     is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1),
-@@ -65,6 +115,8 @@ struct cubeb {
+@@ -65,6 +113,8 @@ struct cubeb {
       workaround is not required. */
    snd_config_t * local_config;
    int is_pa;
@@ -83,13 +80,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
  };
  
  enum stream_state {
-@@ -255,15 +307,16 @@ alsa_refill_stream(cubeb_stream * stm)
-   long got;
-   void * p;
-   int draining;
-+  unsigned pipefailures, againfailures;
- 
-   draining = 0;
+@@ -260,10 +310,10 @@ alsa_refill_stream(cubeb_stream * stm)
  
    pthread_mutex_lock(&stm->mutex);
  
@@ -103,15 +94,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    }
  
    /* Failed to recover from an xrun, this stream must be broken. */
-@@ -272,6 +325,7 @@ alsa_refill_stream(cubeb_stream * stm)
-     stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-     return ERROR;
-   }
-+  pipefailures = againfailures = 0;
- 
-   /* This should never happen. */
-   if ((unsigned int) avail > stm->buffer_size) {
-@@ -286,7 +340,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -286,7 +336,7 @@ alsa_refill_stream(cubeb_stream * stm)
      return RUNNING;
    }
  
@@ -120,16 +103,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    assert(p);
  
    pthread_mutex_unlock(&stm->mutex);
-@@ -299,7 +353,7 @@ alsa_refill_stream(cubeb_stream * stm)
-     return ERROR;
-   }
-   if (got > 0) {
--    snd_pcm_sframes_t wrote;
-+    snd_pcm_sframes_t wrote, towrite = got;
- 
-     if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
-       float * b = (float *) p;
-@@ -312,10 +366,10 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -312,10 +362,10 @@ alsa_refill_stream(cubeb_stream * stm)
          b[i] *= stm->volume;
        }
      }
@@ -143,7 +117,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      }
      assert(wrote >= 0 && wrote == got);
      stm->write_position += wrote;
-@@ -327,7 +381,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -327,7 +377,7 @@ alsa_refill_stream(cubeb_stream * stm)
  
      /* Fill the remaining buffer with silence to guarantee one full period
         has been written. */
@@ -152,7 +126,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
  
      set_timeout(&stm->drain_timeout, buffer_time * 1000);
  
-@@ -440,26 +494,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -440,26 +490,26 @@ get_slave_pcm_node(snd_config_t * lconf,
  
    slave_def = NULL;
  
@@ -184,7 +158,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      if (r < 0) {
        break;
      }
-@@ -468,7 +522,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -468,7 +518,7 @@ get_slave_pcm_node(snd_config_t * lconf,
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -193,7 +167,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      if (r < 0) {
        break;
      }
-@@ -477,7 +531,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -477,7 +527,7 @@ get_slave_pcm_node(snd_config_t * lconf,
    } while (0);
  
    if (slave_def) {
@@ -202,7 +176,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    }
  
    return NULL;
-@@ -500,22 +554,22 @@ init_local_config_with_workaround(char c
+@@ -500,22 +550,22 @@ init_local_config_with_workaround(char c
  
    lconf = NULL;
  
@@ -229,7 +203,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      if (r < 0) {
        break;
      }
-@@ -524,7 +578,7 @@ init_local_config_with_workaround(char c
+@@ -524,7 +574,7 @@ init_local_config_with_workaround(char c
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -238,7 +212,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      if (r < 0) {
        break;
      }
-@@ -535,12 +589,12 @@ init_local_config_with_workaround(char c
+@@ -535,12 +585,12 @@ init_local_config_with_workaround(char c
      }
  
      /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -253,7 +227,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      if (r < 0) {
        break;
      }
-@@ -551,18 +605,18 @@ init_local_config_with_workaround(char c
+@@ -551,18 +601,18 @@ init_local_config_with_workaround(char c
  
      /* Don't clobber an explicit existing handle_underrun value, set it only
         if it doesn't already exist. */
@@ -275,7 +249,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      if (r < 0) {
        break;
      }
-@@ -570,7 +624,7 @@ init_local_config_with_workaround(char c
+@@ -570,7 +620,7 @@ init_local_config_with_workaround(char c
      return lconf;
    } while (0);
  
@@ -284,7 +258,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
  
    return NULL;
  }
-@@ -582,9 +636,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
+@@ -582,9 +632,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
    if (local_config) {
@@ -296,7 +270,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
-@@ -597,7 +651,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -597,7 +647,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
    int r;
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -305,7 +279,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
    return r;
-@@ -654,12 +708,65 @@ alsa_init(cubeb ** context, char const *
+@@ -654,12 +704,65 @@ alsa_init(cubeb ** context, char const *
    pthread_attr_t attr;
    snd_pcm_t * dummy;
  
@@ -372,7 +346,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      cubeb_alsa_error_handler_set = 1;
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -667,6 +774,8 @@ alsa_init(cubeb ** context, char const *
+@@ -667,6 +770,8 @@ alsa_init(cubeb ** context, char const *
    ctx = calloc(1, sizeof(*ctx));
    assert(ctx);
  
@@ -381,7 +355,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    ctx->ops = &alsa_ops;
  
    r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -716,7 +825,7 @@ alsa_init(cubeb ** context, char const *
+@@ -716,7 +821,7 @@ alsa_init(cubeb ** context, char const *
         config fails with EINVAL, the PA PCM is too old for this workaround. */
      if (r == -EINVAL) {
        pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -390,7 +364,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
        pthread_mutex_unlock(&cubeb_alsa_mutex);
        ctx->local_config = NULL;
      } else if (r >= 0) {
-@@ -755,9 +864,13 @@ alsa_destroy(cubeb * ctx)
+@@ -755,9 +860,13 @@ alsa_destroy(cubeb * ctx)
    pthread_mutex_destroy(&ctx->mutex);
    free(ctx->fds);
  
@@ -405,7 +379,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      pthread_mutex_unlock(&cubeb_alsa_mutex);
    }
  
-@@ -842,7 +955,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -842,7 +951,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      return CUBEB_ERROR;
    }
  
@@ -414,7 +388,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    assert(r == 0);
  
    latency_us = latency_frames * 1e6 / stm->params.rate;
-@@ -855,7 +968,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -855,7 +964,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      latency_us = latency_us < min_latency ? min_latency: latency_us;
    }
  
@@ -423,7 +397,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
                           stm->params.channels, stm->params.rate, 1,
                           latency_us);
    if (r < 0) {
-@@ -863,15 +976,15 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -863,15 +972,15 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      return CUBEB_ERROR_INVALID_FORMAT;
    }
  
@@ -442,7 +416,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    assert((nfds_t) r == stm->nfds);
  
    r = pthread_cond_init(&stm->cond, NULL);
-@@ -902,7 +1015,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -902,7 +1011,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
      if (stm->state == DRAINING) {
@@ -451,19 +425,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -912,7 +1025,10 @@ alsa_stream_destroy(cubeb_stream * stm)
-   pthread_mutex_destroy(&stm->mutex);
- 
-   r = pthread_cond_destroy(&stm->cond);
--  assert(r == 0);
-+  if (r != 0) {	/* XXX stopgap until someone figures out the real reason */
-+    fprintf(stderr,"alsa_stream_destroy: pthread_cond_destroy failed: %s",
-+      strerror(r));
-+  }
- 
-   alsa_unregister_stream(stm);
- 
-@@ -944,12 +1060,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
+@@ -944,12 +1053,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
      return CUBEB_ERROR;
    }
  
@@ -478,7 +440,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -969,34 +1085,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -969,34 +1078,34 @@ alsa_get_preferred_sample_rate(cubeb * c
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
@@ -521,7 +483,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
  
    return CUBEB_OK;
  }
-@@ -1020,7 +1136,7 @@ alsa_stream_start(cubeb_stream * stm)
+@@ -1020,7 +1129,7 @@ alsa_stream_start(cubeb_stream * stm)
    ctx = stm->context;
  
    pthread_mutex_lock(&stm->mutex);
@@ -530,7 +492,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    gettimeofday(&stm->last_activity, NULL);
    pthread_mutex_unlock(&stm->mutex);
  
-@@ -1054,7 +1170,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1054,7 +1163,7 @@ alsa_stream_stop(cubeb_stream * stm)
    pthread_mutex_unlock(&ctx->mutex);
  
    pthread_mutex_lock(&stm->mutex);
@@ -539,7 +501,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
    pthread_mutex_unlock(&stm->mutex);
  
    return CUBEB_OK;
-@@ -1070,14 +1186,16 @@ alsa_stream_get_position(cubeb_stream * 
+@@ -1070,8 +1179,8 @@ alsa_stream_get_position(cubeb_stream * 
    pthread_mutex_lock(&stm->mutex);
  
    delay = -1;
@@ -550,16 +512,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.17 2016/12/03 09:58:26 ryoon
      *position = stm->last_position;
      pthread_mutex_unlock(&stm->mutex);
      return CUBEB_OK;
-   }
- 
--  assert(delay >= 0);
-+  if (delay < 0) {
-+    delay = 0;
-+  }
- 
-   *position = 0;
-   if (stm->write_position >= (snd_pcm_uframes_t) delay) {
-@@ -1096,7 +1214,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1096,7 +1205,7 @@ alsa_stream_get_latency(cubeb_stream * s
    snd_pcm_sframes_t delay;
    /* This function returns the delay in frames until a frame written using
       snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
diff --git a/www/firefox/patches/patch-media_webrtc_signaling_test_common.build b/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
index 795263073a9..1a6ac346935 100644
--- a/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
+++ b/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.3 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.4 2017/01/25 13:24:51 ryoon Exp $
 
---- media/webrtc/signaling/test/common.build.orig	2016-10-31 20:15:24.000000000 +0000
+--- media/webrtc/signaling/test/common.build.orig	2017-01-22 14:52:50.270634552 +0000
 +++ media/webrtc/signaling/test/common.build
-@@ -96,11 +96,12 @@ if CONFIG['JS_SHARED_LIBRARY']:
+@@ -96,6 +96,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
  
  USE_LIBS += ['mozglue']
  
@@ -10,10 +10,3 @@ $NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.3 2016/12/03 09:58:2
  OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
  OS_LIBS += CONFIG['REALTIME_LIBS']
  
--if CONFIG['MOZ_ALSA']:
--    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
-+if CONFIG['MOZ_OSS']:
-+    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
- 
- if CONFIG['MOZ_SYSTEM_JPEG']:
-     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
diff --git a/www/firefox/patches/patch-mfbt_Attributes.h b/www/firefox/patches/patch-mfbt_Attributes.h
deleted file mode 100644
index 2a0a54dd4c2..00000000000
--- a/www/firefox/patches/patch-mfbt_Attributes.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-mfbt_Attributes.h,v 1.8 2016/12/03 09:58:26 ryoon Exp $
-
---- mfbt/Attributes.h.orig	2016-10-31 20:15:24.000000000 +0000
-+++ mfbt/Attributes.h
-@@ -50,6 +50,7 @@
-  * don't indicate support for them here, due to
-  * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
-  */
-+#  define MOZ_HAVE_CXX11_ALIGNAS
- #  define MOZ_HAVE_NEVER_INLINE          __declspec(noinline)
- #  define MOZ_HAVE_NORETURN              __declspec(noreturn)
- #  if _MSC_VER >= 1900
diff --git a/www/firefox/patches/patch-modules_libmar_tests_moz.build b/www/firefox/patches/patch-modules_libmar_tests_moz.build
new file mode 100644
index 00000000000..43acd98ad2f
--- /dev/null
+++ b/www/firefox/patches/patch-modules_libmar_tests_moz.build
@@ -0,0 +1,29 @@
+$NetBSD: patch-modules_libmar_tests_moz.build,v 1.1 2017/01/25 13:24:51 ryoon Exp $
+
+--- modules/libmar/tests/moz.build.orig	2016-10-31 20:15:26.000000000 +0000
++++ modules/libmar/tests/moz.build
+@@ -6,24 +6,7 @@
+ 
+ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+ 
+-DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX']
+-
+ if CONFIG['OS_TARGET'] != 'Android':
+-    nss_files = ['nss3']
+-    if not CONFIG['MOZ_FOLD_LIBS']:
+-        nss_files.extend([
+-            'nssutil3',
+-            'plc4',
+-            'nspr4',
+-            'plds4',
+-        ])
+-    TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted(
+-        ['!/dist/bin/%s%s%s' % (
+-            CONFIG['DLL_PREFIX'],
+-            name,
+-            CONFIG['DLL_SUFFIX'],
+-        ) for name in nss_files]
+-    )
+     TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [
+         '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'],
+     ]
diff --git a/www/firefox/patches/patch-netwerk_protocol_http_Http2Session.cpp b/www/firefox/patches/patch-netwerk_protocol_http_Http2Session.cpp
deleted file mode 100644
index 7fc49a6cd27..00000000000
--- a/www/firefox/patches/patch-netwerk_protocol_http_Http2Session.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-netwerk_protocol_http_Http2Session.cpp,v 1.7 2017/01/20 15:03:37 ryoon Exp $
-
-Fix an insecure connection error with NSS 3.28 or later in HTTP2 case
-https://hg.mozilla.org/mozilla-central/rev/361ac226da2a
-
---- netwerk/protocol/http/Http2Session.cpp.orig	2016-10-31 20:15:27.000000000 +0000
-+++ netwerk/protocol/http/Http2Session.cpp
-@@ -3542,8 +3542,8 @@ Http2Session::ConfirmTLSProfile()
-     LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
-           this, keybits));
-     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
--  } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128
--    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n",
-+  } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1.
-+    LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n",
-           this, keybits));
-     RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
-   }
diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build
index e74c05c36d6..fbd89619d26 100644
--- a/www/firefox/patches/patch-toolkit_library_moz.build
+++ b/www/firefox/patches/patch-toolkit_library_moz.build
@@ -1,27 +1,10 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.8 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.9 2017/01/25 13:24:51 ryoon Exp $
 
 * Support system libraries
 
---- toolkit/library/moz.build.orig	2016-11-05 00:20:16.000000000 +0000
+--- toolkit/library/moz.build.orig	2017-01-22 14:52:50.338659055 +0000
 +++ toolkit/library/moz.build
-@@ -211,6 +211,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
-     ]
- 
- OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
-+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- OS_LIBS += CONFIG['MOZ_SERVO_LIBS']
- 
-@@ -220,9 +221,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
- if CONFIG['MOZ_SYSTEM_PNG']:
-     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
- 
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
-+
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
-+
+@@ -241,6 +241,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
  if CONFIG['MOZ_SYSTEM_HUNSPELL']:
      OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
  
@@ -43,14 +26,3 @@ $NetBSD: patch-toolkit_library_moz.build,v 1.8 2016/12/03 09:58:26 ryoon Exp $
  if CONFIG['MOZ_SYSTEM_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
-@@ -232,8 +254,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
- if not CONFIG['MOZ_TREE_PIXMAN']:
-     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
- 
--if CONFIG['MOZ_ALSA']:
--    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
-+if CONFIG['MOZ_OSS']:
-+    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
- 
- if CONFIG['HAVE_CLOCK_MONOTONIC']:
-     OS_LIBS += CONFIG['REALTIME_LIBS']
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
index a251f47dea3..363412184db 100644
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
+++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
@@ -1,13 +1,13 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.5 2016/04/27 16:22:40 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.6 2017/01/25 13:24:51 ryoon Exp $
 
---- xpcom/reflect/xptcall/md/unix/moz.build.orig	2016-04-15 16:57:50.000000000 +0000
+--- xpcom/reflect/xptcall/md/unix/moz.build.orig	2017-01-16 16:16:53.000000000 +0000
 +++ xpcom/reflect/xptcall/md/unix/moz.build
-@@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
-         'xptcinvoke_darwin.cpp',
-         'xptcstubs_darwin.cpp',
-     ]
--    if CONFIG['OS_TEST'] == 'powerpc':
-+    if CONFIG['OS_TEST'] == 'ppc':
+@@ -145,7 +145,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD':
+             'xptcstubs_netbsd_m68k.cpp'
+         ]
+ 
+-if CONFIG['OS_ARCH'] == 'Linux':
++if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'):
+     if CONFIG['OS_TEST'] == 'aarch64':
          SOURCES += [
-             '!xptcstubs_asm_ppc_darwin.s',
-             'xptcinvoke_asm_ppc_rhapsody.s',
+             'xptcinvoke_aarch64.cpp',
author	ryoon <ryoon@pkgsrc.org>	2017-01-25 13:24:51 +0000
committer	ryoon <ryoon@pkgsrc.org>	2017-01-25 13:24:51 +0000
commit	09d3a395f93e4a2f0358d05e16e068a12624f871 (patch)
tree	c53612d38218d056ff3d1d8c1b92561d26ee83ca
parent	965b4f4ea409dcf8b3b6183028c580a760190953 (diff)
download	pkgsrc-09d3a395f93e4a2f0358d05e16e068a12624f871.tar.gz