CVS commit: pkgsrc/www/firefox

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/firefox
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Sat, 30 Sep 2017 05:34:12 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Sep 30 05:34:12 UTC 2017

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-aa patch-config_external_moz.build
            patch-dom_media_AudioStream.cpp patch-dom_media_AudioStream.h
            patch-ipc_glue_CrossProcessSemaphore__posix.cpp
            patch-media_libcubeb_src_cubeb__alsa.c
            patch-media_libcubeb_src_moz.build
            patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h
            patch-toolkit_library_moz.build patch-toolkit_moz.configure
Added Files:
        pkgsrc/www/firefox/patches: patch-media_libcubeb_src_cubeb__jack.cpp
            patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
            patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
            patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
            patch-modules_pdfium_update.sh
            patch-servo_components_style_build__gecko.rs
Removed Files:
        pkgsrc/www/firefox/patches:
            patch-browser_base_content_baseMenuOverlay.xul
            patch-browser_components_nsBrowserGlue.js
            patch-browser_components_preferences_in-content-new_main.xul
            patch-browser_components_preferences_in-content-new_privacy.js
            patch-browser_components_preferences_in-content-new_privacy.xul
            patch-browser_components_preferences_in-content_advanced.js
            patch-browser_components_preferences_in-content_advanced.xul
            patch-browser_confvars.sh
            patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd
            patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd
            patch-build_moz.configure_rust.configure
            patch-build_pgo_profileserver.py patch-config_rules.mk
            patch-dom_base_nsWrapperCache.h patch-dom_media_MediaPrefs.h
            patch-dom_media_gtest_moz.build
            patch-dom_messagechannel_MessagePort.cpp
            patch-dom_messagechannel_MessagePortChild.h
            patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
            patch-gfx_2d_ScaledFontBase.cpp
            patch-js_src_jit_ExecutableAllocator.h
            patch-js_src_jit_none_MacroAssembler-none.h
            patch-media_libstagefright_binding_DecoderData.cpp
            patch-media_libstagefright_binding_MP4Metadata.cpp
            patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h
            patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h
            patch-media_libstagefright_gtest_moz.build
            patch-media_libstagefright_moz.build
            patch-memory_mozalloc_mozalloc__abort.cpp
            patch-mobile_android_confvars.sh
            patch-modules_libjar_nsZipArchive.cpp patch-netwerk_base_moz.build
            patch-netwerk_base_nsStandardURL.cpp
            patch-third__party_python_futures_concurrent_futures_process.py
            patch-toolkit_components_resistfingerprinting_nsRFPService.cpp
            patch-toolkit_components_telemetry_Histograms.json
            patch-toolkit_library_gtest_moz.build
            patch-toolkit_toolkit.mozbuild patch-toolkit_xre_nsAppRunner.cpp
            patch-xpcom_base_nsDebugImpl.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp
            patch-xpcom_reflect_xptcall_md_unix_xptcstubs__ppc__netbsd.cpp
            patch-xpcom_rust_nsstring_gtest_moz.build

Log Message:
Update to 56.0

New
    Launched Firefox Screenshots, a feature that lets users take, save, and share screenshots without leaving the browser

    Added support for address form autofill (en-US only)

    Updated Preferences
        Added search tool so users can find a specific setting quickly
        Reorganized preferences so users can more easily scan settings
        Rewrote descriptions so users can better understand choices and how they affect browsing
        Revised data collection choices so they align with updated Privacy Notice and data collection strategy

    Media opened in a background tab will not play until the tab is selected

    Improved Send Tabs feature of Sync for iOS and Android, and Send Tabs can be discovered even by users without a Firefox Account

Changed
    Replaced character encoding converters with a new Encoding Standard-compliant implementation written in Rust

    Added hardware acceleration for AES-GCM

    Updated the Safe Browsing protocol to version 4

    Reduced update download file size by approximately 20 percent

    Improved security for verifying update downloads

Developer
    Added Layout Panel to CSS Grid DevTools


To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.122 -r1.123 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.295 -r1.296 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.97 -r1.98 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.53 -r1.54 pkgsrc/www/firefox/patches/patch-aa
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox/patches/patch-browser_base_content_baseMenuOverlay.xul \
    pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_main.xul \
    pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.js \
    pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.xul \
    pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.js \
    pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.xul \
    pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd \
    pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd \
    pkgsrc/www/firefox/patches/patch-dom_base_nsWrapperCache.h \
    pkgsrc/www/firefox/patches/patch-dom_media_MediaPrefs.h \
    pkgsrc/www/firefox/patches/patch-dom_media_gtest_moz.build \
    pkgsrc/www/firefox/patches/patch-dom_messagechannel_MessagePort.cpp \
    pkgsrc/www/firefox/patches/patch-dom_messagechannel_MessagePortChild.h \
    pkgsrc/www/firefox/patches/patch-gfx_2d_ScaledFontBase.cpp \
    pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h \
    pkgsrc/www/firefox/patches/patch-media_libstagefright_gtest_moz.build \
    pkgsrc/www/firefox/patches/patch-media_libstagefright_moz.build \
    pkgsrc/www/firefox/patches/patch-netwerk_base_moz.build \
    pkgsrc/www/firefox/patches/patch-netwerk_base_nsStandardURL.cpp \
    pkgsrc/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py \
    pkgsrc/www/firefox/patches/patch-toolkit_components_resistfingerprinting_nsRFPService.cpp \
    pkgsrc/www/firefox/patches/patch-toolkit_library_gtest_moz.build \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__ppc__netbsd.cpp \
    pkgsrc/www/firefox/patches/patch-xpcom_rust_nsstring_gtest_moz.build
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/www/firefox/patches/patch-browser_components_nsBrowserGlue.js \
    pkgsrc/www/firefox/patches/patch-js_src_jit_none_MacroAssembler-none.h \
    pkgsrc/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp
cvs rdiff -u -r1.2 -r0 pkgsrc/www/firefox/patches/patch-browser_confvars.sh \
    pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure \
    pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp \
    pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp \
    pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h \
    pkgsrc/www/firefox/patches/patch-mobile_android_confvars.sh \
    pkgsrc/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp
cvs rdiff -u -r1.7 -r0 \
    pkgsrc/www/firefox/patches/patch-build_pgo_profileserver.py \
    pkgsrc/www/firefox/patches/patch-toolkit_xre_nsAppRunner.cpp
cvs rdiff -u -r1.15 -r1.16 \
    pkgsrc/www/firefox/patches/patch-config_external_moz.build
cvs rdiff -u -r1.5 -r0 pkgsrc/www/firefox/patches/patch-config_rules.mk \
    pkgsrc/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp \
    pkgsrc/www/firefox/patches/patch-js_src_jit_ExecutableAllocator.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.cpp \
    pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
cvs rdiff -u -r1.23 -r1.24 \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__jack.cpp \
    pkgsrc/www/firefox/patches/patch-modules_pdfium_update.sh \
    pkgsrc/www/firefox/patches/patch-servo_components_style_build__gecko.rs
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build
cvs rdiff -u -r0 -r1.14 \
    pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc \
    pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
cvs rdiff -u -r0 -r1.13 \
    pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp \
    pkgsrc/www/firefox/patches/patch-toolkit_toolkit.mozbuild
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/www/firefox/patches/patch-modules_libjar_nsZipArchive.cpp \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/www/firefox/patches/patch-toolkit_moz.configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.306 pkgsrc/www/firefox/Makefile:1.307
--- pkgsrc/www/firefox/Makefile:1.306   Mon Sep 18 09:53:37 2017
+++ pkgsrc/www/firefox/Makefile Sat Sep 30 05:34:11 2017
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.306 2017/09/18 09:53:37 maya Exp $
+# $NetBSD: Makefile,v 1.307 2017/09/30 05:34:11 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            55.0
-MOZ_BRANCH_MINOR=      .3
+MOZ_BRANCH=            56.0
+MOZ_BRANCH_MINOR=      
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
@@ -24,6 +23,8 @@ MOZILLA_DIR=  # empty
 # Note: when updating remember to conditionalise about-background.png in PLIST
 CONFIGURE_ARGS+=       --enable-application=browser
 
+CFLAGS+=       -I${PREFIX}/include/nspr
+
 # workround for link of libxul.so etc.
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS.SunOS+=                -lm

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.122 pkgsrc/www/firefox/PLIST:1.123
--- pkgsrc/www/firefox/PLIST:1.122      Sat Sep  2 03:47:46 2017
+++ pkgsrc/www/firefox/PLIST    Sat Sep 30 05:34:11 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.122 2017/09/02 03:47:46 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.123 2017/09/30 05:34:11 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -82,9 +82,9 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/browser-fullZoom.js
 lib/firefox/browser/chrome/browser/content/browser/browser-gestureSupport.js
 lib/firefox/browser/chrome/browser/content/browser/browser-media.js
+lib/firefox/browser/chrome/browser/content/browser/browser-pageActions.js
 lib/firefox/browser/chrome/browser/content/browser/browser-places.js
 lib/firefox/browser/chrome/browser/content/browser/browser-plugins.js
-lib/firefox/browser/chrome/browser/content/browser/browser-refreshblocker.js
 lib/firefox/browser/chrome/browser/content/browser/browser-safebrowsing.js
 lib/firefox/browser/chrome/browser/content/browser/browser-sidebar.js
 lib/firefox/browser/chrome/browser/content/browser/browser-social.js
@@ -221,14 +221,13 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/preferences/fonts.xul
 lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.css
 lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.xml
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/advanced.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/applications.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/containers.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/findInPage.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/main.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/preferences.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/preferences.xul
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/privacy.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/search.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/subdialogs.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/sync.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/advanced.js
@@ -318,7 +317,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.js
 lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.xul
 lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-small.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutNetError.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutProviderDirectory.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore-window-icon.png
@@ -359,8 +357,6 @@ lib/firefox/browser/chrome/browser/skin/
 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/containers.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-not-secure.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/connection.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/extension.svg
@@ -394,7 +390,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/customize.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/developer.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/device-desktop.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/device-mobile.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/download.svg
@@ -410,7 +405,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/edit-copy.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/edit-cut.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/edit-paste.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/email-link.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/error-pages.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/favicon-search-16.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/feed.svg
@@ -444,7 +438,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/link.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/mail.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/menu.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize.png
@@ -464,7 +457,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/newTab.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/open.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/page-action.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/page-livemarks.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.png
@@ -479,15 +471,22 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/icons.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/icons%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/allBookmarks.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-menu-arrow.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar-menuPanel.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/calendar.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/downloads.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/editBookmarkOverlay.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/folder-live.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/folder-smart.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/folder.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/history.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/livemark-item.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/organizer.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/organizer.xml
@@ -496,6 +495,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/starred48.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/tag.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/unfiledBookmarks.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/unsortedBookmarks.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/places/unstarred48.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
@@ -506,6 +506,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/favicon.ico
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/icons.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/preferences.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/search-arrow-indicator.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/search.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/siteDataSettings.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
@@ -533,7 +534,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-arrow-go.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-engine-placeholder.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-engine-placeholder%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/search-history-icon.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-magnifying-glass.svg
@@ -546,6 +546,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/settings.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/share.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sidebar/close.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars-right.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-16.png
@@ -561,18 +562,13 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/synced-tabs.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/syncedtabs/sidebar.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/tab-crashed.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs-inverted.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/crashed.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/newtab-inverted.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/newtab.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/pendingpaint.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-muted.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-playing.svg
@@ -600,7 +596,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge-failed.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-star.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-tab.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/warning-white.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/warning.svg
@@ -698,6 +693,7 @@ lib/firefox/browser/chrome/devtools/cont
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/hint/show-hint.js
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/tern/tern.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/cmiframe.html
 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/mozilla.css
@@ -713,6 +709,7 @@ lib/firefox/browser/chrome/devtools/cont
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/properties.js
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/utils.js
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/webaudioeditor.xul
+lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.xhtml
 lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.xul
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/aboutdebugging.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/controls.js
@@ -818,7 +815,17 @@ lib/firefox/browser/chrome/devtools/modu
 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
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/font-options.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/fonts.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/App.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/Font.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontList.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/reducers/font-options.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/reducers/fonts.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/types.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/utils/l10n.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/grids.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/highlighter-settings.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/index.js
@@ -832,11 +839,13 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/reducers/highlighter-settings.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/types.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/utils/l10n.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/utils/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/App.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/LayoutPromoteBar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/utils.js
@@ -886,8 +895,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/toolbar.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/json-viewer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/lib/require.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/main.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/viewer-config.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/allocations.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/census-display.js
@@ -970,6 +977,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-method.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-protocol.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-remote-ip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-response-header.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-response-time.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-scheme.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-set-cookies.js
@@ -1020,6 +1028,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/timing-markers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/ui.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/create-store.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-predicates.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-text-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/format-utils.js
@@ -1185,6 +1194,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/prefs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/react-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/create-store.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/debounce.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/history.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/log.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/promise.js
@@ -1193,7 +1203,6 @@ lib/firefox/browser/chrome/devtools/modu
 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-map/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-map/worker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-utils.js
@@ -1202,6 +1211,8 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/telemetry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/theme.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/undo.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/WasmDis.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/WasmParser.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/immutable.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/jsol.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/jszip.js
@@ -1215,6 +1226,8 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/redux.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/reselect.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/seamless-immutable.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/stringvalidator/util/assert.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/stringvalidator/validator.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/view-source.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/webgl-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/AbstractTreeItem.jsm
@@ -1265,6 +1278,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/infer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/signal.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/sourceeditor/tern/tern.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/sourceeditor/wasm.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/storage/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/storage/ui.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEditorUI.jsm
@@ -1308,7 +1322,6 @@ lib/firefox/browser/chrome/devtools/modu
 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/enhancers.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/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/messages.js
@@ -1330,7 +1343,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/variables-view-link.js
 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
@@ -1355,7 +1367,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/context-menu.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/new-webconsole.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-connection-proxy.js
@@ -1365,7 +1377,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-projects.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-validator.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/build.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/config-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/project-list.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runtime-list.js
@@ -1442,6 +1453,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/css-grid-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.js
 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/shapes-geometry-utils.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-listeners.js
@@ -1494,12 +1506,14 @@ lib/firefox/browser/chrome/devtools/modu
 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/debounce.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/extend.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
@@ -1617,6 +1631,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/spell.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/source/lib/gcli/util/util.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/templater.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/generate-uuid.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/CensusUtils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/DominatorTreeNode.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/HeapAnalysesClient.js
@@ -1707,6 +1722,7 @@ lib/firefox/browser/chrome/devtools/modu
 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/wasm-source-map.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
@@ -2006,7 +2022,6 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/browser/safebrowsing/safebrowsing.properties
 lib/firefox/browser/chrome/en-US/locale/browser/sanitize.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/search.properties
-lib/firefox/browser/chrome/en-US/locale/browser/searchbar.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/amazondotcom.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/bing.xml
 lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ddg.xml
@@ -2056,6 +2071,7 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/inspector.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/jit-optimizations.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/jsonview.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/key-shortcuts.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/layout.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/markers.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/memory.properties
@@ -2093,6 +2109,7 @@ lib/firefox/browser/chrome/en-US/locale/
 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/en-US/formautofill.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/chrome.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/viewer.properties
 lib/firefox/browser/chrome/icons/default/default16.png
@@ -2373,8 +2390,6 @@ lib/firefox/browser/chrome/webide/conten
 lib/firefox/browser/chrome/webide/content/details.xhtml
 lib/firefox/browser/chrome/webide/content/devicepreferences.js
 lib/firefox/browser/chrome/webide/content/devicepreferences.xhtml
-lib/firefox/browser/chrome/webide/content/logs.js
-lib/firefox/browser/chrome/webide/content/logs.xhtml
 lib/firefox/browser/chrome/webide/content/monitor.js
 lib/firefox/browser/chrome/webide/content/monitor.xhtml
 lib/firefox/browser/chrome/webide/content/newapp.js
@@ -2401,7 +2416,6 @@ lib/firefox/browser/chrome/webide/skin/d
 lib/firefox/browser/chrome/webide/skin/default-app-icon.png
 lib/firefox/browser/chrome/webide/skin/details.css
 lib/firefox/browser/chrome/webide/skin/icons.png
-lib/firefox/browser/chrome/webide/skin/logs.css
 lib/firefox/browser/chrome/webide/skin/monitor.css
 lib/firefox/browser/chrome/webide/skin/newapp.css
 lib/firefox/browser/chrome/webide/skin/noise.png
@@ -2430,7 +2444,6 @@ lib/firefox/browser/components/nsBrowser
 lib/firefox/browser/components/nsSessionStartup.js
 lib/firefox/browser/components/nsSessionStore.js
 lib/firefox/browser/components/nsSetDefaultBrowser.js
-lib/firefox/browser/components/webideCli.js
 lib/firefox/browser/defaults/blocklists/addons.json
 lib/firefox/browser/defaults/blocklists/certificates.json
 lib/firefox/browser/defaults/blocklists/gfx.json
@@ -2445,6 +2458,85 @@ lib/firefox/browser/defaults/preferences
 lib/firefox/browser/defaults/preferences/webide-prefs.js
 lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/bootstrap.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome.manifest
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/Actions.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/Dedupe.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/PerfService.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/Reducers.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/ShortURL.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.bundle.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.css
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-bookmark-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-bookmark-remove-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-delete-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-dismiss-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-forward-16-white.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-forward-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-historyItem-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-info-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-info-option-12.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-more-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-newWindow-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-newWindow-private-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-now-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-pin-12.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-pin-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-pocket-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-search-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-settings-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-topsites-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-trending-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-unpin-16.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/topic-show-more-12.svg
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/aliexpress-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/allegro-pl%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-ca%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-de%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-fr%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/amazon-uk%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/avito%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/bbc-uk%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/ebay-de%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/ebay%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/facebook-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/leboncoin%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/ok%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/olx-pl%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/reddit-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/twitter-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/vk-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/wikipedia-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/wykop%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/youtube-com%2x.png@localhost
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/top_sites.json
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/locales.json
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStream.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStreamMessageChannel.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStreamPrefs.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/LocalizationFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ManualMigration.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/NewTabInit.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/PlacesFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/PrefsFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/Screenshots.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/SnippetsFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/Store.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/SystemTickFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TelemetryFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TelemetrySender.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TippyTopProvider.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TopSitesFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TopStoriesFeed.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/Redux.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react-dom.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react-intl.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react-redux.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/redux.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/aushelper%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/aushelper%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/clicktoplay-rollout%mozilla.org@localhost/bootstrap.js
@@ -2504,6 +2596,9 @@ lib/firefox/browser/features/firefox@get
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/menuPanel.png
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/menuPanel%2x.png@localhost
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/pocket.css
+lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/library-pocket-animation.svg
+lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket-animation.svg
+lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket-list.svg
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket.css
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket.svg
 lib/firefox/browser/features/firefox%getpocket.com@localhost/en-US/locale/en-US/pocket.properties
@@ -2512,6 +2607,83 @@ lib/firefox/browser/features/followonsea
 lib/firefox/browser/features/followonsearch%mozilla.com@localhost/chrome.manifest
 lib/firefox/browser/features/followonsearch%mozilla.com@localhost/chrome/content/followonsearch-fs.js
 lib/firefox/browser/features/followonsearch%mozilla.com@localhost/install.rdf
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/bootstrap.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome.manifest
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/FormAutofillFrameScript.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/addressReferences.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/editAddress.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/editAddress.xhtml
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/formautofill.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/formautofill.xml
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/formfill-anchor.svg
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/heuristicsRegexp.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/icon-address-save.svg
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/icon-address-update.svg
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageAddresses.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageAddresses.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/manageAddresses.xhtml
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/content/nameReferences.js
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillContent.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillDoorhanger.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillHandler.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillHeuristics.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillNameUtils.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillParent.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillPreferences.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillSync.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/FormAutofillUtils.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/MasterPassword.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/ProfileAutoCompleteResult.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/ProfileStorage.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumber.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumberMetaData.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/res/phonenumberutils/PhoneNumberNormalizer.jsm
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/linux/autocomplete-item.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/linux/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/osx/autocomplete-item.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/osx/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/shared/autocomplete-item.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/shared/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/windows/autocomplete-item.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/windows/editAddress.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/install.rdf
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/bootstrap.js
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome.manifest
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_addons.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_customize.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_default.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_private.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_search.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_sync.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons-notification.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize-notification.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default-notification.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_performance-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_performance.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private-notification.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_search-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_search-notification.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_search.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync-colored.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync-notification.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_tour-complete.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/overlay-icon.svg
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/lib/UITour-lib.js
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/modules/OnboardingTourType.jsm
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding-tour-agent.js
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding.css
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/onboarding.js
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/en-US/locale/en-US/onboarding.properties
+lib/firefox/browser/features/onboarding%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ach/messages.json
@@ -2543,8 +2715,8 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ga_IE/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/gu_IN/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/he/messages.json
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hr/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hi_IN/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hr/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hsb/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hu/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hy_AM/messages.json
@@ -2644,37 +2816,47 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/sitehelper.js
 lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome.manifest
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/ActionSandboxManager.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/CleanupManager.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/ClientEnvironment.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/EventEmitter.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/FilterExpressions.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Heartbeat.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/LogManager.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/NormandyApi.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/NormandyDriver.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/PreferenceExperiments.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/PreferenceFilters.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/RecipeRunner.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Sampling.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/SandboxManager.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/ShieldRecipeClient.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Storage.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Utils.jsm
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/LICENSE.txt
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/Jexl.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/Lexer.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/evaluator/Evaluator.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/evaluator/handlers.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/grammar.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/parser/Parser.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/parser/handlers.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/parser/states.js
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/osx/Heartbeat.css
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/Heartbeat.css
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/heartbeat-icon.svg
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/heartbeat-star-lit.svg
-lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/heartbeat-star-off.svg
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/AboutPages.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/about-studies/about-studies.css
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/about-studies/about-studies.html
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/about-studies/about-studies.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/about-studies/common.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/about-studies/img/shield-logo.png
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/about-studies/shield-studies.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/shield-content-frame.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/shield-content-process.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/ActionSandboxManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/AddonStudies.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/Addons.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/CleanupManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/ClientEnvironment.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/EventEmitter.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/FilterExpressions.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/Heartbeat.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/LogManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/NormandyApi.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/NormandyDriver.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/PreferenceExperiments.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/PreferenceFilters.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/RecipeRunner.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/Sampling.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/SandboxManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/ShieldPreferences.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/ShieldRecipeClient.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/Storage.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/Uptake.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/lib/Utils.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/skin/osx/Heartbeat.css
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/skin/shared/Heartbeat.css
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/skin/shared/heartbeat-icon.svg
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/skin/shared/heartbeat-star-lit.svg
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/skin/shared/heartbeat-star-off.svg
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/vendor/LICENSE_THIRDPARTY
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/vendor/PropTypes.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/vendor/React.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/vendor/ReactDOM.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/vendor/classnames.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/vendor/mozjexl.js
 lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/chrome.manifest
@@ -2709,7 +2891,6 @@ lib/firefox/browser/modules/ExtensionsUI
 lib/firefox/browser/modules/Feeds.jsm
 lib/firefox/browser/modules/FormSubmitObserver.jsm
 lib/firefox/browser/modules/FormValidationHandler.jsm
-lib/firefox/browser/modules/FullZoomUI.jsm
 lib/firefox/browser/modules/LaterRun.jsm
 lib/firefox/browser/modules/MigrationUtils.jsm
 lib/firefox/browser/modules/NewTabPrefsProvider.jsm
@@ -2717,14 +2898,16 @@ lib/firefox/browser/modules/NewTabRemote
 lib/firefox/browser/modules/NewTabSearchProvider.jsm
 lib/firefox/browser/modules/NewTabURL.jsm
 lib/firefox/browser/modules/NewTabWebChannel.jsm
+lib/firefox/browser/modules/PageActions.jsm
 lib/firefox/browser/modules/PanelMultiView.jsm
 lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
-lib/firefox/browser/modules/ParseSymbols-worker.js
+lib/firefox/browser/modules/ParseBreakpadSymbols-worker.js
+lib/firefox/browser/modules/ParseCppFiltSymbols-worker.js
+lib/firefox/browser/modules/ParseNMSymbols-worker.js
 lib/firefox/browser/modules/ParseSymbols.jsm
 lib/firefox/browser/modules/PermissionUI.jsm
 lib/firefox/browser/modules/PlacesUIUtils.jsm
 lib/firefox/browser/modules/PluginContent.jsm
-lib/firefox/browser/modules/PreviewProvider.jsm
 lib/firefox/browser/modules/ProcessHangMonitor.jsm
 lib/firefox/browser/modules/ReaderParent.jsm
 lib/firefox/browser/modules/RecentWindow.jsm
@@ -2739,6 +2922,8 @@ lib/firefox/browser/modules/Social.jsm
 lib/firefox/browser/modules/SocialService.jsm
 lib/firefox/browser/modules/TransientPrefs.jsm
 lib/firefox/browser/modules/UITour.jsm
+lib/firefox/browser/modules/UpdateTopLevelContentWindowIDHelper.jsm
+lib/firefox/browser/modules/ZoomUI.jsm
 lib/firefox/browser/modules/devtools/devtools.js
 lib/firefox/browser/modules/devtools/gDevTools.jsm
 lib/firefox/browser/modules/distribution.js
@@ -2748,7 +2933,6 @@ lib/firefox/browser/modules/sessionstore
 lib/firefox/browser/modules/sessionstore/DocShellCapabilities.jsm
 lib/firefox/browser/modules/sessionstore/FrameTree.jsm
 lib/firefox/browser/modules/sessionstore/GlobalState.jsm
-lib/firefox/browser/modules/sessionstore/PageStyle.jsm
 lib/firefox/browser/modules/sessionstore/PrivacyFilter.jsm
 lib/firefox/browser/modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
 lib/firefox/browser/modules/sessionstore/RunState.jsm
@@ -2848,7 +3032,6 @@ lib/firefox/chrome/en-US/locale/en-US/gl
 lib/firefox/chrome/en-US/locale/en-US/global/global-strres.properties
 lib/firefox/chrome/en-US/locale/en-US/global/global.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/globalKeys.dtd
-lib/firefox/chrome/en-US/locale/en-US/global/headsUpDisplay.properties
 lib/firefox/chrome/en-US/locale/en-US/global/intl.css
 lib/firefox/chrome/en-US/locale/en-US/global/intl.properties
 lib/firefox/chrome/en-US/locale/en-US/global/keys.properties
@@ -2939,7 +3122,7 @@ lib/firefox/chrome/marionette/content/at
 lib/firefox/chrome/marionette/content/browser.js
 lib/firefox/chrome/marionette/content/capture.js
 lib/firefox/chrome/marionette/content/cert.js
-lib/firefox/chrome/marionette/content/cookies.js
+lib/firefox/chrome/marionette/content/cookie.js
 lib/firefox/chrome/marionette/content/driver.js
 lib/firefox/chrome/marionette/content/element.js
 lib/firefox/chrome/marionette/content/error.js
@@ -2950,12 +3133,13 @@ lib/firefox/chrome/marionette/content/in
 lib/firefox/chrome/marionette/content/l10n.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
 lib/firefox/chrome/marionette/content/modal.js
 lib/firefox/chrome/marionette/content/navigate.js
 lib/firefox/chrome/marionette/content/packets.js
 lib/firefox/chrome/marionette/content/proxy.js
+lib/firefox/chrome/marionette/content/reftest.js
+lib/firefox/chrome/marionette/content/reftest.xul
 lib/firefox/chrome/marionette/content/server.js
 lib/firefox/chrome/marionette/content/session.js
 lib/firefox/chrome/marionette/content/stream-utils.js
@@ -3001,13 +3185,14 @@ lib/firefox/chrome/pippki/content/pippki
 lib/firefox/chrome/pippki/content/pippki/viewCertDetails.xul
 lib/firefox/chrome/recording/content/recording.js
 lib/firefox/chrome/recording/content/recording.xul
+lib/firefox/chrome/toolkit/content/extensions/dummy.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-browser-content.js
+lib/firefox/chrome/toolkit/content/extensions/ext-browserSettings.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-backgroundPage.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-extension.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-identity.js
-lib/firefox/chrome/toolkit/content/extensions/ext-c-permissions.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-runtime.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-storage.js
 lib/firefox/chrome/toolkit/content/extensions/ext-c-test.js
@@ -3018,6 +3203,7 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/ext-extension.js
 lib/firefox/chrome/toolkit/content/extensions/ext-geolocation.js
 lib/firefox/chrome/toolkit/content/extensions/ext-i18n.js
+lib/firefox/chrome/toolkit/content/extensions/ext-identity.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
@@ -3033,6 +3219,7 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/ext-webNavigation.js
 lib/firefox/chrome/toolkit/content/extensions/ext-webRequest.js
 lib/firefox/chrome/toolkit/content/extensions/schemas/alarms.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/browser_settings.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/contextual_identities.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/cookies.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/downloads.json
@@ -3230,6 +3417,7 @@ lib/firefox/chrome/toolkit/content/globa
 lib/firefox/chrome/toolkit/content/global/viewSource.xul
 lib/firefox/chrome/toolkit/content/global/viewSourceUtils.js
 lib/firefox/chrome/toolkit/content/global/viewZoomOverlay.js
+lib/firefox/chrome/toolkit/content/global/win.xul
 lib/firefox/chrome/toolkit/content/global/xml/XMLMonoPrint.css
 lib/firefox/chrome/toolkit/content/global/xml/XMLPrettyPrint.css
 lib/firefox/chrome/toolkit/content/global/xml/XMLPrettyPrint.xml
@@ -3277,6 +3465,8 @@ lib/firefox/chrome/toolkit/content/mozap
 lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.js
 lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.xul
 lib/firefox/chrome/toolkit/content/passwordmgr/recipes.json
+lib/firefox/chrome/toolkit/content/preferences.properties
+lib/firefox/chrome/toolkit/content/providers.json
 lib/firefox/chrome/toolkit/content/satchel/formSubmitListener.js
 lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.css
 lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.xml
@@ -3374,7 +3564,8 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/calendar-arrow-right.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/close.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/error-16.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/find-arrows.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/find-next-arrow.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/find-previous-arrow.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/info.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/input-clear.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/loading.png
@@ -3402,12 +3593,16 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/listbox.css
 lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
 lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css
-lib/firefox/chrome/toolkit/skin/classic/global/media/closedCaptionButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/audioMutedButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/audioNoAudioButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/audioUnmutedButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/closedCaptionButton-cc-off.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/closedCaptionButton-cc-on.svg
 lib/firefox/chrome/toolkit/skin/classic/global/media/error.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/fullscreenButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/fullscreenEnterButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/fullscreenExitButton.svg
 lib/firefox/chrome/toolkit/skin/classic/global/media/imagedoc-darknoise.png
 lib/firefox/chrome/toolkit/skin/classic/global/media/imagedoc-lightnoise.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/muteButton.svg
 lib/firefox/chrome/toolkit/skin/classic/global/media/pauseButton.svg
 lib/firefox/chrome/toolkit/skin/classic/global/media/playButton.svg
 lib/firefox/chrome/toolkit/skin/classic/global/media/stalled.png
@@ -3550,7 +3745,6 @@ lib/firefox/components/PageThumbsProtoco
 lib/firefox/components/PlacesCategoriesStarter.js
 lib/firefox/components/PresentationControlService.js
 lib/firefox/components/PresentationDataChannelSessionTransport.js
-lib/firefox/components/PresentationDeviceInfoManager.js
 lib/firefox/components/PrivateBrowsingTrackingProtectionWhitelist.js
 lib/firefox/components/ProcessSelector.js
 lib/firefox/components/Push.js
@@ -3693,6 +3887,7 @@ lib/firefox/modules/CertUtils.jsm
 lib/firefox/modules/CharsetMenu.jsm
 lib/firefox/modules/ChromeManifestParser.jsm
 lib/firefox/modules/ClientID.jsm
+lib/firefox/modules/CloudStorage.jsm
 lib/firefox/modules/ClusterLib.js
 lib/firefox/modules/Color.jsm
 lib/firefox/modules/ColorAnalyzer_worker.js
@@ -3721,6 +3916,7 @@ lib/firefox/modules/DeferredSave.jsm
 lib/firefox/modules/DeferredTask.jsm
 lib/firefox/modules/Deprecated.jsm
 lib/firefox/modules/DownloadCore.jsm
+lib/firefox/modules/DownloadHistory.jsm
 lib/firefox/modules/DownloadIntegration.jsm
 lib/firefox/modules/DownloadLastDir.jsm
 lib/firefox/modules/DownloadList.jsm
@@ -3764,6 +3960,7 @@ lib/firefox/modules/FxAccountsProfileCli
 lib/firefox/modules/FxAccountsStorage.jsm
 lib/firefox/modules/FxAccountsWebChannel.jsm
 lib/firefox/modules/GCTelemetry.jsm
+lib/firefox/modules/GMPExtractorWorker.js
 lib/firefox/modules/GMPInstallManager.jsm
 lib/firefox/modules/GMPUtils.jsm
 lib/firefox/modules/Geometry.jsm
@@ -3830,7 +4027,6 @@ lib/firefox/modules/PluralForm.jsm
 lib/firefox/modules/PopupNotifications.jsm
 lib/firefox/modules/Preferences.jsm
 lib/firefox/modules/Prefetcher.jsm
-lib/firefox/modules/PresentationDeviceInfoManager.jsm
 lib/firefox/modules/PrivateBrowsingUtils.jsm
 lib/firefox/modules/ProfileAge.jsm
 lib/firefox/modules/Promise-backend.js
@@ -3875,6 +4071,7 @@ lib/firefox/modules/Task.jsm
 lib/firefox/modules/TelemetryArchive.jsm
 lib/firefox/modules/TelemetryController.jsm
 lib/firefox/modules/TelemetryEnvironment.jsm
+lib/firefox/modules/TelemetryHealthPing.jsm
 lib/firefox/modules/TelemetryLog.jsm
 lib/firefox/modules/TelemetryModules.jsm
 lib/firefox/modules/TelemetryReportingPolicy.jsm
@@ -3888,6 +4085,7 @@ lib/firefox/modules/ThirdPartyCookieProb
 lib/firefox/modules/Timer.jsm
 lib/firefox/modules/Troubleshoot.jsm
 lib/firefox/modules/UITelemetry.jsm
+lib/firefox/modules/UpdatePing.jsm
 lib/firefox/modules/UpdateUtils.jsm
 lib/firefox/modules/UserAgentOverrides.jsm
 lib/firefox/modules/UserAgentUpdates.jsm
@@ -3903,7 +4101,6 @@ lib/firefox/modules/WebRequestContent.js
 lib/firefox/modules/WebRequestUpload.jsm
 lib/firefox/modules/WindowDraggingUtils.jsm
 lib/firefox/modules/XPCOMUtils.jsm
-lib/firefox/modules/XPathGenerator.jsm
 lib/firefox/modules/ZipUtils.jsm
 lib/firefox/modules/accessibility/AccessFu.jsm
 lib/firefox/modules/accessibility/Constants.jsm

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.295 pkgsrc/www/firefox/distinfo:1.296
--- pkgsrc/www/firefox/distinfo:1.295   Tue Sep 12 07:39:08 2017
+++ pkgsrc/www/firefox/distinfo Sat Sep 30 05:34:11 2017
@@ -1,48 +1,28 @@
-$NetBSD: distinfo,v 1.295 2017/09/12 07:39:08 martin Exp $
+$NetBSD: distinfo,v 1.296 2017/09/30 05:34:11 ryoon Exp $
 
-SHA1 (firefox-55.0.3.source.tar.xz) = 8d9b0861ad71845d4b0e668f1981ec99e617ff36
-RMD160 (firefox-55.0.3.source.tar.xz) = aa14f156f2d346bdf787222977ad0642dff084de
-SHA512 (firefox-55.0.3.source.tar.xz) = 3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416
-Size (firefox-55.0.3.source.tar.xz) = 236010652 bytes
-SHA1 (patch-aa) = 373af8f1df58d20e015b231625e60914554fb779
-SHA1 (patch-browser_base_content_baseMenuOverlay.xul) = 1d8959e2df0b546e381cf0e5af71808e8e7bebd7
-SHA1 (patch-browser_components_nsBrowserGlue.js) = c27a9a57056ed3227e60f5663d9275ef4204ab39
-SHA1 (patch-browser_components_preferences_in-content-new_main.xul) = 86395a554db4b052e9f05d3b39e1cab662a752c6
-SHA1 (patch-browser_components_preferences_in-content-new_privacy.js) = 17ffeaefa884e0a4a5bd9c2fc62369911fa46b98
-SHA1 (patch-browser_components_preferences_in-content-new_privacy.xul) = 3113d2ff23e6e74edf23d4486b4fa8d2cac167f1
-SHA1 (patch-browser_components_preferences_in-content_advanced.js) = 931d612d167e5d11d93fdc16bb6e3e5012571889
-SHA1 (patch-browser_components_preferences_in-content_advanced.xul) = 1d88c1cac70e9f90d5cd96cdedfa129389bda005
-SHA1 (patch-browser_confvars.sh) = 6acc570e22c82c3b48ac32dc5d0301468252b979
-SHA1 (patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd) = 10cbe84c1c91afb3a5c35091a78b222513dc426c
-SHA1 (patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd) = 786423776f159c1303efefd63f0ae3680b397ec8
+SHA1 (firefox-56.0.source.tar.xz) = 806cb335752ee93b204750b89dc6940768408088
+RMD160 (firefox-56.0.source.tar.xz) = b5239242e55e3031838c9807bff47b5b9c9fb420
+SHA512 (firefox-56.0.source.tar.xz) = 3aeb0ff54e10c83894f61734daa4f0801a1bb499d4667adad9c78520e588eae809d0e4d61e9227206466d62c3b453e2ce9ca8198f59f5354cd1b6804c00f0990
+Size (firefox-56.0.source.tar.xz) = 255389204 bytes
+SHA1 (patch-aa) = a2b7c767773f462452701237b2b06c9a4f01d1b5
 SHA1 (patch-build_gyp.mozbuild) = bb3a2f8c1cad0e9cfdaefa721c5992cba2e2bf50
 SHA1 (patch-build_moz.configure_init.configure) = 5ec8da6b5aad7682a88b010a99e19f5d4403e6db
 SHA1 (patch-build_moz.configure_keyfiles.configure) = 4d346c6298e08853681aac018f9289190bc1841a
 SHA1 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6
 SHA1 (patch-build_moz.configure_old.configure) = 2f452e717f0c9dc8224019b58e531e5e95cc7697
-SHA1 (patch-build_moz.configure_rust.configure) = 5dd3c36429ae297335556d55b99a6acb7dccf93c
-SHA1 (patch-build_pgo_profileserver.py) = b5ca4f309053090aa27521c42c95d2ab2e9130ce
 SHA1 (patch-config_Makefile.in) = 2ad29cef869171aa29b6c3e4ba4a5c99311e0742
 SHA1 (patch-config_baseconfig.mk) = fbc3fd75bf5d794284e5703a9df227949e819136
-SHA1 (patch-config_external_moz.build) = 68708dc0fb94119b9f140d05dd737e69bb6bba81
-SHA1 (patch-config_rules.mk) = f23b183d0201252245e82b775e9566d76ec854b4
+SHA1 (patch-config_external_moz.build) = 0a198c8578a8e8335be8d080f37c77f24c2d8b32
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
 SHA1 (patch-config_system-headers) = 96bc5e296d1ec9db9d764edadc36605a8f3aebe9
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c
-SHA1 (patch-dom_base_nsWrapperCache.h) = 7442735fde38d6933ffabbb14dde3a756f3e72dc
-SHA1 (patch-dom_media_AudioStream.cpp) = 3d2e3d92849a355c05d7ec0ded61d551ffe0c581
-SHA1 (patch-dom_media_AudioStream.h) = 26f70000cc4810834204d15b45e1469dd5f23617
+SHA1 (patch-dom_media_AudioStream.cpp) = 5ccc3b6a09e869a5a50998118157da7d6cc517ef
+SHA1 (patch-dom_media_AudioStream.h) = dec0f7e4ec7541b3e5b5574b6ebfae9a8957e165
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3632cd0dd4b95f53f01050b8898b33fe198916b6
-SHA1 (patch-dom_media_MediaPrefs.h) = b5815efdfbf79a7ff92197bbd906f702565ea46f
-SHA1 (patch-dom_media_gtest_moz.build) = 6a58e050327ffcdcf2a4041946ddb79d6793d2d9
 SHA1 (patch-dom_media_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c
 SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = f2965930c50961b42576a983e93a08d67da50a2a
-SHA1 (patch-dom_messagechannel_MessagePort.cpp) = 1710b4da694aaeb8d929f1a143f24f8a615c2776
-SHA1 (patch-dom_messagechannel_MessagePortChild.h) = 73a2ac4702677ad68af0b1fa1247fd0a1d4e4d95
-SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 30abff0aaabff07e13939a1571cefc5216760109
-SHA1 (patch-gfx_2d_ScaledFontBase.cpp) = 9684d54aa70e3b9b968f121287611cdd9e277f94
 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
@@ -62,69 +42,44 @@ SHA1 (patch-ipc_chromium_src_base_platfo
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 937a843a7acf3085056e309ea5ab047bd9b95088
 SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d
 SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 778a569887d8ad082abc2fa2fe89a0a943e84d64
-SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = d1afeb74af97cf30c520b42a8d444ff95ef592a9
+SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 3052338871447cedaeafe8369afe82233183c884
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
 SHA1 (patch-js_src_build_moz.build) = 4597a427262d0eb6ce8d14c0f557bfbe3f053e61
-SHA1 (patch-js_src_jit_ExecutableAllocator.h) = aaa7d4cf5b5464db6ed015e63d616adaa59a835d
 SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782
-SHA1 (patch-js_src_jit_none_MacroAssembler-none.h) = e443b009008e7aedbe1d3595021ecac3e27a99fd
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 97a221c76593be712f670aa409f2f1ad5dc20628
 SHA1 (patch-media_libcubeb_gtest_moz.build) = ebb4be6e6bca4a0ed6858516ec9fdb7828bbe2e1
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 8c99af543c49c23fea102c4ad9ffd617cc90631e
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 1b2890eea9d1b69ace8e5d6806e49ce4eb011236
+SHA1 (patch-media_libcubeb_src_cubeb__jack.cpp) = 1b514a97e3c15d03acdc873d23ff665112984293
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 88cdfb9b9aa8c2607ca79bfa7fce4353e65638f7
-SHA1 (patch-media_libcubeb_src_moz.build) = 54fa1221f80d460de115bfad9fbb5936403d2980
+SHA1 (patch-media_libcubeb_src_moz.build) = 5fca6701cc890120a04483f52c25242ee7b1c051
 SHA1 (patch-media_libcubeb_update.sh) = e8babe57ea7f0f32658b391e9c4f6310e57fc38c
 SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
 SHA1 (patch-media_libsoundtouch_src_soundtouch__perms.h) = 2d08a3b4176c155c57b458cb78043318b68d8fe2
-SHA1 (patch-media_libstagefright_binding_DecoderData.cpp) = 6815fbab38ea39b260583724ee95c32e6196a030
-SHA1 (patch-media_libstagefright_binding_MP4Metadata.cpp) = 7246a674a475b2b23a82798f74fa5d5fbbbfb968
-SHA1 (patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h) = eb7d82470943ad8eecd1c955a578c23aa2c390e1
-SHA1 (patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h) = 514212cd98f74eea72f0a3acd0b4205aa4c0d3a2
-SHA1 (patch-media_libstagefright_gtest_moz.build) = a1436e6289a8eb1a00ab7d5836052a3cd721154b
-SHA1 (patch-media_libstagefright_moz.build) = 35abbfee1d35533dc77a8362053f797208b58535
 SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 3ef05c05799d56b3c160634327d90dd33764c3df
 SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81
 SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf
 SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf0
 SHA1 (patch-media_libyuv_libyuv_source_mjpeg__decoder.cc) = 8a264c439fa4749cd7c5acf96e1ae3f9bae0a886
 SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7
-SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9e94002b01664a42af415639dc94caa127a73ac0
-SHA1 (patch-mobile_android_confvars.sh) = 42d4ba1737dc5b4591f892c804c78fa4e6ddfd71
-SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 133b1658839d9b0f932a601670862c1f4cd70881
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 0141dd1372c13ea1fce6e2f5ffb65e0cb0f3a13e
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = a69bc7b7096b410582e725f9dbec57fee90d6686
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 772a858fb74d404a6b86e5634bc3eec586a1b06a
+SHA1 (patch-modules_pdfium_update.sh) = fb8e80310d8b6784140c8f6c4186427f7090b4db
 SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249
 SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
-SHA1 (patch-netwerk_base_moz.build) = fba8c69b33cbf9ed59f54a7daf63e6dfa313a36b
-SHA1 (patch-netwerk_base_nsStandardURL.cpp) = d0aec4ac554ab53994179fa76c9df67ccc2495e3
 SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
-SHA1 (patch-third__party_python_futures_concurrent_futures_process.py) = 5e5c77334d29814f7548450163b625f451b74942
+SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 5ffb0782bbbff2fd17ad71e98b349b4ec3dc6c8c
-SHA1 (patch-toolkit_components_resistfingerprinting_nsRFPService.cpp) = 14d71a5197b09730b7065f95ee6c4ba3572d8241
-SHA1 (patch-toolkit_components_telemetry_Histograms.json) = 5232d568a68b3396b8deff04820a913f7e85cf99
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
-SHA1 (patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h) = 614ea9b9ca2cb41c075cf69e6c732a714afaf3e3
-SHA1 (patch-toolkit_library_gtest_moz.build) = a8ac2a2930ac00f891a695639acfadef2679a599
-SHA1 (patch-toolkit_library_moz.build) = f77301bd81d37e7a599dbff57fba47428e4a00e2
-SHA1 (patch-toolkit_moz.configure) = 2647f5b2c278d5d710a0faade7b48ccc2fbfc11f
-SHA1 (patch-toolkit_toolkit.mozbuild) = e7c56631a061f80bfb5a6c8825ba42d5f2c1e76a
+SHA1 (patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h) = 0730c0c5d8e0865aa8a2f311b27559a3f6793a52
+SHA1 (patch-toolkit_library_moz.build) = 34e757ad08ebaee1cbc69993ec0f6774d41a14a2
+SHA1 (patch-toolkit_moz.configure) = 274ad8d6957a09d3527bdbb0d86c36f6c24104d9
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
-SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = 40c3822ed227108fa6d90323dc19828d5e3ac996
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4a6ae13adfdfc63d50c1a53ee71aad1ee82e6131
-SHA1 (patch-xpcom_base_nsDebugImpl.cpp) = 80d251f2227ddc78f435ec2a5aa19c6512c1c15c
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
 SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 950874fbc255c93a828bddd84ffe8478094214cc
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 528f7254966d883c18e33744e28780a93055d560
-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) = ab558da218e53319857d85cf1fb84f4737ac643a
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 360e2f713d90e06cde738f876e99cc21cf082b05
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = 3a902eb9a23b3b5737f3c8cb5f96a5ad9a98a189
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 75db49c9cb6bf2993afba82b731d80389d866212
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__ppc__netbsd.cpp) = e4fe10d96f3183b79c5150ad9f1f7baa44081aa6
-SHA1 (patch-xpcom_rust_nsstring_gtest_moz.build) = 3ab2c533b57e9f55a20afffb521a4498418b33eb

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.97 pkgsrc/www/firefox/mozilla-common.mk:1.98
--- pkgsrc/www/firefox/mozilla-common.mk:1.97   Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/mozilla-common.mk        Sat Sep 30 05:34:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.97 2017/08/10 14:46:15 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.98 2017/09/30 05:34:11 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -20,6 +20,9 @@ USE_TOOLS+=           pkg-config perl gmake autoc
 USE_LANGUAGES+=                c99 c++
 UNLIMIT_RESOURCES+=    datasize
 
+CONFIGURE_ENV+=                BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
+                       -isystem${X11BASE}/include/pixman-1"
+
 test:
        cd ${WRKSRC}/${OBJDIR}/dist/bin &&      \
             ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
@@ -72,13 +75,6 @@ CONFIGURE_ARGS+=     --enable-url-classifier
 CONFIGURE_ARGS+=       --disable-icf
 CONFIGURE_ARGS+=       --disable-updater
 
-#.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "SunOS"
-#BUILD_DEPENDS+=               cargo-[0-9]*:../../devel/cargo
-#CONFIGURE_ARGS+=      --enable-rust
-#.else
-CONFIGURE_ARGS+=       --disable-rust
-#.endif
-
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure
 SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
@@ -193,6 +189,9 @@ BUILDLINK_API_DEPENDS.nss+= nss>=3.29.5
 .include "../../graphics/MesaLib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.10.2nb4
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../lang/clang/buildlink3.mk"
+BUILDLINK_API_DEPENDS.rust+=   rust>=1.20.0
+.include "../../lang/rust/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"

Index: pkgsrc/www/firefox/patches/patch-aa
diff -u pkgsrc/www/firefox/patches/patch-aa:1.53 pkgsrc/www/firefox/patches/patch-aa:1.54
--- pkgsrc/www/firefox/patches/patch-aa:1.53    Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-aa Sat Sep 30 05:34:11 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.53 2017/08/10 14:46:15 ryoon Exp $
+$NetBSD: patch-aa,v 1.54 2017/09/30 05:34:11 ryoon Exp $
 
 * Disable libjpeg-turbo check
 * Add system libraries option
 * Add OSS audio support
 
---- old-configure.in.orig      2017-07-31 16:20:51.000000000 +0000
+--- old-configure.in.orig      2017-09-14 20:15:53.000000000 +0000
 +++ old-configure.in
-@@ -2061,11 +2061,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
+@@ -1963,11 +1963,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -19,25 +19,7 @@ $NetBSD: patch-aa,v 1.53 2017/08/10 14:4
                     MOZ_SYSTEM_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -2333,9 +2329,14 @@ if test -n "$MOZ_MULET"; then
- fi
- 
- # Propagate feature switches for code written in rust from confvars.sh
--if test -n "$MOZ_RUST_URLPARSE"; then
--    AC_DEFINE(MOZ_RUST_URLPARSE)
--    AC_SUBST(MOZ_RUST_URLPARSE)
-+if test -n "$MOZ_RUST"; then
-+    if test -n "$MOZ_RUST_MP4PARSE"; then
-+        AC_DEFINE(MOZ_RUST_MP4PARSE)
-+    fi
-+    if test -n "$MOZ_RUST_URLPARSE"; then
-+        AC_DEFINE(MOZ_RUST_URLPARSE)
-+        AC_SUBST(MOZ_RUST_URLPARSE)
-+    fi
- fi
- 
- AC_SUBST(MOZ_PHOENIX)
-@@ -2712,6 +2713,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -2606,6 +2602,9 @@ if test -n "$MOZ_WEBRTC"; then
      AC_DEFINE(MOZ_WEBRTC_ASSERT_ALWAYS)
      MOZ_RAW=1
  
@@ -47,7 +29,7 @@ $NetBSD: patch-aa,v 1.53 2017/08/10 14:4
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -2754,7 +2758,7 @@ dnl Use integers over floats for audio o
+@@ -2648,7 +2647,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.
@@ -56,9 +38,9 @@ $NetBSD: patch-aa,v 1.53 2017/08/10 14:4
      MOZ_SAMPLE_TYPE_S16=1
      AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
      AC_SUBST(MOZ_SAMPLE_TYPE_S16)
-@@ -2845,6 +2849,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
-     fi
+@@ -2686,6 +2685,111 @@ if test -n "$MOZ_APPLEMEDIA"; then
  fi
+ fi # COMPILE_ENVIRONMENT
  
 +dnl ========================================================
 +dnl Check for libogg
@@ -168,7 +150,7 @@ $NetBSD: patch-aa,v 1.53 2017/08/10 14:4
  dnl system libvpx Support
  dnl ========================================================
  MOZ_ARG_WITH_BOOL(system-libvpx,
-@@ -3005,6 +3114,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
+@@ -2846,6 +2950,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -236,7 +218,7 @@ $NetBSD: patch-aa,v 1.53 2017/08/10 14:4
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -4690,6 +4860,27 @@ dnl ====================================
+@@ -4396,6 +4561,27 @@ dnl ====================================
  AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
  
  dnl ========================================================

Index: pkgsrc/www/firefox/patches/patch-config_external_moz.build
diff -u pkgsrc/www/firefox/patches/patch-config_external_moz.build:1.15 pkgsrc/www/firefox/patches/patch-config_external_moz.build:1.16
--- pkgsrc/www/firefox/patches/patch-config_external_moz.build:1.15     Tue Mar  7 20:45:43 2017
+++ pkgsrc/www/firefox/patches/patch-config_external_moz.build  Sat Sep 30 05:34:12 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-config_external_moz.build,v 1.15 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-config_external_moz.build,v 1.16 2017/09/30 05:34:12 ryoon Exp $
 
 * Support system libraries
 
---- config/external/moz.build.orig     2017-01-23 16:13:47.000000000 +0000
+--- config/external/moz.build.orig     2017-09-14 20:15:53.000000000 +0000
 +++ config/external/moz.build
-@@ -21,12 +21,21 @@ if CONFIG['MOZ_UPDATER']:
- external_dirs += ['modules/brotli']
- external_dirs += ['modules/woff2']
+@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2']
+ 
+ external_dirs += ['modules/xz-embedded']
  
 -if CONFIG['MOZ_VORBIS']:
 +if not CONFIG['MOZ_SYSTEM_OGG']:
@@ -28,7 +28,7 @@ $NetBSD: patch-config_external_moz.build
  if CONFIG['MOZ_WEBM_ENCODER']:
      external_dirs += ['media/libmkv']
  
-@@ -52,12 +61,9 @@ external_dirs += [
+@@ -57,12 +66,9 @@ external_dirs += [
      'media/kiss_fft',
      'media/libcubeb',
      'media/libnestegg',

Index: pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.cpp
diff -u pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.cpp:1.1 pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.cpp:1.2
--- pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.cpp:1.1      Sat Dec  3 09:58:26 2016
+++ pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.cpp  Sat Sep 30 05:34:12 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-dom_media_AudioStream.cpp,v 1.1 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-dom_media_AudioStream.cpp,v 1.2 2017/09/30 05:34:12 ryoon Exp $
 
---- dom/media/AudioStream.cpp.orig     2016-10-31 20:15:33.000000000 +0000
+--- dom/media/AudioStream.cpp.orig     2017-09-14 20:15:56.000000000 +0000
 +++ dom/media/AudioStream.cpp
 @@ -115,7 +115,9 @@ AudioStream::AudioStream(DataSource& aSo
    : mMonitor("AudioStream")
@@ -12,7 +12,7 @@ $NetBSD: patch-dom_media_AudioStream.cpp
    , mDumpFile(nullptr)
    , mState(INITIALIZED)
    , mDataSource(aSource)
-@@ -130,9 +132,11 @@ AudioStream::~AudioStream()
+@@ -135,9 +137,11 @@ AudioStream::~AudioStream()
    if (mDumpFile) {
      fclose(mDumpFile);
    }
@@ -21,10 +21,10 @@ $NetBSD: patch-dom_media_AudioStream.cpp
      soundtouch::destroySoundTouchObj(mTimeStretcher);
    }
 +#endif
- }
- 
- size_t
-@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretche
+ #if defined(XP_WIN)
+   if (XRE_IsContentProcess()) {
+     audio::AudioNotificationReceiver::Unregister(this);
+@@ -161,7 +165,11 @@ nsresult AudioStream::EnsureTimeStretche
  {
    mMonitor.AssertCurrentThreadOwns();
    if (!mTimeStretcher) {
Index: pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h
diff -u pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h:1.1 
pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h:1.2
--- pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h:1.1 Tue Sep 12 07:39:08 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h     Sat Sep 30 05:34:12 2017
@@ -1,17 +1,17 @@
-$NetBSD: patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h,v 1.1 2017/09/12 07:39:08 martin Exp $
+$NetBSD: patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h,v 1.2 2017/09/30 05:34:12 ryoon Exp $
 
 See https://bugzilla.mozilla.org/show_bug.cgi?id=1399027
 Allow non-whitelisted 64bit platforms to build.
 
---- toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h.orig        2017-06-15 22:52:33.000000000 +0200
-+++ toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h     2017-09-12 09:11:23.076831216 +0200
-@@ -155,7 +155,8 @@
+--- toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h.orig        2017-06-15 20:52:33.000000000 +0000
++++ toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h
+@@ -154,8 +154,7 @@
+ #endif
  
  /* The size of `long', as computed by sizeof. */
- #if defined(_M_X64) || (defined(__x86_64__) && !defined(__ILP32__)) ||      \
+-#if defined(_M_X64) || (defined(__x86_64__) && !defined(__ILP32__)) ||      \
 -    defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABI64)
-+    defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABI64) ||   \
-+    defined(__LP64__)
++#if defined(_M_X64) || defined(__LP64__)
  #define CURL_SIZEOF_LONG 8
  #else
  #define CURL_SIZEOF_LONG 4

Index: pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.h
diff -u pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.h:1.3 pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.h:1.4
--- pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.h:1.3        Sat Dec  3 09:58:26 2016
+++ pkgsrc/www/firefox/patches/patch-dom_media_AudioStream.h    Sat Sep 30 05:34:12 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-dom_media_AudioStream.h,v 1.3 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-dom_media_AudioStream.h,v 1.4 2017/09/30 05:34:12 ryoon Exp $
 
---- dom/media/AudioStream.h.orig       2016-10-31 20:15:33.000000000 +0000
+--- dom/media/AudioStream.h.orig       2017-09-14 20:15:56.000000000 +0000
 +++ dom/media/AudioStream.h
 @@ -16,7 +16,11 @@
  #include "mozilla/TimeStamp.h"
@@ -12,9 +12,9 @@ $NetBSD: patch-dom_media_AudioStream.h,v
  #include "soundtouch/SoundTouchFactory.h"
 +#endif
  
- namespace mozilla {
- 
-@@ -282,7 +286,11 @@ private:
+ #if defined(XP_WIN)
+ #include "mozilla/audio/AudioNotificationReceiver.h"
+@@ -299,7 +303,11 @@ private:
    uint32_t mChannels;
    uint32_t mOutChannels;
    AudioClock mAudioClock;

Index: pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
diff -u pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.2 pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.3
--- pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.2      Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp  Sat Sep 30 05:34:12 2017
@@ -1,9 +1,9 @@
-$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.2 2017/08/10 14:46:15 ryoon Exp $
+$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.3 2017/09/30 05:34:12 ryoon Exp $
 
 - avoid use of sem_t on NetBSD
   http://mail-index.netbsd.org/pkgsrc-bugs/2017/06/23/msg062225.html
 
---- ipc/glue/CrossProcessSemaphore_posix.cpp.orig      2017-07-31 16:20:47.000000000 +0000
+--- ipc/glue/CrossProcessSemaphore_posix.cpp.orig      2017-09-14 20:16:01.000000000 +0000
 +++ ipc/glue/CrossProcessSemaphore_posix.cpp
 @@ -9,6 +9,11 @@
  #include "nsDebug.h"
@@ -163,15 +163,15 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    if (aWaitTime.isSome()) {
      struct timespec ts;
      if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
-@@ -142,6 +228,7 @@ CrossProcessSemaphore::Wait(const Maybe<
-       continue;
+@@ -140,6 +226,7 @@ CrossProcessSemaphore::Wait(const Maybe<
+     while ((ret = sem_wait(mSemaphore)) == -1 && errno == EINTR) {
      }
    }
 +#endif
    return ret == 0;
  }
  
-@@ -149,7 +236,17 @@ void
+@@ -147,7 +234,17 @@ void
  CrossProcessSemaphore::Signal()
  {
    MOZ_ASSERT(*mRefCount > 0, "Attempting to signal a semaphore with zero ref count");

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.23 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.24
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.23      Fri Jun 30 16:45:05 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c   Sat Sep 30 05:34:12 2017
@@ -1,16 +1,11 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.23 2017/06/30 16:45:05 tsutsui Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.24 2017/09/30 05:34:12 ryoon Exp $
 
 * Support alsa audio under NetBSD
 * Avoid https://github.com/kinetiknz/cubeb/issues/226
 
---- media/libcubeb/src/cubeb_alsa.c.orig       2017-06-05 20:45:14.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig       2017-09-14 20:16:05.000000000 +0000
 +++ media/libcubeb/src/cubeb_alsa.c
-@@ -8,10 +8,12 @@
- #define _DEFAULT_SOURCE
- #define _BSD_SOURCE
- #define _XOPEN_SOURCE 500
-+#define _NETBSD_SOURCE
- #include <pthread.h>
+@@ -12,6 +12,7 @@
  #include <sys/time.h>
  #include <assert.h>
  #include <limits.h>
@@ -18,7 +13,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  #include <poll.h>
  #include <unistd.h>
  #include <alsa/asoundlib.h>
-@@ -25,6 +27,52 @@
+@@ -26,6 +27,52 @@
  
  #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
  
@@ -71,7 +66,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  /* 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 +113,8 @@ struct cubeb {
+@@ -66,6 +113,8 @@ struct cubeb {
       workaround is not required. */
    snd_config_t * local_config;
    int is_pa;
@@ -80,7 +75,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  };
  
  enum stream_state {
-@@ -243,8 +293,8 @@ set_timeout(struct timeval * timeout, un
+@@ -244,8 +293,8 @@ set_timeout(struct timeval * timeout, un
  static void
  stream_buffer_decrement(cubeb_stream * stm, long count)
  {
@@ -91,7 +86,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    stm->bufframes -= count;
  }
  
-@@ -276,9 +326,9 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -277,9 +326,9 @@ alsa_process_stream(cubeb_stream * stm)
    /* Call _poll_descriptors_revents() even if we don't use it
       to let underlying plugins clear null events.  Otherwise poll()
       may wake up again and again, producing unnecessary CPU usage. */
@@ -103,7 +98,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    /* Got null event? Bail and wait for another wakeup. */
    if (avail == 0) {
-@@ -301,7 +351,7 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -302,7 +351,7 @@ alsa_process_stream(cubeb_stream * stm)
        // TODO: should it be marked as DRAINING?
      }
  
@@ -112,7 +107,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
      if (got < 0) {
        avail = got; // the error handler below will recover us
-@@ -345,7 +395,7 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -346,7 +395,7 @@ alsa_process_stream(cubeb_stream * stm)
        (!stm->other_stream || stm->other_stream->bufframes > 0)) {
      long got = avail - stm->bufframes;
      void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
@@ -121,7 +116,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
      /* Correct read size to the other stream available frames */
      if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
-@@ -372,8 +422,8 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -373,8 +422,8 @@ alsa_process_stream(cubeb_stream * stm)
      long drain_frames = avail - stm->bufframes;
      double drain_time = (double) drain_frames / stm->params.rate;
  
@@ -132,7 +127,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      stm->bufframes = avail;
  
      /* Mark as draining, unless we're waiting for capture */
-@@ -400,7 +450,7 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -401,7 +450,7 @@ alsa_process_stream(cubeb_stream * stm)
        }
      }
  
@@ -141,7 +136,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (wrote < 0) {
        avail = wrote; // the error handler below will recover us
      } else {
-@@ -413,13 +463,13 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -414,13 +463,13 @@ alsa_process_stream(cubeb_stream * stm)
  
    /* Got some error? Let's try to recover the stream. */
    if (avail < 0) {
@@ -158,7 +153,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      }
    }
  
-@@ -535,26 +585,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -536,26 +585,26 @@ get_slave_pcm_node(snd_config_t * lconf,
  
    slave_def = NULL;
  
@@ -190,7 +185,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -563,7 +613,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -564,7 +613,7 @@ get_slave_pcm_node(snd_config_t * lconf,
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -199,7 +194,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -572,7 +622,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -573,7 +622,7 @@ get_slave_pcm_node(snd_config_t * lconf,
    } while (0);
  
    if (slave_def) {
@@ -208,7 +203,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
  
    return NULL;
-@@ -595,22 +645,22 @@ init_local_config_with_workaround(char c
+@@ -596,22 +645,22 @@ init_local_config_with_workaround(char c
  
    lconf = NULL;
  
@@ -235,7 +230,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -619,7 +669,7 @@ init_local_config_with_workaround(char c
+@@ -620,7 +669,7 @@ init_local_config_with_workaround(char c
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -244,7 +239,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -630,12 +680,12 @@ init_local_config_with_workaround(char c
+@@ -631,12 +680,12 @@ init_local_config_with_workaround(char c
      }
  
      /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -259,7 +254,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -646,18 +696,18 @@ init_local_config_with_workaround(char c
+@@ -647,18 +696,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. */
@@ -281,7 +276,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -665,7 +715,7 @@ init_local_config_with_workaround(char c
+@@ -666,7 +715,7 @@ init_local_config_with_workaround(char c
      return lconf;
    } while (0);
  
@@ -290,7 +285,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return NULL;
  }
-@@ -677,9 +727,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c
+@@ -678,9 +727,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
    if (local_config) {
@@ -302,7 +297,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
-@@ -692,7 +742,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -693,7 +742,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
    int r;
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -311,7 +306,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
    return r;
-@@ -755,12 +805,65 @@ alsa_init(cubeb ** context, char const *
+@@ -756,12 +805,65 @@ alsa_init(cubeb ** context, char const *
    pthread_attr_t attr;
    snd_pcm_t * dummy;
  
@@ -378,7 +373,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      cubeb_alsa_error_handler_set = 1;
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -768,6 +871,8 @@ alsa_init(cubeb ** context, char const *
+@@ -769,6 +871,8 @@ alsa_init(cubeb ** context, char const *
    ctx = calloc(1, sizeof(*ctx));
    assert(ctx);
  
@@ -387,7 +382,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    ctx->ops = &alsa_ops;
  
    r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -817,7 +922,7 @@ alsa_init(cubeb ** context, char const *
+@@ -818,7 +922,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);
@@ -396,7 +391,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
        pthread_mutex_unlock(&cubeb_alsa_mutex);
        ctx->local_config = NULL;
      } else if (r >= 0) {
-@@ -857,9 +962,13 @@ alsa_destroy(cubeb * ctx)
+@@ -858,9 +962,13 @@ alsa_destroy(cubeb * ctx)
    pthread_mutex_destroy(&ctx->mutex);
    free(ctx->fds);
  
@@ -411,7 +406,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      pthread_mutex_unlock(&cubeb_alsa_mutex);
    }
  
-@@ -942,7 +1051,7 @@ alsa_stream_init_single(cubeb * ctx, cub
+@@ -943,7 +1051,7 @@ alsa_stream_init_single(cubeb * ctx, cub
      return CUBEB_ERROR;
    }
  
@@ -420,7 +415,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    assert(r == 0);
  
    latency_us = latency_frames * 1e6 / stm->params.rate;
-@@ -955,7 +1064,7 @@ alsa_stream_init_single(cubeb * ctx, cub
+@@ -956,7 +1064,7 @@ alsa_stream_init_single(cubeb * ctx, cub
      latency_us = latency_us < min_latency ? min_latency: latency_us;
    }
  
@@ -429,7 +424,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
                           stm->params.channels, stm->params.rate, 1,
                           latency_us);
    if (r < 0) {
-@@ -963,20 +1072,20 @@ alsa_stream_init_single(cubeb * ctx, cub
+@@ -964,20 +1072,20 @@ alsa_stream_init_single(cubeb * ctx, cub
      return CUBEB_ERROR_INVALID_FORMAT;
    }
  
@@ -454,7 +449,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    assert((nfds_t) r == stm->nfds);
  
    if (alsa_register_stream(ctx, stm) != 0) {
-@@ -1048,7 +1157,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -1049,7 +1157,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
      if (stm->state == DRAINING) {
@@ -463,7 +458,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -1094,12 +1203,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
+@@ -1095,12 +1203,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
  
    assert(stm);
  
@@ -478,7 +473,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -1120,34 +1229,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -1121,34 +1229,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 +516,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return CUBEB_OK;
  }
-@@ -1180,10 +1289,10 @@ alsa_stream_start(cubeb_stream * stm)
+@@ -1181,10 +1289,10 @@ alsa_stream_start(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    /* Capture pcm must be started after initial setup/recover */
    if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
@@ -535,7 +530,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    gettimeofday(&stm->last_activity, NULL);
    pthread_mutex_unlock(&stm->mutex);
  
-@@ -1223,7 +1332,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1224,7 +1332,7 @@ alsa_stream_stop(cubeb_stream * stm)
    pthread_mutex_unlock(&ctx->mutex);
  
    pthread_mutex_lock(&stm->mutex);
@@ -544,7 +539,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&stm->mutex);
  
    return CUBEB_OK;
-@@ -1239,8 +1348,8 @@ alsa_stream_get_position(cubeb_stream * 
+@@ -1240,8 +1348,8 @@ alsa_stream_get_position(cubeb_stream * 
    pthread_mutex_lock(&stm->mutex);
  
    delay = -1;
@@ -555,7 +550,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      *position = stm->last_position;
      pthread_mutex_unlock(&stm->mutex);
      return CUBEB_OK;
-@@ -1265,7 +1374,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1266,7 +1374,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. */

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.12 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.13
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.12  Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build       Sat Sep 30 05:34:12 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.12 2017/08/10 14:46:15 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.13 2017/09/30 05:34:12 ryoon Exp $
 
 * Add OSS audio support
 * Support system library
@@ -18,17 +18,7 @@ $NetBSD: patch-media_libcubeb_src_moz.bu
  if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']:
      SOURCES += [
          'cubeb_resampler.cpp',
-@@ -32,7 +38,8 @@ if CONFIG['MOZ_PULSEAUDIO']:
-         'cubeb_pulse.c',
-     ]
-     DEFINES['USE_PULSE'] = True
--    DEFINES['USE_PULSE_RUST'] = True
-+    if CONFIG['MOZ_RUST']:
-+        DEFINES['USE_PULSE_RUST'] = True
- 
- if CONFIG['MOZ_JACK']:
-     SOURCES += [
-@@ -85,6 +92,7 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -85,6 +91,7 @@ if CONFIG['OS_TARGET'] == 'Android':
  
  FINAL_LIBRARY = 'gkmedias'
  

Index: pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build
diff -u pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.14 pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.15
--- pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.14     Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build  Sat Sep 30 05:34:12 2017
@@ -1,20 +1,11 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.14 2017/08/10 14:46:15 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.15 2017/09/30 05:34:12 ryoon Exp $
 
 * Support system libraries
 * Restore OSS support
 
---- toolkit/library/moz.build.orig     2017-07-31 16:20:52.000000000 +0000
+--- toolkit/library/moz.build.orig     2017-09-14 20:16:01.000000000 +0000
 +++ toolkit/library/moz.build
-@@ -63,7 +63,7 @@ def Libxul(name):
- 
-     # This option should go away in bug 1290972, but we need to wait until
-     # Rust 1.12 has been released.
--    if CONFIG['OS_ARCH'] == 'Darwin':
-+    if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin':
-         LDFLAGS += ['-Wl,-no_compact_unwind']
- 
- Libxul('xul')
-@@ -197,6 +197,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
+@@ -198,6 +198,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
      ]
  
  OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
@@ -22,7 +13,7 @@ $NetBSD: patch-toolkit_library_moz.build
  OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
  
  if CONFIG['SERVO_TARGET_DIR']:
-@@ -211,9 +212,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
+@@ -212,9 +213,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
  if CONFIG['MOZ_SYSTEM_PNG']:
      OS_LIBS += CONFIG['MOZ_PNG_LIBS']
  
@@ -53,7 +44,7 @@ $NetBSD: patch-toolkit_library_moz.build
  if CONFIG['MOZ_SYSTEM_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
-@@ -223,8 +245,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+@@ -224,8 +246,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
  
@@ -64,10 +55,3 @@ $NetBSD: patch-toolkit_library_moz.build
  
  if CONFIG['HAVE_CLOCK_MONOTONIC']:
      OS_LIBS += CONFIG['REALTIME_LIBS']
-@@ -343,4 +365,5 @@ USE_LIBS += ['StaticXULComponentsEnd']
- # The above library needs to be last for C++ purposes.  This library,
- # however, is entirely composed of Rust code, and needs to come after
- # all the C++ code so any possible C++ -> Rust calls can be resolved.
--USE_LIBS += ['gkrust']
-+if CONFIG['MOZ_RUST']:
-+    USE_LIBS += ['gkrust']

Index: pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
diff -u pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.5 pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.6
--- pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.5  Tue Aug 15 01:24:47 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_moz.configure      Sat Sep 30 05:34:12 2017
@@ -1,22 +1,12 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.5 2017/08/15 01:24:47 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.6 2017/09/30 05:34:12 ryoon Exp $
 
 * skia part: support bigendian architectures
 
---- toolkit/moz.configure.orig 2017-07-31 16:20:52.000000000 +0000
+--- toolkit/moz.configure.orig 2017-09-14 20:16:01.000000000 +0000
 +++ toolkit/moz.configure
-@@ -88,8 +88,7 @@ include('../js/moz.configure')
- 
- # Rust
- # ==============================================================
--include('../build/moz.configure/rust.configure',
--        when='--enable-compile-environment')
-+include('../build/moz.configure/rust.configure')
- 
- 
- # L10N
-@@ -356,6 +355,26 @@ add_old_configure_assignment('FT2_LIBS',
- add_old_configure_assignment('FT2_CFLAGS',
-                              ft2_info.cflags)
+@@ -314,6 +314,26 @@ def freetype2_combined_info(fontconfig_i
+ add_old_configure_assignment('_HAVE_FREETYPE2',
+                              depends_if(freetype2_info)(lambda _: True))
  
 +# Graphite2
 +# ==============================================================
@@ -33,7 +23,7 @@ $NetBSD: patch-toolkit_moz.configure,v 1
 +option('--with-system-harfbuzz',
 +       help="Use system harfbuzz (located with pkgconfig)")
 +
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.6',
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.7',
 +                                    when='--with-system-harfbuzz')
 +
 +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
@@ -41,42 +31,16 @@ $NetBSD: patch-toolkit_moz.configure,v 1
  # Apple platform decoder support
  # ==============================================================
  @depends(toolkit)
-@@ -623,13 +642,13 @@ id_and_secret_keyfile('Leanplum SDK')
- option('--enable-stylo', nargs='?', choices=('build',),
-        help='Include Stylo in the build and/or enable it at runtime')
- 
--@depends('--enable-stylo')
--def stylo_config(value):
-+@depends('--enable-stylo', '--enable-rust')
-+def stylo_config(value, rust_enabled):
-     build_stylo = None
-     enable_stylo = None
- 
-     # The default is to not build Stylo at all.
--    if value.origin == 'default':
-+    if not rust_enabled or value.origin == 'default':
-         pass
-     elif value == 'build':
-         build_stylo = True
-@@ -769,12 +788,14 @@ set_config('SERVO_TARGET_DIR', servo_tar
- option('--enable-webrender', nargs='?', choices=('build',),
-        help='Include WebRender in the build and/or enable it at runtime')
- 
--@depends('--enable-webrender', milestone)
--def webrender(value, milestone):
-+@depends('--enable-webrender', '--enable-rust', milestone)
-+def webrender(value, rust_enabled, milestone):
-     build_webrender = None
-     enable_webrender = None
+@@ -600,7 +620,7 @@ def stylo_config(value, _, target):
  
--    if value.origin == 'default':
-+    if not rust_enabled:
-+        pass
-+    elif value.origin == 'default':
-         # if nothing is specified, default to just building on Nightly
-         build_webrender = milestone.is_nightly
-     elif value == 'build':
-@@ -954,11 +975,11 @@ add_old_configure_assignment('NECKO_PROT
+     # If nothing is specified, default to building stylo where possible.
+     if value.origin == 'default':
+-        if target.os == 'GNU' and target.bitness == 32:
++        if target.os != 'WINNT' and target.bitness == 32:
+             # The clang setup we use in automation is a little unusual, and
+             # doesn't play well with bindgen on 32-bit Linux.
+             pass
+@@ -1047,11 +1067,11 @@ add_old_configure_assignment('NECKO_PROT
  # ==============================================================
  option('--disable-skia', help='Disable use of Skia')
  

Added files:

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__jack.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__jack.cpp:1.1
--- /dev/null   Sat Sep 30 05:34:12 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__jack.cpp Sat Sep 30 05:34:12 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-media_libcubeb_src_cubeb__jack.cpp,v 1.1 2017/09/30 05:34:12 ryoon Exp $
+
+--- media/libcubeb/src/cubeb_jack.cpp.orig     2017-09-14 20:16:05.000000000 +0000
++++ media/libcubeb/src/cubeb_jack.cpp
+@@ -8,7 +8,9 @@
+  */
+ #define _DEFAULT_SOURCE
+ #define _BSD_SOURCE
++#ifndef __FreeBSD__
+ #define _POSIX_SOURCE
++#endif
+ #include <dlfcn.h>
+ #include <stdio.h>
+ #include <string.h>
Index: pkgsrc/www/firefox/patches/patch-modules_pdfium_update.sh
diff -u /dev/null pkgsrc/www/firefox/patches/patch-modules_pdfium_update.sh:1.1
--- /dev/null   Sat Sep 30 05:34:12 2017
+++ pkgsrc/www/firefox/patches/patch-modules_pdfium_update.sh   Sat Sep 30 05:34:12 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-modules_pdfium_update.sh,v 1.1 2017/09/30 05:34:12 ryoon Exp $
+
+--- modules/pdfium/update.sh.orig      2017-09-14 20:15:53.000000000 +0000
++++ modules/pdfium/update.sh
+@@ -124,9 +124,9 @@ update_readme() {
+     perl -p -i -e "s/${PREFIX} [0-9A-Fa-f]+ \(.+\)/${PREFIX} ${COMMIT} (${COMMIT_DATE})/" README_MOZILLA
+ }
+ 
+-if [ "$#" == 0 ]; then
++if [ "$#" = 0 ]; then
+     COMMIT_SELECTOR="master"
+-elif [ "$#" == 2 -a "$1" == "--commit" ]; then
++elif [ "$#" = 2 -a "$1" = "--commit" ]; then
+     COMMIT_SELECTOR="$2"
+ else
+     print_help
Index: pkgsrc/www/firefox/patches/patch-servo_components_style_build__gecko.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-servo_components_style_build__gecko.rs:1.1
--- /dev/null   Sat Sep 30 05:34:12 2017
+++ pkgsrc/www/firefox/patches/patch-servo_components_style_build__gecko.rs     Sat Sep 30 05:34:12 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-servo_components_style_build__gecko.rs,v 1.1 2017/09/30 05:34:12 ryoon Exp $
+
+* Fix build with __uint32_t etc. not found errors on NetBSD/amd64 8.99.2
+
+--- servo/components/style/build_gecko.rs.orig 2017-09-14 20:15:56.000000000 +0000
++++ servo/components/style/build_gecko.rs
+@@ -546,6 +546,8 @@ mod bindings {
+                 .borrowed_type(ty)
+                 .zero_size_type(ty, &structs_types);
+         }
++        builder = builder
++            .raw_line(format!("pub use gecko_bindings::structs::root::*;"));
+         write_binding_file(builder, BINDINGS_FILE, &fixups);
+     }
+ 

Index: pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
diff -u /dev/null pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc:1.14
--- /dev/null   Sat Sep 30 05:34:12 2017
+++ pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc      Sat Sep 30 05:34:12 2017
@@ -0,0 +1,42 @@
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.14 2017/09/30 05:34:12 ryoon Exp $
+
+--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig    2017-09-14 20:16:07.000000000 +0000
++++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
+@@ -25,6 +25,9 @@
+ #else
+ #include <linux/videodev2.h>
+ #endif
++#ifdef HAVE_LIBV4L2
++#include <libv4l2.h>
++#endif
+ 
+ #include "webrtc/system_wrappers/include/trace.h"
+ 
+@@ -33,6 +36,15 @@
+ #define BUF_LEN     ( 1024 * ( EVENT_SIZE + 16 ) )
+ #endif
+ 
++#ifdef HAVE_LIBV4L2
++#define open  v4l2_open
++#define close v4l2_close
++#define dup   v4l2_dup
++#define ioctl v4l2_ioctl
++#define mmap  v4l2_mmap
++#define munmap        v4l2_munmap
++#endif
++
+ namespace webrtc
+ {
+ namespace videocapturemodule
+@@ -314,6 +326,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
+     memset(deviceNameUTF8, 0, deviceNameLength);
+     memcpy(cameraName, cap.card, sizeof(cap.card));
+ 
++    if (cameraName[0] == '\0')
++    {
++        sprintf(cameraName, "Camera at /dev/video%d", deviceNumber);
++    }
++
+     if (deviceNameLength >= strlen(cameraName))
+     {
+         memcpy(deviceNameUTF8, cameraName, strlen(cameraName));
Index: pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc
diff -u /dev/null pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc:1.14
--- /dev/null   Sat Sep 30 05:34:12 2017
+++ pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc    Sat Sep 30 05:34:12 2017
@@ -0,0 +1,30 @@
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.14 2017/09/30 05:34:12 ryoon Exp $
+
+--- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig  2017-09-14 20:16:07.000000000 +0000
++++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc
+@@ -24,6 +24,9 @@
+ #else
+ #include <linux/videodev2.h>
+ #endif
++#ifdef HAVE_LIBV4L2
++#include <libv4l2.h>
++#endif
+ 
+ #include <new>
+ 
+@@ -33,6 +36,15 @@
+ #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
+ #include "webrtc/system_wrappers/include/trace.h"
+ 
++#ifdef HAVE_LIBV4L2
++#define open  v4l2_open
++#define close v4l2_close
++#define dup   v4l2_dup
++#define ioctl v4l2_ioctl
++#define mmap  v4l2_mmap
++#define munmap        v4l2_munmap
++#endif
++
+ namespace webrtc {
+ namespace videocapturemodule {
+ rtc::scoped_refptr<VideoCaptureModule> VideoCaptureImpl::Create(

Index: pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
diff -u /dev/null pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi:1.13
--- /dev/null   Sat Sep 30 05:34:12 2017
+++ pkgsrc/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi       Sat Sep 30 05:34:12 2017
@@ -0,0 +1,34 @@
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.13 2017/09/30 05:34:12 ryoon Exp $
+
+--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig    2017-09-14 20:16:07.000000000 +0000
++++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
+@@ -7,6 +7,9 @@
+ # be found in the AUTHORS file in the root of the source tree.
+ 
+ {
++  'variables': {
++     'use_libv4l2%': 0,
++  },
+   'targets': [
+     {
+       # Note this library is missing an implementation for the video capture.
+@@ -74,6 +77,19 @@
+                 'linux/video_capture_linux.cc',
+                 'linux/video_capture_linux.h',
+               ],
++              'conditions': [
++                ['use_libv4l2==1', {
++                  'defines': [
++                    'HAVE_LIBV4L2',
++                  ],
++                  'cflags_mozilla': [
++                    '$(MOZ_LIBV4L2_CFLAGS)',
++                  ],
++                  'libraries': [
++                    '-lv4l2',
++                  ],
++                }],
++              ],
+             }],
+             ['OS=="mac"', {
+               'sources': [

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index