pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www/firefox



Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Aug  6 08:46:59 UTC 2016

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST distinfo mozilla-common.mk
            options.mk
        pkgsrc/www/firefox/patches: patch-aa patch-as patch-config_Makefile.in
            patch-config_external_moz.build patch-config_system-headers
            patch-dom_media_moz.build
            patch-ipc_chromium_src_base_process__util__bsd.cc
            patch-js_src_jit_AtomicOperations.h
            patch-media_libcubeb_src_moz.build patch-media_libtheora_moz.build
            patch-media_libtremor_Makefile.in patch-media_libtremor_moz.build
            patch-media_libvorbis_Makefile.in patch-media_libvorbis_moz.build
            patch-mfbt_Attributes.h patch-modules_libpref_init_all.js
            patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
            patch-toolkit_library_moz.build
Added Files:
        pkgsrc/www/firefox/patches: patch-build_moz.configure_old.configure
            patch-python_mozbuild_mozbuild_configure_options.py
Removed Files:
        pkgsrc/www/firefox/patches: patch-js_src_jsmath.cpp

Log Message:
Update to 48.0

* OSS audio support may not work. I will revisit later

Changelog:
New:
    Roar for moar protection against harmful downloads! We've got your back

    Process separation (e10s) is enabled for some of you. Like it? Let us know and we'll roll it out to more.

    Add-ons that have not been verified and signed by Mozilla will not load

    GNU/Linux fans: Get better Canvas performance with speedy Skia support. Try saying that three times fast

    WebRTC embetterments:
        Delay-agnostic AEC enabled
        Full duplex for GNU/Linux enabled
        ICE Restart & Update is supported
        Cloning of MediaStream and MediaStreamTrack is now supported

    Searching for something already in your bookmarks or open tabs? We added super smart icons to let you know

    Windows folks: Tab (move buttons) and Shift+F10 (pop-up menus) now behave as they should in Firefox customization mode

    The media parser has been redeveloped using the Rust programming language

    Windows 7 systems without Platform Update can now use D3D11 WARP

Fixed:
    Various security fixes

    Heyo, Jabra & Logitech C920 webcam users. We fixed those pesky WebRTC bugs causing frequency distortions. Buh-bye, squeaky voice!

    Improved step debugging on last line of functions

Changed:
    Starting with the Firefox version 49 release, so long to support for 10.6, 10.7 and 10.8. Now we can focus on where most Mac users are: 10.9. Don't forget to upgrade!

    After version 48, SSE2 CPU extensions are going to be required on Windows

    Au revoir to Windows Remote Access Service modem Autodial

Developer:
    WebExtensions support is now considered as stable

    Workers can now use the Web Crypto API

    Want to move absolute & fixed positioned elements? (Who doesn't, right?) Now you can with our geometry editor.

    The memory tool now has a tree map view for your debugging pleasure. It's a little bit of "boo" and a whole lot of "ya."

    We're putting the spotlight on the background. Now you can debug WebExtensions background content scripts and background pages

    Content Security Policy (CSP) is now enforced for WebExtensions. (Who's down with CSP?)

    Old and busted: Error Console. New hotness: Browser Console for your debugging pleasure.

    Add-on development just got easier because you can reload them from about:debugging — because we're all about debugging.

    This theme is hot, hot, hot! Say hi to the Firebug theme for Developer Tools.

    Expand network requests from the console panel to view request details in line, so you can see things in context

Fixed in Firefox 48:
    2016-84 Information disclosure through Resource Timing API during page navigation
    2016-83 Spoofing attack through text injection into internal error pages
    2016-82 Addressbar spoofing with right-to-left characters on Firefox for Android
    2016-81 Information disclosure and local file manipulation through drag and drop
    2016-80 Same-origin policy violation using local HTML file and saved shortcut file
    2016-79 Use-after-free when applying SVG effects
    2016-78 Type confusion in display transformation
    2016-77 Buffer overflow in ClearKey Content Decryption Module (CDM) during video playback
    2016-76 Scripts on marquee tag can execute in sandboxed iframes
    2016-75 Integer overflow in WebSockets during data buffering
    2016-74 Form input type change from password to text can store plain text password in session restore file
    2016-73 Use-after-free in service workers with nested sync events
    2016-72 Use-after-free in DTLS during WebRTC session shutdown
    2016-71 Crash in incremental garbage collection in JavaScript
    2016-70 Use-after-free when using alt key and toplevel menus
    2016-69 Arbitrary file manipulation by local user through Mozilla updater and callback application path parameter
    2016-68 Out-of-bounds read during XML parsing in Expat library
    2016-67 Stack underflow during 2D graphics rendering
    2016-66 Location bar spoofing via data URLs with malformed/invalid mediatypes
    2016-65 Cairo rendering crash due to memory allocation issue with FFmpeg 0.10
    2016-64 Buffer overflow rendering SVG with bidirectional content
    2016-63 Favicon network connection can persist when page is closed
    2016-62 Miscellaneous memory safety hazards (rv:48.0 / rv:45.3)


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.249 -r1.250 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.79 -r1.80 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/firefox/patches/patch-aa
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/firefox/patches/patch-as \
    pkgsrc/www/firefox/patches/patch-config_system-headers
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure \
    pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/firefox/patches/patch-config_Makefile.in \
    pkgsrc/www/firefox/patches/patch-media_libtheora_moz.build \
    pkgsrc/www/firefox/patches/patch-mfbt_Attributes.h \
    pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/www/firefox/patches/patch-config_external_moz.build
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/firefox/patches/patch-dom_media_moz.build \
    pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc \
    pkgsrc/www/firefox/patches/patch-modules_libpref_init_all.js
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox/patches/patch-js_src_jit_AtomicOperations.h \
    pkgsrc/www/firefox/patches/patch-media_libtremor_Makefile.in \
    pkgsrc/www/firefox/patches/patch-media_libvorbis_Makefile.in
cvs rdiff -u -r1.5 -r0 pkgsrc/www/firefox/patches/patch-js_src_jsmath.cpp
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/firefox/patches/patch-media_libtremor_moz.build \
    pkgsrc/www/firefox/patches/patch-media_libvorbis_moz.build \
    pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h

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.262 pkgsrc/www/firefox/Makefile:1.263
--- pkgsrc/www/firefox/Makefile:1.262   Thu Aug  4 17:03:39 2016
+++ pkgsrc/www/firefox/Makefile Sat Aug  6 08:46:59 2016
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.262 2016/08/04 17:03:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.263 2016/08/06 08:46:59 ryoon Exp $
 
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=    47.0
-MOZ_BRANCH_MINOR=      .1
+MOZ_BRANCH=    48.0
+MOZ_BRANCH_MINOR=      
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
@@ -68,6 +67,7 @@ pre-configure:
        cd ${WRKSRC} && autoconf
        cd ${WRKSRC}/js/src && autoconf
        cd ${WRKSRC} && mkdir ${OBJDIR}
+       cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
 
 post-build:
        ${SED} -e 's|@MOZILLA@|${MOZILLA}|g'                            \

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.107 pkgsrc/www/firefox/PLIST:1.108
--- pkgsrc/www/firefox/PLIST:1.107      Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/PLIST    Sat Aug  6 08:46:59 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.107 2016/06/16 12:08:21 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.108 2016/08/06 08:46:59 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -83,12 +83,12 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/browser-customization.js
 lib/firefox/browser/chrome/browser/content/browser/browser-data-submission-info-bar.js
 lib/firefox/browser/chrome/browser/content/browser/browser-devedition.js
-lib/firefox/browser/chrome/browser/content/browser/browser-eme.js
 lib/firefox/browser/chrome/browser/content/browser/browser-feeds.js
 lib/firefox/browser/chrome/browser/content/browser/browser-fullScreen.js
 lib/firefox/browser/chrome/browser/content/browser/browser-fullZoom.js
 lib/firefox/browser/chrome/browser/content/browser/browser-fxaccounts.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-places.js
 lib/firefox/browser/chrome/browser/content/browser/browser-plugins.js
 lib/firefox/browser/chrome/browser/content/browser/browser-refreshblocker.js
@@ -103,8 +103,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/browser.css
 lib/firefox/browser/chrome/browser/content/browser/browser.js
 lib/firefox/browser/chrome/browser/content/browser/browser.xul
-lib/firefox/browser/chrome/browser/content/browser/certerror/aboutCertError.css
-lib/firefox/browser/chrome/browser/content/browser/certerror/aboutCertError.xhtml
 lib/firefox/browser/chrome/browser/content/browser/chatWindow.xul
 lib/firefox/browser/chrome/browser/content/browser/content-UITour.js
 lib/firefox/browser/chrome/browser/content/browser/content-sessionStore.js
@@ -153,10 +151,13 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/ext-commands.js
 lib/firefox/browser/chrome/browser/content/browser/ext-contextMenus.js
 lib/firefox/browser/chrome/browser/content/browser/ext-desktop-runtime.js
+lib/firefox/browser/chrome/browser/content/browser/ext-history.js
 lib/firefox/browser/chrome/browser/content/browser/ext-pageAction.js
 lib/firefox/browser/chrome/browser/content/browser/ext-tabs.js
 lib/firefox/browser/chrome/browser/content/browser/ext-utils.js
 lib/firefox/browser/chrome/browser/content/browser/ext-windows.js
+lib/firefox/browser/chrome/browser/content/browser/extension-mac.css
+lib/firefox/browser/chrome/browser/content/browser/extension.css
 lib/firefox/browser/chrome/browser/content/browser/extension.svg
 lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.js
 lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xhtml
@@ -250,6 +251,7 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/schemas/commands.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus_internal.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/history.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/page_action.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/tabs.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/windows.json
@@ -296,7 +298,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-inverted.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-small.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError.css
 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
@@ -316,6 +317,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-warning.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/badge-add-engine.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/badge-add-engine%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/blockedSite.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/cert-error.svg
@@ -369,6 +371,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-summary.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/downloads.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/drm-icon.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/error-pages.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/subscribe-ui.css
@@ -377,8 +380,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/secure.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/android.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/android%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/default-avatar.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/default-avatar%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/default-avatar.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/ios.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/ios%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/logo.png
@@ -461,13 +463,12 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/search.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/attention.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/attention%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/check.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/check%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/mask.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/shield-page.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/shield-page%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/check.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/favicon.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/private-browsing.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/tracking-protection-off.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/tracking-protection.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/readerMode.svg
@@ -519,7 +520,8 @@ lib/firefox/browser/chrome/browser/skin/
 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/crashed.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.png
+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-arrow-left-inverted.png
@@ -549,6 +551,8 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-arrow.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-arrow%2x.png@localhost
+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/usercontext/banking.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/usercontext/personal.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/usercontext/shopping.svg
@@ -608,6 +612,9 @@ lib/firefox/browser/chrome/devtools/cont
 lib/firefox/browser/chrome/devtools/content/debugger/views/variable-bubble-view.js
 lib/firefox/browser/chrome/devtools/content/debugger/views/watch-expressions-view.js
 lib/firefox/browser/chrome/devtools/content/debugger/views/workers-view.js
+lib/firefox/browser/chrome/devtools/content/dom/content/dom-view.css
+lib/firefox/browser/chrome/devtools/content/dom/dom.html
+lib/firefox/browser/chrome/devtools/content/dom/main.js
 lib/firefox/browser/chrome/devtools/content/eyedropper/crosshairs.css
 lib/firefox/browser/chrome/devtools/content/eyedropper/eyedropper.xul
 lib/firefox/browser/chrome/devtools/content/eyedropper/nocursor.css
@@ -618,8 +625,9 @@ lib/firefox/browser/chrome/devtools/cont
 lib/firefox/browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-promo.css
 lib/firefox/browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-promo.xul
 lib/firefox/browser/chrome/devtools/content/framework/options-panel.css
+lib/firefox/browser/chrome/devtools/content/framework/toolbox-init.js
 lib/firefox/browser/chrome/devtools/content/framework/toolbox-options.js
-lib/firefox/browser/chrome/devtools/content/framework/toolbox-options.xul
+lib/firefox/browser/chrome/devtools/content/framework/toolbox-options.xhtml
 lib/firefox/browser/chrome/devtools/content/framework/toolbox-process-window.js
 lib/firefox/browser/chrome/devtools/content/framework/toolbox-process-window.xul
 lib/firefox/browser/chrome/devtools/content/framework/toolbox-window.xul
@@ -722,14 +730,18 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/acorn/acorn_loose.js
 lib/firefox/browser/chrome/devtools/modules/devtools/acorn/walk.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/aboutdebugging.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addon-target.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons-controls.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons-install-error.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons-tab.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/service-worker-target.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tab-header.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tab-menu-entry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tab-menu.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target-list.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/worker-target.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers-tab.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/modules/worker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-details.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-target-node.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-time-block.js
@@ -755,16 +767,40 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/debugger-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/definitions.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/filter.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/grips.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/dom-tree.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/main-frame.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/main-toolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/search-box.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/search-box.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/search.svg
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/constants.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/dom-decorator.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/dom-view.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/dom-view.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/grip-provider.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/reducers/filter.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/reducers/grips.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/reducers/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/dom-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/dom.html
+lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/main.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/eyedropper/commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/eyedropper/eyedropper-child.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/eyedropper/eyedropper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/ToolboxProcess.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/about-devtools-toolbox.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/attach-thread.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/browser-menus.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/devtools-browser.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/devtools.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/gDevTools.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/selection.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/sidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/source-location.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/target-from-url.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/target.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-highlighter-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-hosts.js
@@ -795,7 +831,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/main-tabbed-area.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/tabs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/tree-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/search-box.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/text-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-child.js
@@ -803,7 +838,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-sniffer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/controls.png
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/controls%2x.png@localhost
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/dom-tree.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/general.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/headers-panel.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/json-panel.css
@@ -821,16 +855,17 @@ lib/firefox/browser/chrome/devtools/modu
 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/main.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
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/diffing.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/dominator-tree-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/filter.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/io.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/label-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/refresh.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/sizes.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/snapshot.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/task-cache.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/tree-map-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/app.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/census-header.js
@@ -840,10 +875,18 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree-item.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/heap.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/individuals-header.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/individuals.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/list.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/shortest-paths.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/snapshot-list-item.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/toolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/canvas-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/color-coarse-type.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/drag-zoom.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/draw.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/start.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/dominator-tree-lazy-children.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/initializer.js
@@ -853,15 +896,18 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/allocations.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/census-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/diffing.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/dominator-tree-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/errors.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/filter.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/individuals.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/label-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/sizes.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/snapshots.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/tree-map-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/store.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/telemetry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/menus.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-automation.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-builder.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-collector.js
@@ -876,16 +922,18 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/compatibility.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/front.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/recording.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/categories.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/global.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/io.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/frame-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/jit.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/marker-formatters.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/marker-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/telemetry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/tree-model.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/waterfall-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-blueprint-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-dom-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-formatters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/markers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/graphs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/marker-details.js
@@ -930,29 +978,41 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/local.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/resource.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/tree.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/devices.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/location.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/screenshot.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/viewports.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/app.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/audio/camera-click.mp3
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/browser.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/device-modal.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/device-selector.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/global-toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/resizable-viewport.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/utils/l10n.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport-dimension.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport-toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewports.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/constants.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/devices.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/images/close.svg
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/images/grippers.svg
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/images/rotate-viewport.svg
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/images/screenshot.svg
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/images/select-arrow.svg
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/index.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/devices.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/location.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/screenshot.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/viewports.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/responsive-ua.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/store.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/types.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/e10s.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/l10n.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/resize-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign-child.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign.jsm
@@ -970,33 +1030,58 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/frame.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/h-split-box.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/array.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/attribute.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/caption.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/date-time.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/document.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/event.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/function.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/grip-array.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/grip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/named-node-map.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/null.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/number.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object-box.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object-link.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object-with-text.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object-with-url.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/regexp.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/rep-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/rep.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/reps.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/string.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/stylesheet.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/text-node.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/undefined.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/url.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/window.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/label-cell.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/object-provider.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-cell.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-header.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-row.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-parsing-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-reload.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/demangle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/developer-toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/devices.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/devtools-file-watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/doorhanger.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-watcher-worker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/frame-script-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/getjson.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/inplace-editor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/l10n.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/node-attribute-parser.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/options-view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/output-parser.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/poller.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/prefs.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/history.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/log.js
@@ -1006,10 +1091,12 @@ 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/source-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/suggestion-picker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/telemetry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/theme-switching.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/immutable.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-proxy.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js
@@ -1061,12 +1148,36 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/common.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/variables.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webaudioeditor/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/console-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/console-output.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/hudservice.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/jsterm.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/cookies-tab.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/headers-tab.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-body.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-body.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-group-list.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-group.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-group.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-params.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/net-info-params.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/params-tab.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/post-tab.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/response-tab.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/response-tab.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/size-limit.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/size-limit.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/components/spinner.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/data-provider.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/main.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/net-request.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/net-request.js
+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/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/addons.js
@@ -1097,6 +1208,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-registry.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/environment.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/errordocs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/eventlooplag.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/frame.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/framerate.js
@@ -1178,6 +1290,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/connection-manager.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/main.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/content-observer.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/css-angle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/css-color.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/deprecated-sync-thenables.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/discovery/discovery.js
@@ -1328,13 +1441,16 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/dark-theme.css
 lib/firefox/browser/chrome/devtools/skin/debugger.css
 lib/firefox/browser/chrome/devtools/skin/devtools-browser.css
+lib/firefox/browser/chrome/devtools/skin/dom.css
 lib/firefox/browser/chrome/devtools/skin/eyedropper.css
+lib/firefox/browser/chrome/devtools/skin/firebug-theme.css
 lib/firefox/browser/chrome/devtools/skin/floating-scrollbars-dark-theme.css
 lib/firefox/browser/chrome/devtools/skin/floating-scrollbars-responsive-design.css
 lib/firefox/browser/chrome/devtools/skin/fonts.css
 lib/firefox/browser/chrome/devtools/skin/images/add.svg
 lib/firefox/browser/chrome/devtools/skin/images/alerticon-warning.png
 lib/firefox/browser/chrome/devtools/skin/images/alerticon-warning%2x.png@localhost
+lib/firefox/browser/chrome/devtools/skin/images/angle-swatch.svg
 lib/firefox/browser/chrome/devtools/skin/images/animation-fast-track.svg
 lib/firefox/browser/chrome/devtools/skin/images/arrow-e.png
 lib/firefox/browser/chrome/devtools/skin/images/arrow-e%2x.png@localhost
@@ -1343,29 +1459,18 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton%2x.png@localhost
 lib/firefox/browser/chrome/devtools/skin/images/breakpoint.svg
 lib/firefox/browser/chrome/devtools/skin/images/clear.svg
-lib/firefox/browser/chrome/devtools/skin/images/close.png
-lib/firefox/browser/chrome/devtools/skin/images/close%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-console.png
-lib/firefox/browser/chrome/devtools/skin/images/command-console%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-eyedropper.png
-lib/firefox/browser/chrome/devtools/skin/images/command-eyedropper%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-frames.png
-lib/firefox/browser/chrome/devtools/skin/images/command-frames%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-measure.png
-lib/firefox/browser/chrome/devtools/skin/images/command-measure%2x.png@localhost
+lib/firefox/browser/chrome/devtools/skin/images/close.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-console.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-eyedropper.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-frames.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-measure.svg
 lib/firefox/browser/chrome/devtools/skin/images/command-noautohide.svg
-lib/firefox/browser/chrome/devtools/skin/images/command-paintflashing.png
-lib/firefox/browser/chrome/devtools/skin/images/command-paintflashing%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-pick.png
-lib/firefox/browser/chrome/devtools/skin/images/command-pick%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-responsivemode.png
-lib/firefox/browser/chrome/devtools/skin/images/command-responsivemode%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-rulers.png
-lib/firefox/browser/chrome/devtools/skin/images/command-rulers%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-scratchpad.png
-lib/firefox/browser/chrome/devtools/skin/images/command-scratchpad%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/command-screenshot.png
-lib/firefox/browser/chrome/devtools/skin/images/command-screenshot%2x.png@localhost
+lib/firefox/browser/chrome/devtools/skin/images/command-paintflashing.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-pick.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-responsivemode.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-rulers.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-scratchpad.svg
+lib/firefox/browser/chrome/devtools/skin/images/command-screenshot.svg
 lib/firefox/browser/chrome/devtools/skin/images/commandline-icon.png
 lib/firefox/browser/chrome/devtools/skin/images/commandline-icon%2x.png@localhost
 lib/firefox/browser/chrome/devtools/skin/images/controls.png
@@ -1391,15 +1496,15 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/debugging-devices.svg
 lib/firefox/browser/chrome/devtools/skin/images/debugging-workers.svg
 lib/firefox/browser/chrome/devtools/skin/images/diff.svg
-lib/firefox/browser/chrome/devtools/skin/images/dock-bottom-maximize%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/dock-bottom-minimize%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/dock-bottom%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/dock-side%2x.png@localhost
+lib/firefox/browser/chrome/devtools/skin/images/dock-bottom.svg
+lib/firefox/browser/chrome/devtools/skin/images/dock-side.svg
+lib/firefox/browser/chrome/devtools/skin/images/dock-undock.svg
 lib/firefox/browser/chrome/devtools/skin/images/dropmarker.svg
 lib/firefox/browser/chrome/devtools/skin/images/editor-error.png
 lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-command-pick.svg
 lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-canvas.svg
 lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-debugger.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-dom.svg
 lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-inspector.svg
 lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-memory.svg
 lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-network.svg
@@ -1418,6 +1523,47 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/filetypes/store.svg
 lib/firefox/browser/chrome/devtools/skin/images/filter-swatch.svg
 lib/firefox/browser/chrome/devtools/skin/images/filters.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/arrow-down.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/arrow-up.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/breadcrumbs-divider.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/breakpoint.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/close.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-console.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-eyedropper.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-frames.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-measure.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-noautohide.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-paintflashing.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-pick.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-responsivemode.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-rulers.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-scratchpad.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/command-screenshot.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/commandline-icon.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/debugger-blackbox.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/debugger-prettyprint.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/debugger-step-in.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/debugger-step-out.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/debugger-step-over.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/debugger-toggleBreakpoints.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/disable.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/dock-bottom.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/dock-side.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/dock-undock.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/filter.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/pane-collapse.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/pane-expand.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/pause.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/play.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/read-only.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/rewind.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/spinner.png
+lib/firefox/browser/chrome/devtools/skin/images/firebug/timeline-filter.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/tool-debugger-paused.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/tool-options.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/twisty-closed-firebug.svg
+lib/firefox/browser/chrome/devtools/skin/images/firebug/twisty-open-firebug.svg
+lib/firefox/browser/chrome/devtools/skin/images/geometry-editor.svg
 lib/firefox/browser/chrome/devtools/skin/images/itemArrow-dark-ltr.svg
 lib/firefox/browser/chrome/devtools/skin/images/itemArrow-dark-rtl.svg
 lib/firefox/browser/chrome/devtools/skin/images/itemArrow-ltr.svg
@@ -1466,6 +1612,7 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/tool-canvas.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-debugger-paused.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-debugger.svg
+lib/firefox/browser/chrome/devtools/skin/images/tool-dom.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-inspector.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-memory-active.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-memory.svg
@@ -1481,7 +1628,6 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/tool-webconsole.svg
 lib/firefox/browser/chrome/devtools/skin/images/tracer-icon.png
 lib/firefox/browser/chrome/devtools/skin/images/tracer-icon%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/undock%2x.png@localhost
 lib/firefox/browser/chrome/devtools/skin/images/vview-delete.png
 lib/firefox/browser/chrome/devtools/skin/images/vview-delete%2x.png@localhost
 lib/firefox/browser/chrome/devtools/skin/images/vview-edit.png
@@ -1526,7 +1672,6 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/branding/browserconfig.properties
 lib/firefox/browser/chrome/en-US/locale/browser-region/region.properties
 lib/firefox/browser/chrome/en-US/locale/browser/aboutAccounts.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/aboutCertError.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/aboutDialog.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/aboutHealthReport.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/aboutHome.dtd
@@ -1635,6 +1780,7 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/debugger.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/debugger.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/device.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/dom.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/eyedropper.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/filterwidget.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/filterwidget.properties
@@ -1648,6 +1794,7 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/layoutview.dtd
 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
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/menus.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/netmonitor.dtd
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/netmonitor.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/performance.dtd
@@ -2141,6 +2288,7 @@ lib/firefox/browser/features/loop@mozill
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/panels/js/copy.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/panels/js/desktopViews.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/panels/js/feedbackViews.js
+lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/panels/js/models.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/panels/js/otconfig.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/panels/js/panel.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/panels/js/roomStore.js
@@ -2207,6 +2355,7 @@ lib/firefox/browser/features/loop@mozill
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/icons-10x10.svg
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/icons-14x14.svg
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/icons-16x16.svg
+lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/join_notification.svg
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/leave.svg
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/leave_notification.svg
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/media-group-left-hover.svg
@@ -2246,7 +2395,6 @@ lib/firefox/browser/features/loop@mozill
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/js/linkifiedTextView.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/js/loopapi-client.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/js/mixins.js
-lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/js/models.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/js/otSdkDriver.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/js/remoteCursorStore.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/js/store.js
@@ -2267,6 +2415,7 @@ lib/firefox/browser/features/loop@mozill
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/backbone.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/classnames.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/lodash.js
+lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/react-dom.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/react.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/css/ot.css
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/access-denied-chrome.png
@@ -2286,6 +2435,7 @@ lib/firefox/browser/features/loop@mozill
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk.js
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/menuPanel.png
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/menuPanel%2x.png@localhost
+lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/platform.css
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/toolbar-inverted.png
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/toolbar-inverted%2x.png@localhost
 lib/firefox/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/toolbar.png
@@ -2349,14 +2499,17 @@ lib/firefox/browser/modules/HiddenFrame.
 lib/firefox/browser/modules/LaterRun.jsm
 lib/firefox/browser/modules/MigrationUtils.jsm
 lib/firefox/browser/modules/NetworkPrioritizer.jsm
+lib/firefox/browser/modules/NewTabMessages.jsm
 lib/firefox/browser/modules/NewTabPrefsProvider.jsm
 lib/firefox/browser/modules/NewTabRemoteResources.jsm
 lib/firefox/browser/modules/NewTabURL.jsm
+lib/firefox/browser/modules/NewTabWebChannel.jsm
 lib/firefox/browser/modules/PanelFrame.jsm
 lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
 lib/firefox/browser/modules/PlacesProvider.jsm
 lib/firefox/browser/modules/PlacesUIUtils.jsm
 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
@@ -2371,7 +2524,6 @@ lib/firefox/browser/modules/TabGroupsMig
 lib/firefox/browser/modules/TransientPrefs.jsm
 lib/firefox/browser/modules/UITour.jsm
 lib/firefox/browser/modules/UserContextUI.jsm
-lib/firefox/browser/modules/WebappManager.jsm
 lib/firefox/browser/modules/devtools/client/framework/gDevTools.jsm
 lib/firefox/browser/modules/devtools/gDevTools.jsm
 lib/firefox/browser/modules/distribution.js
@@ -2476,6 +2628,7 @@ lib/firefox/chrome/en-US/locale/en-US/gl
 lib/firefox/chrome/en-US/locale/en-US/global/dialogOverlay.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/dom/dom.properties
 lib/firefox/chrome/en-US/locale/en-US/global/editMenuOverlay.dtd
+lib/firefox/chrome/en-US/locale/en-US/global/extensions.properties
 lib/firefox/chrome/en-US/locale/en-US/global/fallbackMenubar.properties
 lib/firefox/chrome/en-US/locale/en-US/global/filefield.properties
 lib/firefox/chrome/en-US/locale/en-US/global/filepicker.dtd
@@ -2584,8 +2737,8 @@ lib/firefox/chrome/marionette/content/Sp
 lib/firefox/chrome/marionette/content/accessibility.js
 lib/firefox/chrome/marionette/content/action.js
 lib/firefox/chrome/marionette/content/atom.js
+lib/firefox/chrome/marionette/content/browser.js
 lib/firefox/chrome/marionette/content/capture.js
-lib/firefox/chrome/marionette/content/common.js
 lib/firefox/chrome/marionette/content/cookies.js
 lib/firefox/chrome/marionette/content/dispatcher.js
 lib/firefox/chrome/marionette/content/driver.js
@@ -2597,6 +2750,7 @@ lib/firefox/chrome/marionette/content/ev
 lib/firefox/chrome/marionette/content/frame.js
 lib/firefox/chrome/marionette/content/interaction.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/proxy.js
@@ -2667,6 +2821,7 @@ lib/firefox/chrome/toolkit/content/exten
 lib/firefox/chrome/toolkit/content/extensions/schemas/i18n.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/idle.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/manifest.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/notifications.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/runtime.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/storage.json
 lib/firefox/chrome/toolkit/content/extensions/schemas/test.json
@@ -3028,6 +3183,7 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_favicon.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_large.png
+lib/firefox/chrome/toolkit/skin/classic/global/icons/blocked.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/close-inverted.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/close-inverted%2x.png@localhost
 lib/firefox/chrome/toolkit/skin/classic/global/icons/close.png
@@ -3045,7 +3201,7 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/information-32.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/loading-inverted.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/loading-inverted%2x.png@localhost
-lib/firefox/chrome/toolkit/skin/classic/global/icons/loading_16.png
+lib/firefox/chrome/toolkit/skin/classic/global/icons/loading.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/panelarrow-horizontal.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/panelarrow-vertical.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/question-16.png
@@ -3058,8 +3214,6 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-64.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-large.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/warning.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/webapps-16.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/webapps-64.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/windowControls.png
 lib/firefox/chrome/toolkit/skin/classic/global/in-content/check-partial.svg
 lib/firefox/chrome/toolkit/skin/classic/global/in-content/check.svg
@@ -3204,6 +3358,8 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/mozapps/handling/handling.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-64.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon-inverted.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon-inverted%2x.png@localhost
 lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon%2x.png@localhost
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginActivate.png
@@ -3246,6 +3402,7 @@ lib/firefox/components/FeedProcessor.js
 lib/firefox/components/FormAutofillContentService.js
 lib/firefox/components/FormAutofillStartup.js
 lib/firefox/components/FormHistoryStartup.js
+lib/firefox/components/FxAccountsPush.js
 lib/firefox/components/InstallPackagedWebapp.js
 lib/firefox/components/MainProcessSingleton.js
 lib/firefox/components/MozKeyboard.js
@@ -3259,6 +3416,7 @@ lib/firefox/components/PaymentFlowInfo.j
 lib/firefox/components/PermissionSettings.js
 lib/firefox/components/PhoneNumberService.js
 lib/firefox/components/PlacesCategoriesStarter.js
+lib/firefox/components/PresentationDataChannelSessionTransport.js
 lib/firefox/components/PresentationDeviceInfoManager.js
 lib/firefox/components/PrivateBrowsingTrackingProtectionWhitelist.js
 lib/firefox/components/Push.js
@@ -3276,6 +3434,7 @@ lib/firefox/components/SystemMessageMana
 lib/firefox/components/TCPPresentationServer.js
 lib/firefox/components/TVSimulatorService.js
 lib/firefox/components/TelemetryStartup.js
+lib/firefox/components/TooltipTextProvider.js
 lib/firefox/components/UnifiedComplete.js
 lib/firefox/components/Weave.js
 lib/firefox/components/WebVTTParserWrapper.js
@@ -3284,6 +3443,7 @@ lib/firefox/components/XULStore.js
 lib/firefox/components/addonManager.js
 lib/firefox/components/amContentHandler.js
 lib/firefox/components/amInstallTrigger.js
+lib/firefox/components/amWebAPI.js
 lib/firefox/components/amWebInstallListener.js
 lib/firefox/components/captivedetect.js
 lib/firefox/components/components.manifest
@@ -3395,6 +3555,7 @@ lib/firefox/modules/AppConstants.jsm
 lib/firefox/modules/AppDownloadManager.jsm
 lib/firefox/modules/AppsServiceChild.jsm
 lib/firefox/modules/AppsUtils.jsm
+lib/firefox/modules/AsyncPrefs.jsm
 lib/firefox/modules/AsyncShutdown.jsm
 lib/firefox/modules/AsyncSpellCheckTestHelper.jsm
 lib/firefox/modules/AutoCompleteE10S.jsm
@@ -3406,6 +3567,7 @@ lib/firefox/modules/BookmarkJSONUtils.js
 lib/firefox/modules/Bookmarks.jsm
 lib/firefox/modules/BrowserElementPromptService.jsm
 lib/firefox/modules/BrowserUtils.jsm
+lib/firefox/modules/CanonicalJSON.jsm
 lib/firefox/modules/CertUtils.jsm
 lib/firefox/modules/CharsetMenu.jsm
 lib/firefox/modules/ChromeManifestParser.jsm
@@ -3464,8 +3626,6 @@ lib/firefox/modules/FormAutofill.jsm
 lib/firefox/modules/FormAutofillIntegration.jsm
 lib/firefox/modules/FormData.jsm
 lib/firefox/modules/FormHistory.jsm
-lib/firefox/modules/FrameWorker.jsm
-lib/firefox/modules/FrameWorkerContent.js
 lib/firefox/modules/FreeSpaceWatcher.jsm
 lib/firefox/modules/FxAccounts.jsm
 lib/firefox/modules/FxAccountsClient.jsm
@@ -3474,6 +3634,7 @@ lib/firefox/modules/FxAccountsOAuthClien
 lib/firefox/modules/FxAccountsOAuthGrantClient.jsm
 lib/firefox/modules/FxAccountsProfile.jsm
 lib/firefox/modules/FxAccountsProfileClient.jsm
+lib/firefox/modules/FxAccountsPush.js
 lib/firefox/modules/FxAccountsStorage.jsm
 lib/firefox/modules/FxAccountsWebChannel.jsm
 lib/firefox/modules/GMPInstallManager.jsm
@@ -3488,6 +3649,7 @@ lib/firefox/modules/IndexedDBHelper.jsm
 lib/firefox/modules/InlineSpellChecker.jsm
 lib/firefox/modules/InlineSpellCheckerContent.jsm
 lib/firefox/modules/InsecurePasswordUtils.jsm
+lib/firefox/modules/Integration.jsm
 lib/firefox/modules/InterAppCommService.jsm
 lib/firefox/modules/Keyboard.jsm
 lib/firefox/modules/Langpacks.jsm
@@ -3510,11 +3672,8 @@ lib/firefox/modules/ManifestProcessor.js
 lib/firefox/modules/MatchPattern.jsm
 lib/firefox/modules/MessageBroadcaster.jsm
 lib/firefox/modules/MessageChannel.jsm
-lib/firefox/modules/MessagePortBase.jsm
-lib/firefox/modules/MessagePortWorker.js
 lib/firefox/modules/Microformats.js
 lib/firefox/modules/MozSocialAPI.jsm
-lib/firefox/modules/NativeApp.jsm
 lib/firefox/modules/NetUtil.jsm
 lib/firefox/modules/NewTabUtils.jsm
 lib/firefox/modules/NotificationDB.jsm
@@ -3635,10 +3794,8 @@ lib/firefox/modules/WebNavigationFrames.
 lib/firefox/modules/WebRequest.jsm
 lib/firefox/modules/WebRequestCommon.jsm
 lib/firefox/modules/WebRequestContent.js
-lib/firefox/modules/WebappOSUtils.jsm
 lib/firefox/modules/Webapps.jsm
 lib/firefox/modules/WindowDraggingUtils.jsm
-lib/firefox/modules/WorkerAPI.jsm
 lib/firefox/modules/XPCOMUtils.jsm
 lib/firefox/modules/XPathGenerator.jsm
 lib/firefox/modules/ZipUtils.jsm
@@ -3973,12 +4130,14 @@ lib/firefox/modules/reader/ReaderWorker.
 lib/firefox/modules/reflect.jsm
 lib/firefox/modules/sdk/bootstrap.js
 lib/firefox/modules/sdk/system/Startup.js
-lib/firefox/modules/services-common/KintoCertificateBlocklist.js
+lib/firefox/modules/services-common/KintoBlocklist.js
 lib/firefox/modules/services-common/async.js
 lib/firefox/modules/services-common/hawkclient.js
 lib/firefox/modules/services-common/hawkrequest.js
+lib/firefox/modules/services-common/kinto-http-client.js
+lib/firefox/modules/services-common/kinto-offline-client.js
+lib/firefox/modules/services-common/kinto-updater.js
 lib/firefox/modules/services-common/logmanager.js
-lib/firefox/modules/services-common/moz-kinto-client.js
 lib/firefox/modules/services-common/observers.js
 lib/firefox/modules/services-common/rest.js
 lib/firefox/modules/services-common/stringbundle.js
@@ -4017,6 +4176,7 @@ lib/firefox/modules/services-sync/status
 lib/firefox/modules/services-sync/userapi.js
 lib/firefox/modules/services-sync/util.js
 lib/firefox/modules/sqlite/sqlite_internal.js
+lib/firefox/modules/third_party/jsesc/jsesc.js
 lib/firefox/modules/vtt.jsm
 lib/firefox/modules/workers/PromiseWorker.js
 lib/firefox/modules/workers/require.js
@@ -4060,40 +4220,5 @@ lib/firefox/res/table-remove-row-active.
 lib/firefox/res/table-remove-row-hover.gif
 lib/firefox/res/table-remove-row.gif
 lib/firefox/run-mozilla.sh
-lib/firefox/webapprt-stub
-lib/firefox/webapprt/chrome.manifest
-lib/firefox/webapprt/chrome/chrome.manifest
-lib/firefox/webapprt/chrome/en-US/locale/webapprt/appstrings.properties
-lib/firefox/webapprt/chrome/en-US/locale/webapprt/dom.properties
-lib/firefox/webapprt/chrome/en-US/locale/webapprt/downloads/downloads.dtd
-lib/firefox/webapprt/chrome/en-US/locale/webapprt/getUserMediaDialog.dtd
-lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.dtd
-lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.properties
-lib/firefox/webapprt/chrome/webapprt/content/downloads/download.xml
-lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.css
-lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.js
-lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.xul
-lib/firefox/webapprt/chrome/webapprt/content/getUserMediaDialog.js
-lib/firefox/webapprt/chrome/webapprt/content/getUserMediaDialog.xul
-lib/firefox/webapprt/chrome/webapprt/content/mochitest-shared.js
-lib/firefox/webapprt/chrome/webapprt/content/mochitest.js
-lib/firefox/webapprt/chrome/webapprt/content/mochitest.xul
-lib/firefox/webapprt/chrome/webapprt/content/webapp.js
-lib/firefox/webapprt/chrome/webapprt/content/webapp.xul
-lib/firefox/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloadButtons.png
-lib/firefox/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloadIcon.png
-lib/firefox/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloads.css
-lib/firefox/webapprt/components/CommandLineHandler.js
-lib/firefox/webapprt/components/ContentPermission.js
-lib/firefox/webapprt/components/DirectoryProvider.js
-lib/firefox/webapprt/components/PaymentUIGlue.js
-lib/firefox/webapprt/components/components.manifest
-lib/firefox/webapprt/defaults/preferences/prefs.js
-lib/firefox/webapprt/modules/DownloadView.jsm
-lib/firefox/webapprt/modules/Startup.jsm
-lib/firefox/webapprt/modules/WebRTCHandler.jsm
-lib/firefox/webapprt/modules/WebappManager.jsm
-lib/firefox/webapprt/modules/WebappRT.jsm
-lib/firefox/webapprt/webapprt.ini
 share/applications/firefox.desktop
 share/pixmaps/firefox.png

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.249 pkgsrc/www/firefox/distinfo:1.250
--- pkgsrc/www/firefox/distinfo:1.249   Sat Jul  2 12:38:04 2016
+++ pkgsrc/www/firefox/distinfo Sat Aug  6 08:46:59 2016
@@ -1,24 +1,25 @@
-$NetBSD: distinfo,v 1.249 2016/07/02 12:38:04 ryoon Exp $
+$NetBSD: distinfo,v 1.250 2016/08/06 08:46:59 ryoon Exp $
 
-SHA1 (firefox-47.0.1.source.tar.xz) = 54dfac4e3610edbfcb0d19aa7a37dfbdd17434b1
-RMD160 (firefox-47.0.1.source.tar.xz) = ce42c730e0fdfc0bacc793b873a27750933dd0c3
-SHA512 (firefox-47.0.1.source.tar.xz) = f79c53b9acf0d96917aa11e57092a4e540ce694471123ef8e616e15864195fab7b37235ebd37367e4d0cc8e594a881a30c973075cc97346ef6f88d92944c0312
-Size (firefox-47.0.1.source.tar.xz) = 188695532 bytes
-SHA1 (patch-aa) = 98790140e5db6d5d8ebd2498b3590f0e652851ae
+SHA1 (firefox-48.0.source.tar.xz) = 2b73cfc996861fe895ad7564d485bf9e35190767
+RMD160 (firefox-48.0.source.tar.xz) = 7f1754fd11849c4894b4cb234fe1c3fc4be47ba6
+SHA512 (firefox-48.0.source.tar.xz) = 51bbb1954920b4d0e49e2834939748e596ed27c09a45adeea2be2cfbd32898dae41f13db17318e9699fa96c41fb50fba9966df1f88deeadc0ae3bdd679bd79c5
+Size (firefox-48.0.source.tar.xz) = 188339876 bytes
+SHA1 (patch-aa) = 7d2f0f38668daaaa808f68bea0c0b47dee2c8913
 SHA1 (patch-ao) = 1564bc503670dc07ec8b9b43927f0c5879f3a44d
-SHA1 (patch-as) = 23d70a742d392312fc8a0af6598fbfbe33007c54
+SHA1 (patch-as) = bebba8483c1881198066f4022a0da8f95398f38f
 SHA1 (patch-bf) = f56fce1b1e5e697ba2425655b6417b69f197f6cf
 SHA1 (patch-browser_installer_package-manifest.in) = 7c4f1822cd78a5ed465b954f4b62514c64ad7b84
 SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
 SHA1 (patch-build_gyp.mozbuild) = 899516ef69404441ce4311defd2f969f9b4f3d07
-SHA1 (patch-config_Makefile.in) = d74c221fb4c855e9c608ce44f0313e8c89b83917
+SHA1 (patch-build_moz.configure_old.configure) = 5eab77986d30588386cd184e409366d83d7f80fb
+SHA1 (patch-config_Makefile.in) = e73585126c714a3e07963cf19af1c7876e074209
 SHA1 (patch-config_baseconfig.mk) = 4ec046aea29c6c03df49246371774ed3fd082f4f
-SHA1 (patch-config_external_moz.build) = 584790402951387b4ce03edca06f0cc154397aeb
+SHA1 (patch-config_external_moz.build) = 0c9687a3c2d9fa7dee3909ba063e4fcbc9931a3e
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = 43c184764df796f568ea73032d930bb9e2074d3a
+SHA1 (patch-config_system-headers) = 85cfc060dded8b6911d645197283d58f0b00c6f8
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
-SHA1 (patch-dom_media_moz.build) = 4586eabd8b58fcbda6541add8eebd814aee4bcd1
+SHA1 (patch-dom_media_moz.build) = 2389715405101004110907c33072521779b80a9d
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 9961e956016f274a1b9b52b489bd749e8e2bbcb6
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 15c01df2fa7f989b533ef769ce77438b5e9bfdb9
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 0c1151708420bec7700724b1f298590601f1762b
@@ -35,7 +36,7 @@ SHA1 (patch-ipc_chromium_src_base_messag
 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = c81930280bd76a00fbad37aad02fb8451d80b1ee
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 45409f2152d5ffc376c18c0c9bc696e08e3910ce
 SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d
-SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 36a3d8985915d925d6c7d61b6853d1b07c386fd1
+SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = df7216659ec3d09249a4a75312a8dd0347d90e6e
 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = aa6dee9678eeb0eb3d50e74f6e629ee0f4bc9d4b
 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 5313c4097c278640573c7e1cb089f6f76b48c1a8
 SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba4e0872490f870e7d2f468e1fe87c33cf9a3500
@@ -44,19 +45,18 @@ SHA1 (patch-ipc_chromium_src_chrome_comm
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = b9c202645a4b6f691a6eb81ef0daf4278d10dcc4
 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = cff6658f08267b3529605a40682a748e99006dbb
 SHA1 (patch-js_src_jit-LIR.cpp) = 84bf136ba96653d8a3aa283c8e4e9f1722a6901f
-SHA1 (patch-js_src_jit_AtomicOperations.h) = e13cf94a6692495717211eea589ab9c021d7e737
+SHA1 (patch-js_src_jit_AtomicOperations.h) = be1440f46ebfc2cc59f9e8715cb1c3692beaeea0
 SHA1 (patch-js_src_jit_MIR.cpp) = 71676b2510b2cc5bd97c2e872645780fdb680ff3
 SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = 25cf7d202fc56968225e6f20fb4b292002ccaa4a
 SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = e140ea382743e1f4d7c0de246ac186f03d864164
 SHA1 (patch-js_src_jsdate.cpp) = a71f55bc9a5bf68867c294e0c9e07d9ae55251d1
 SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59
-SHA1 (patch-js_src_jsmath.cpp) = ef3b1aa686ccab3ef59a8df5bf560ec7b21bbf7d
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 91eb24595c423b7e086670bb67e73cfd0bfb5559
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 17ec400709d3e448751ba1283e1b2c5f04bb4dc1
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = f3617f38ad98f2eb7ebbd8f5904b361dde4bcc15
-SHA1 (patch-media_libcubeb_src_moz.build) = 0f62cd0fbf01d0fa29d04ef10f3bab91b6bebc57
+SHA1 (patch-media_libcubeb_src_moz.build) = ffa7cf809f20c9e07e64fc885a06146f41634b03
 SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
 SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = b280f691dbe67b6de592dcd04baf33c6cf480cc8
 SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = d79a49a983209e6b673956561f2001c6ef4bcc20
@@ -64,28 +64,29 @@ SHA1 (patch-media_libstagefright_system_
 SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 74e92dd838f106e0e050d223d42ad85d1d2e0753
 SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
 SHA1 (patch-media_libtheora_lib_info.c) = 4826eb95ee675b213116e8e9149f81be504a2131
-SHA1 (patch-media_libtheora_moz.build) = 04c2b26099689a49737f513092fbc993b1e2a70e
-SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
-SHA1 (patch-media_libtremor_moz.build) = bf0b842ffca70e922c9ecb7d212f73ada68ca16c
-SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
+SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81
+SHA1 (patch-media_libtremor_Makefile.in) = 90f0890f02a3d9791fd02cbcfbf85a9b4bee2cce
+SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf
+SHA1 (patch-media_libvorbis_Makefile.in) = b1cc7dc1caab94366db6f2a51b72f02ac420bc71
 SHA1 (patch-media_libvorbis_lib_vorbis_info.c) = 6e8d162c83fd7e350bfe8997adc3a9790d159675
-SHA1 (patch-media_libvorbis_moz.build) = f20964bd422edf36ec27e474e9767d636db310fc
+SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf0
 SHA1 (patch-media_libyuv_include_libyuv_scale__row.h) = 503b6f2065e9d548a1f01f7158d65874f4886c78
 SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e
 SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7
 SHA1 (patch-memory_build_mozjemalloc__compat.c) = c27c745fd6e0bbb120ef34d8a984937d5f2e1319
 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9e94002b01664a42af415639dc94caa127a73ac0
-SHA1 (patch-mfbt_Attributes.h) = bf3378667704d7c9194b00024bb51ed23fd92286
+SHA1 (patch-mfbt_Attributes.h) = 2b5f427b2f2bb8f61207c3ed0918c90b59cf9333
 SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 133b1658839d9b0f932a601670862c1f4cd70881
-SHA1 (patch-modules_libpref_init_all.js) = 8258d9c7284e86b37445755645d61b2a46cbdeaa
+SHA1 (patch-modules_libpref_init_all.js) = 3bc5962fdabb5aecb72ffc7e73bb56392d1ea717
 SHA1 (patch-mozglue_build_arm.cpp) = e4ec1482535a00a431600574932c12ccac3687ed
 SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
+SHA1 (patch-python_mozbuild_mozbuild_configure_options.py) = f862ee425ae016df6fe12b55050a8dc075ecce89
 SHA1 (patch-rc) = 9628b038f036f3fc0e37bdf84fa0abf99dbc8d2a
-SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 192a1f36a73d752211580ecea7ea9238f5569d67
+SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 5ffb0782bbbff2fd17ad71e98b349b4ec3dc6c8c
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h) = bd4388323851fcb7b10392d6a27f9bc56633a52e
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
-SHA1 (patch-toolkit_library_moz.build) = 50568d20c5526251fbc6a71cfa3db7122de7ff00
+SHA1 (patch-toolkit_library_moz.build) = be0b3ae0c8048fd61c67b2ae78b2a0813cbefd85
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4db0dfc98ffeb09f524a471e6a727f2c3b045afe
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.79 pkgsrc/www/firefox/mozilla-common.mk:1.80
--- pkgsrc/www/firefox/mozilla-common.mk:1.79   Sat Jul  9 13:04:12 2016
+++ pkgsrc/www/firefox/mozilla-common.mk        Sat Aug  6 08:46:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.79 2016/07/09 13:04:12 wiz Exp $
+# $NetBSD: mozilla-common.mk,v 1.80 2016/08/06 08:46:59 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -11,7 +11,8 @@
 BUILD_DEPENDS+=                yasm>=1.1:../../devel/yasm
 .endif
 
-GNU_CONFIGURE=         yes
+HAS_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
 USE_TOOLS+=            pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=                c99 c++
 UNLIMIT_RESOURCES+=    datasize
@@ -43,14 +44,14 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}br
 
 CONFIGURE_ARGS+=       --enable-pie
 CONFIGURE_ARGS+=       --disable-tests
-CONFIGURE_ARGS+=       --disable-pedantic
-CONFIGURE_ARGS+=       --enable-crypto
+#CONFIGURE_ARGS+=      --disable-pedantic
+#CONFIGURE_ARGS+=      --enable-crypto
 CONFIGURE_ARGS+=       --with-pthreads
-CONFIGURE_ARGS+=       --disable-javaxpcom
+#CONFIGURE_ARGS+=      --disable-javaxpcom
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
-CONFIGURE_ARGS+=       --enable-svg
-CONFIGURE_ARGS+=       --enable-mathml
-CONFIGURE_ARGS+=       --enable-pango
+#CONFIGURE_ARGS+=      --enable-svg
+#CONFIGURE_ARGS+=      --enable-mathml
+#CONFIGURE_ARGS+=      --enable-pango
 CONFIGURE_ARGS+=       --enable-system-cairo
 CONFIGURE_ARGS+=       --enable-system-pixman
 CONFIGURE_ARGS+=       --with-system-libvpx
@@ -69,16 +70,16 @@ CONFIGURE_ARGS+=    --enable-chrome-format=
 CONFIGURE_ARGS+=       --disable-libjpeg-turbo
 
 CONFIGURE_ARGS+=       --disable-elf-hack
-CONFIGURE_ARGS+=       --disable-elf-dynstr-gc
+#CONFIGURE_ARGS+=      --disable-elf-dynstr-gc
 CONFIGURE_ARGS+=       --disable-gconf
 CONFIGURE_ARGS+=       --enable-gio
 CONFIGURE_ARGS+=       --enable-extensions=gio
-CONFIGURE_ARGS+=       --disable-mochitest
-CONFIGURE_ARGS+=       --enable-canvas
+#CONFIGURE_ARGS+=      --disable-mochitest
+#CONFIGURE_ARGS+=      --enable-canvas
 #CONFIGURE_ARGS+=      --enable-readline
-CONFIGURE_ARGS+=       --disable-installer
+#CONFIGURE_ARGS+=      --disable-installer
 CONFIGURE_ARGS+=       --enable-url-classifier
-CONFIGURE_ARGS+=       --with-system-ply
+#CONFIGURE_ARGS+=      --with-system-ply
 CONFIGURE_ARGS+=       --disable-icf
 CONFIGURE_ARGS+=       --disable-updater
 
@@ -207,6 +208,7 @@ BUILDLINK_API_DEPENDS.cairo+=       cairo>=1.1
 BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=  gtk2+>=2.18.3nb1
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.30 pkgsrc/www/firefox/options.mk:1.31
--- pkgsrc/www/firefox/options.mk:1.30  Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/options.mk       Sat Aug  6 08:46:59 2016
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.30 2016/06/16 12:08:21 ryoon Exp $
+# $NetBSD: options.mk,v 1.31 2016/08/06 08:46:59 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 PKG_SUPPORTED_OPTIONS= official-mozilla-branding
-PKG_SUPPORTED_OPTIONS+=        debug debug-info mozilla-jemalloc gnome webrtc
+PKG_SUPPORTED_OPTIONS+=        debug debug-info mozilla-jemalloc webrtc
 PKG_SUPPORTED_OPTIONS+=        alsa oss pulseaudio
 PLIST_VARS+=           gnome jemalloc debug
 
@@ -31,18 +31,6 @@ CONFIGURE_ARGS+=     --with-oss
 CONFIGURE_ARGS+=       --without-oss
 .endif
 
-.if !empty(PKG_OPTIONS:Mgnome)
-.include "../../devel/libgnomeui/buildlink3.mk"
-#.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-dbus --enable-gnomeui
-CONFIGURE_ARGS+=       --enable-libnotify
-PLIST.gnome=           yes
-.else
-CONFIGURE_ARGS+=       --disable-dbus --disable-gnomeui
-CONFIGURE_ARGS+=       --disable-libnotify
-.endif
-
 .if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
 PLIST.jemalloc=                yes
 CONFIGURE_ARGS+=       --enable-jemalloc

Index: pkgsrc/www/firefox/patches/patch-aa
diff -u pkgsrc/www/firefox/patches/patch-aa:1.46 pkgsrc/www/firefox/patches/patch-aa:1.47
--- pkgsrc/www/firefox/patches/patch-aa:1.46    Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-aa Sat Aug  6 08:46:59 2016
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.46 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-aa,v 1.47 2016/08/06 08:46:59 ryoon Exp $
 
 * MOZ_ENABLE_PROFILER_SPS is not for users, Disable it
 * Disable libjpeg-turbo check
 * Add system libraries option
 * Add OSS audio support
 
---- old-configure.in.orig      2016-06-01 04:11:44.000000000 +0000
+--- old-configure.in.orig      2016-07-25 20:22:06.000000000 +0000
 +++ old-configure.in
-@@ -1605,7 +1605,7 @@ fi
- dnl ========================================================
- dnl SPS Profiler
- dnl ========================================================
--MOZ_ENABLE_PROFILER_SPS=1
-+MOZ_ENABLE_PROFILER_SPS=
- 
- case "${OS_TARGET}" in
- Android)
-@@ -3440,11 +3440,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -2489,11 +2489,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -26,10 +17,10 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 -                     #endif
 -                     ],
 +                     #endif ],
-                    MOZ_NATIVE_JPEG=1,
+                    MOZ_SYSTEM_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4911,6 +4907,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -3638,6 +3634,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_RAW=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -39,7 +30,7 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5054,6 +5053,155 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -3780,6 +3779,155 @@ if test "${ac_cv_c_attribute_aligned}" !
  fi
  
  dnl ========================================================
@@ -48,10 +39,10 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +
 +MOZ_ARG_WITH_BOOL(system-ogg,
 +[  --with-system-ogg       Use system libogg (located with pkgconfig)],
-+MOZ_NATIVE_OGG=1,
-+MOZ_NATIVE_OGG=)
++MOZ_SYSTEM_OGG=1,
++MOZ_SYSTEM_OGG=)
 +
-+if test -n "$MOZ_NATIVE_OGG"; then
++if test -n "$MOZ_SYSTEM_OGG"; then
 +    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
 +
 +    _SAVE_LIBS=$LIBS
@@ -61,7 +52,7 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +    LIBS=$_SAVE_LIBS
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_OGG)
++AC_SUBST(MOZ_SYSTEM_OGG)
 +
 +dnl ========================================================
 +dnl Check for libvorbis
@@ -69,14 +60,14 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +
 +MOZ_ARG_WITH_BOOL(system-vorbis,
 +[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
-+MOZ_NATIVE_VORBIS=1,
-+MOZ_NATIVE_VORBIS=)
++MOZ_SYSTEM_VORBIS=1,
++MOZ_SYSTEM_VORBIS=)
 +
-+if test -n "$MOZ_NATIVE_VORBIS"; then
++if test -n "$MOZ_SYSTEM_VORBIS"; then
 +    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_VORBIS)
++AC_SUBST(MOZ_SYSTEM_VORBIS)
 +
 +dnl ========================================================
 +dnl Check for integer-only libvorbis aka tremor
@@ -84,14 +75,14 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +
 +MOZ_ARG_WITH_BOOL(system-tremor,
 +[  --with-system-tremor    Use system libtremor (located with pkgconfig)],
-+MOZ_NATIVE_TREMOR=1,
-+MOZ_NATIVE_TREMOR=)
++MOZ_SYSTEM_TREMOR=1,
++MOZ_SYSTEM_TREMOR=)
 +
-+if test -n "$MOZ_NATIVE_TREMOR"; then
++if test -n "$MOZ_SYSTEM_TREMOR"; then
 +    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_TREMOR)
++AC_SUBST(MOZ_SYSTEM_TREMOR)
 +
 +dnl ========================================================
 +dnl Check for libcelt
@@ -99,16 +90,16 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +
 +MOZ_ARG_WITH_BOOL(system-celt,
 +[  --with-system-celt      Use system libcelt (located with pkgconfig)],
-+MOZ_NATIVE_CELT=1,
-+MOZ_NATIVE_CELT=)
++MOZ_SYSTEM_CELT=1,
++MOZ_SYSTEM_CELT=)
 +
-+if test -n "$MOZ_NATIVE_CELT"; then
++if test -n "$MOZ_SYSTEM_CELT"; then
 +    PKG_CHECK_MODULES(MOZ_CELT, celt)
 +else
 +    MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus'
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_CELT)
++AC_SUBST(MOZ_SYSTEM_CELT)
 +
 +dnl ========================================================
 +dnl Check for libopus
@@ -116,16 +107,16 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +
 +MOZ_ARG_WITH_BOOL(system-opus,
 +[  --with-system-opus      Use system libopus (located with pkgconfig)],
-+MOZ_NATIVE_OPUS=1,
-+MOZ_NATIVE_OPUS=)
++MOZ_SYSTEM_OPUS=1,
++MOZ_SYSTEM_OPUS=)
 +
-+if test -n "$MOZ_NATIVE_OPUS"; then
++if test -n "$MOZ_SYSTEM_OPUS"; then
 +    PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
 +else
 +    MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_OPUS)
++AC_SUBST(MOZ_SYSTEM_OPUS)
 +
 +dnl ========================================================
 +dnl Check for libtheora
@@ -133,14 +124,14 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +
 +MOZ_ARG_WITH_BOOL(system-theora,
 +[  --with-system-theora    Use system libtheora (located with pkgconfig)],
-+MOZ_NATIVE_THEORA=1,
-+MOZ_NATIVE_THEORA=)
++MOZ_SYSTEM_THEORA=1,
++MOZ_SYSTEM_THEORA=)
 +
-+if test -n "$MOZ_NATIVE_THEORA"; then
++if test -n "$MOZ_SYSTEM_THEORA"; then
 +    PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_THEORA)
++AC_SUBST(MOZ_SYSTEM_THEORA)
 +
 +dnl ========================================================
 +dnl Check for libsoundtouch
@@ -148,10 +139,10 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +
 +MOZ_ARG_WITH_BOOL(system-soundtouch,
 +[  --with-system-soundtouch Use system libsoundtouch (located with pkgconfig)],
-+MOZ_NATIVE_SOUNDTOUCH=1,
-+MOZ_NATIVE_SOUNDTOUCH=)
++MOZ_SYSTEM_SOUNDTOUCH=1,
++MOZ_SYSTEM_SOUNDTOUCH=)
 +
-+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
 +    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
 +
 +    AC_LANG_SAVE
@@ -176,7 +167,7 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +    fi
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
++AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
 +
 +dnl ========================================================
 +dnl = Disable VP8 decoder support
@@ -194,8 +185,8 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
 +dnl ========================================================
  dnl = Apple platform decoder support
  dnl ========================================================
- if test "$MOZ_WIDGET_TOOLKIT" = "cocoa" || test "$MOZ_WIDGET_TOOLKIT" = "uikit"; then
-@@ -5488,6 +5636,67 @@ fi
+ if test "$COMPILE_ENVIRONMENT"; then
+@@ -4027,6 +4175,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -263,7 +254,7 @@ $NetBSD: patch-aa,v 1.46 2016/06/16 12:0
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -5501,12 +5710,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+@@ -4040,12 +4249,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
     MOZ_ALSA=1,
     MOZ_ALSA=)
  

Index: pkgsrc/www/firefox/patches/patch-as
diff -u pkgsrc/www/firefox/patches/patch-as:1.19 pkgsrc/www/firefox/patches/patch-as:1.20
--- pkgsrc/www/firefox/patches/patch-as:1.19    Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-as Sat Aug  6 08:46:59 2016
@@ -1,11 +1,11 @@
-$NetBSD: patch-as,v 1.19 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-as,v 1.20 2016/08/06 08:46:59 ryoon Exp $
 
 * Treat DragonFly like FreeBSD.
 * Add system ICU support
 
---- js/src/old-configure.in.orig       2016-01-23 23:23:39.000000000 +0000
+--- js/src/old-configure.in.orig       2016-07-25 20:22:08.000000000 +0000
 +++ js/src/old-configure.in
-@@ -2123,8 +2123,7 @@ AC_LANG_CPLUSPLUS
+@@ -1263,8 +1263,7 @@ AC_LANG_CPLUSPLUS
  
  MOZ_CXX11
  
@@ -15,27 +15,18 @@ $NetBSD: patch-as,v 1.19 2016/06/16 12:0
  dnl ===============================================================
  if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -2960,7 +2959,7 @@ if test "$MOZ_MEMORY"; then
-   *-darwin*)
-     AC_DEFINE(MOZ_MEMORY_DARWIN)
-     ;;
--  *-*freebsd*)
-+  *-*freebsd*|*-*dragonfly*)
-     AC_DEFINE(MOZ_MEMORY_BSD)
-     ;;
-   *-android*|*-linuxandroid*)
-@@ -3808,6 +3807,16 @@ MOZ_SUBCONFIGURE_ICU()
+@@ -2613,6 +2612,16 @@ MOZ_CONFIG_ICU()
  dnl ========================================================
  dnl JavaScript shell
  dnl ========================================================
 +ICU_LIB_NAMES=
-+MOZ_NATIVE_ICU=
++MOZ_SYSTEM_ICU=
 +MOZ_ARG_WITH_BOOL(system-icu,
 +[  --with-system-icu
 +                          Use system icu (located with pkgconfig)],
-+    MOZ_NATIVE_ICU=1)
++    MOZ_SYSTEM_ICU=1)
 +
-+if test -n "$MOZ_NATIVE_ICU"; then
++if test -n "$MOZ_SYSTEM_ICU"; then
 +    PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
 +fi
  
Index: pkgsrc/www/firefox/patches/patch-config_system-headers
diff -u pkgsrc/www/firefox/patches/patch-config_system-headers:1.19 pkgsrc/www/firefox/patches/patch-config_system-headers:1.20
--- pkgsrc/www/firefox/patches/patch-config_system-headers:1.19 Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-config_system-headers      Sat Aug  6 08:46:59 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-config_system-headers,v 1.19 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.20 2016/08/06 08:46:59 ryoon Exp $
 
 * Try to support Video4Linux2
 * Resolve libm undefined error
 * Support system libraries
 
---- config/system-headers.orig 2016-06-01 04:11:40.000000000 +0000
+--- config/system-headers.orig 2016-07-25 20:22:04.000000000 +0000
 +++ config/system-headers
 @@ -631,6 +631,7 @@ libgnome/libgnome.h
  libgnomeui/gnome-icon-lookup.h
@@ -52,35 +52,35 @@ $NetBSD: patch-config_system-headers,v 1
  #endif
  libutil.h
  unwind.h
-+#if MOZ_NATIVE_OGG==1
++#if MOZ_SYSTEM_OGG==1
 +ogg/ogg.h
 +ogg/os_types.h
 +#endif
-+#if MOZ_NATIVE_THEORA==1
++#if MOZ_SYSTEM_THEORA==1
 +theora/theoradec.h
 +#endif
-+#if MOZ_NATIVE_VORBIS==1
++#if MOZ_SYSTEM_VORBIS==1
 +vorbis/codec.h
 +vorbis/vorbisenc.h
 +#endif
-+#if MOZ_NATIVE_TREMOR==1
++#if MOZ_SYSTEM_TREMOR==1
 +tremor/ivorbiscodec.h
 +#endif
-+#if MOZ_NATIVE_CELT==1
++#if MOZ_SYSTEM_CELT==1
 +celt.h
 +celt_header.h
 +celt/celt.h
 +celt/celt_header.h
 +#endif
-+#if MOZ_NATIVE_OPUS==1
++#if MOZ_SYSTEM_OPUS==1
 +opus.h
 +opus_multistream.h
 +opus/opus.h
 +opus/opus_multistream.h
 +#endif
-+#if MOZ_NATIVE_SPEEX==1
++#if MOZ_SYSTEM_SPEEX==1
 +speex/speex_resampler.h
 +#endif
-+#if MOZ_NATIVE_SOUNDTOUCH==1
++#if MOZ_SYSTEM_SOUNDTOUCH==1
 +soundtouch/SoundTouch.h
 +#endif

Index: pkgsrc/www/firefox/patches/patch-config_Makefile.in
diff -u pkgsrc/www/firefox/patches/patch-config_Makefile.in:1.6 pkgsrc/www/firefox/patches/patch-config_Makefile.in:1.7
--- pkgsrc/www/firefox/patches/patch-config_Makefile.in:1.6     Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-config_Makefile.in Sat Aug  6 08:46:59 2016
@@ -1,21 +1,21 @@
-$NetBSD: patch-config_Makefile.in,v 1.6 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-config_Makefile.in,v 1.7 2016/08/06 08:46:59 ryoon Exp $
 
 * Support system libraries
 
---- config/Makefile.in.orig    2016-06-01 04:11:40.000000000 +0000
+--- config/Makefile.in.orig    2016-07-25 20:22:04.000000000 +0000
 +++ config/Makefile.in
 @@ -49,6 +49,14 @@ export:: $(export-preqs)
-               -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
-               -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
-               -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
-+              -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \
-+              -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \
-+              -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
-+              -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \
-+              -DMOZ_NATIVE_CELT=$(MOZ_NATIVE_CELT) \
-+              -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
-+              -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \
-+              -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \
+               -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
+               -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
+               -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
++              -DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \
++              -DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \
++              -DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
++              -DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \
++              -DMOZ_SYSTEM_CELT=$(MOZ_SYSTEM_CELT) \
++              -DMOZ_SYSTEM_OPUS=$(MOZ_SYSTEM_OPUS) \
++              -DMOZ_SYSTEM_SPEEX=$(MOZ_SYSTEM_SPEEX) \
++              -DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \
                $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
        $(INSTALL) system_wrappers $(DIST)
  
Index: pkgsrc/www/firefox/patches/patch-media_libtheora_moz.build
diff -u pkgsrc/www/firefox/patches/patch-media_libtheora_moz.build:1.6 pkgsrc/www/firefox/patches/patch-media_libtheora_moz.build:1.7
--- pkgsrc/www/firefox/patches/patch-media_libtheora_moz.build:1.6      Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-media_libtheora_moz.build  Sat Aug  6 08:46:59 2016
@@ -1,14 +1,14 @@
-$NetBSD: patch-media_libtheora_moz.build,v 1.6 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-media_libtheora_moz.build,v 1.7 2016/08/06 08:46:59 ryoon Exp $
 
 * Support system library
 
---- media/libtheora/moz.build.orig     2016-04-15 16:57:47.000000000 +0000
+--- media/libtheora/moz.build.orig     2016-07-25 20:22:04.000000000 +0000
 +++ media/libtheora/moz.build
 @@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias'
  # The encoder is currently not included.
  DEFINES['THEORA_DISABLE_ENCODE'] = True
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
 +
  # Suppress warnings in third-party code.
Index: pkgsrc/www/firefox/patches/patch-mfbt_Attributes.h
diff -u pkgsrc/www/firefox/patches/patch-mfbt_Attributes.h:1.6 pkgsrc/www/firefox/patches/patch-mfbt_Attributes.h:1.7
--- pkgsrc/www/firefox/patches/patch-mfbt_Attributes.h:1.6      Tue Nov  3 15:52:57 2015
+++ pkgsrc/www/firefox/patches/patch-mfbt_Attributes.h  Sat Aug  6 08:46:59 2016
@@ -1,6 +1,6 @@
-$NetBSD: patch-mfbt_Attributes.h,v 1.6 2015/11/03 15:52:57 ryoon Exp $
+$NetBSD: patch-mfbt_Attributes.h,v 1.7 2016/08/06 08:46:59 ryoon Exp $
 
---- mfbt/Attributes.h.orig     2015-10-22 22:30:35.000000000 +0000
+--- mfbt/Attributes.h.orig     2016-07-25 20:22:04.000000000 +0000
 +++ mfbt/Attributes.h
 @@ -50,6 +50,7 @@
   * don't indicate support for them here, due to
@@ -10,7 +10,7 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.6 2
  #  define MOZ_HAVE_NEVER_INLINE          __declspec(noinline)
  #  define MOZ_HAVE_NORETURN              __declspec(noreturn)
  #  if _MSC_VER >= 1900
-@@ -73,6 +74,9 @@
+@@ -72,6 +73,9 @@
  #  ifndef __has_extension
  #    define __has_extension __has_feature /* compatibility, for older versions of clang */
  #  endif
@@ -20,11 +20,3 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.6 2
  #  if __has_extension(cxx_constexpr)
  #    define MOZ_HAVE_CXX11_CONSTEXPR
  #  endif
-@@ -89,6 +93,7 @@
- #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
- #    define MOZ_HAVE_CXX11_CONSTEXPR
- #    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
-+#      define MOZ_HAVE_CXX11_ALIGNAS
- #      define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
- #    endif
- #    define MOZ_HAVE_EXPLICIT_CONVERSION
Index: pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build
diff -u pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.6 pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.7
--- pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.6      Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build  Sat Aug  6 08:46:59 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.6 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.7 2016/08/06 08:46:59 ryoon Exp $
 
 * Support system libraries
 
---- toolkit/library/moz.build.orig     2016-06-01 04:11:43.000000000 +0000
+--- toolkit/library/moz.build.orig     2016-07-25 20:22:07.000000000 +0000
 +++ toolkit/library/moz.build
 @@ -211,6 +211,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
      ]
@@ -12,35 +12,35 @@ $NetBSD: patch-toolkit_library_moz.build
  OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
  OS_LIBS += CONFIG['MOZ_SERVO_LIBS']
  
-@@ -223,6 +224,30 @@ if CONFIG['MOZ_NATIVE_PNG']:
- if CONFIG['MOZ_NATIVE_HUNSPELL']:
+@@ -223,6 +224,30 @@ if CONFIG['MOZ_SYSTEM_PNG']:
+ if CONFIG['MOZ_SYSTEM_HUNSPELL']:
      OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    OS_LIBS += CONFIG['MOZ_OGG_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_THEORA']:
++if CONFIG['MOZ_SYSTEM_THEORA']:
 +    OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_VORBIS']:
++if CONFIG['MOZ_SYSTEM_VORBIS']:
 +    OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_TREMOR']:
++if CONFIG['MOZ_SYSTEM_TREMOR']:
 +    OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_CELT']:
++if CONFIG['MOZ_SYSTEM_CELT']:
 +    OS_LIBS += CONFIG['MOZ_CELT_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_OPUS']:
++if CONFIG['MOZ_SYSTEM_OPUS']:
 +    OS_LIBS += CONFIG['MOZ_OPUS_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_SPEEX']:
++if CONFIG['MOZ_SYSTEM_SPEEX']:
 +    OS_LIBS += CONFIG['MOZ_SPEEX_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
 +    OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
 +
- if CONFIG['MOZ_NATIVE_LIBEVENT']:
+ if CONFIG['MOZ_SYSTEM_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
 @@ -235,6 +260,9 @@ if not CONFIG['MOZ_TREE_PIXMAN']:

Index: pkgsrc/www/firefox/patches/patch-config_external_moz.build
diff -u pkgsrc/www/firefox/patches/patch-config_external_moz.build:1.12 pkgsrc/www/firefox/patches/patch-config_external_moz.build:1.13
--- pkgsrc/www/firefox/patches/patch-config_external_moz.build:1.12     Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-config_external_moz.build  Sat Aug  6 08:46:59 2016
@@ -1,28 +1,28 @@
-$NetBSD: patch-config_external_moz.build,v 1.12 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-config_external_moz.build,v 1.13 2016/08/06 08:46:59 ryoon Exp $
 
 * Support system libraries
 
---- config/external/moz.build.orig     2016-05-12 17:04:58.000000000 +0000
+--- config/external/moz.build.orig     2016-07-25 20:22:04.000000000 +0000
 +++ config/external/moz.build
 @@ -21,10 +21,19 @@ if CONFIG['MOZ_UPDATER']:
  external_dirs += ['modules/brotli']
  external_dirs += ['modules/woff2']
  
 -if CONFIG['MOZ_VORBIS']:
-+if not CONFIG['MOZ_NATIVE_OGG']:
++if not CONFIG['MOZ_SYSTEM_OGG']:
 +    external_dirs += ['media/libogg']
 +
-+if not CONFIG['MOZ_NATIVE_CELT'] or not CONFIG['MOZ_NATIVE_OPUS']:
++if not CONFIG['MOZ_SYSTEM_CELT'] or not CONFIG['MOZ_SYSTEM_OPUS']:
 +    external_dirs += ['media/libopus']
 +
-+if not CONFIG['MOZ_NATIVE_THEORA']:
++if not CONFIG['MOZ_SYSTEM_THEORA']:
 +    external_dirs += ['media/libtheora']
 +
-+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
++if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']:
      external_dirs += ['media/libvorbis']
  
 -if CONFIG['MOZ_TREMOR']:
-+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']:
      external_dirs += ['media/libtremor']
  
  if CONFIG['MOZ_WEBM_ENCODER']:

Index: pkgsrc/www/firefox/patches/patch-dom_media_moz.build
diff -u pkgsrc/www/firefox/patches/patch-dom_media_moz.build:1.4 pkgsrc/www/firefox/patches/patch-dom_media_moz.build:1.5
--- pkgsrc/www/firefox/patches/patch-dom_media_moz.build:1.4    Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-dom_media_moz.build        Sat Aug  6 08:46:59 2016
@@ -1,32 +1,32 @@
-$NetBSD: patch-dom_media_moz.build,v 1.4 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-dom_media_moz.build,v 1.5 2016/08/06 08:46:59 ryoon Exp $
 
 * Support system libraries
 
---- dom/media/moz.build.orig   2016-04-15 16:57:42.000000000 +0000
+--- dom/media/moz.build.orig   2016-07-25 20:22:03.000000000 +0000
 +++ dom/media/moz.build
-@@ -314,6 +314,27 @@ if CONFIG['ANDROID_VERSION'] > '15':
+@@ -327,6 +327,27 @@ if CONFIG['ANDROID_VERSION'] > '15':
  if CONFIG['MOZ_GONK_MEDIACODEC']:
      DEFINES['MOZ_GONK_MEDIACODEC'] = True
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_THEORA']:
++if CONFIG['MOZ_SYSTEM_THEORA']:
 +    CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_VORBIS']:
++if CONFIG['MOZ_SYSTEM_VORBIS']:
 +    CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_TREMOR']:
++if CONFIG['MOZ_SYSTEM_TREMOR']:
 +    CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_OPUS']:
++if CONFIG['MOZ_SYSTEM_OPUS']:
 +    CXXFLAGS += CONFIG['MOZ_OPUS_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_SPEEX']:
++if CONFIG['MOZ_SYSTEM_SPEEX']:
 +    CXXFLAGS += CONFIG['MOZ_SPEEX_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
 +    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
 +
  include('/ipc/chromium/chromium-config.mozbuild')
Index: pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
diff -u pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc:1.4 pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc:1.5
--- pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc:1.4    Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc        Sat Aug  6 08:46:59 2016
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2016/08/06 08:46:59 ryoon Exp $
 
---- ipc/chromium/src/base/process_util_bsd.cc.orig     2016-02-25 23:01:54.000000000 +0000
+--- ipc/chromium/src/base/process_util_bsd.cc.orig     2016-07-25 20:22:06.000000000 +0000
 +++ ipc/chromium/src/base/process_util_bsd.cc
 @@ -10,6 +10,10 @@
  #include <spawn.h>
@@ -12,4 +12,4 @@ $NetBSD: patch-ipc_chromium_src_base_pro
 +
  #include <string>
  
- #include "base/eintr_wrapper.h"
+ #include "nspr.h"
Index: pkgsrc/www/firefox/patches/patch-modules_libpref_init_all.js
diff -u pkgsrc/www/firefox/patches/patch-modules_libpref_init_all.js:1.4 pkgsrc/www/firefox/patches/patch-modules_libpref_init_all.js:1.5
--- pkgsrc/www/firefox/patches/patch-modules_libpref_init_all.js:1.4    Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-modules_libpref_init_all.js        Sat Aug  6 08:46:59 2016
@@ -1,19 +1,10 @@
-$NetBSD: patch-modules_libpref_init_all.js,v 1.4 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-modules_libpref_init_all.js,v 1.5 2016/08/06 08:46:59 ryoon Exp $
 
 * Improve stability under NetBSD.
 
---- modules/libpref/init/all.js.orig   2016-06-01 04:11:44.000000000 +0000
+--- modules/libpref/init/all.js.orig   2016-07-25 20:22:05.000000000 +0000
 +++ modules/libpref/init/all.js
-@@ -4417,7 +4417,7 @@ pref("layers.max-active", -1);
- pref("layers.tiles.adjust", true);
- 
- // Set the default values, and then override per-platform as needed
--pref("layers.offmainthreadcomposition.enabled", true);
-+pref("layers.offmainthreadcomposition.enabled", false);
- // Compositor target frame rate. NOTE: If vsync is enabled the compositor
- // frame rate will still be capped.
- // -1 -> default (match layout.frame_rate or 60 FPS)
-@@ -4504,7 +4504,7 @@ pref("device.sensors.enabled", true);
+@@ -4540,7 +4540,7 @@ pref("device.sensors.enabled", true);
  pref("device.storage.enabled", false);
  
  // Toggle which thread the HTML5 parser uses for stream parsing

Index: pkgsrc/www/firefox/patches/patch-js_src_jit_AtomicOperations.h
diff -u pkgsrc/www/firefox/patches/patch-js_src_jit_AtomicOperations.h:1.1 pkgsrc/www/firefox/patches/patch-js_src_jit_AtomicOperations.h:1.2
--- pkgsrc/www/firefox/patches/patch-js_src_jit_AtomicOperations.h:1.1  Wed May  4 16:22:35 2016
+++ pkgsrc/www/firefox/patches/patch-js_src_jit_AtomicOperations.h      Sat Aug  6 08:46:59 2016
@@ -1,15 +1,15 @@
-$NetBSD: patch-js_src_jit_AtomicOperations.h,v 1.1 2016/05/04 16:22:35 martin Exp $
+$NetBSD: patch-js_src_jit_AtomicOperations.h,v 1.2 2016/08/06 08:46:59 ryoon Exp $
 
 Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1232150
 
---- js/src/jit/AtomicOperations.h.orig 2016-04-22 02:37:26.000000000 +0200
-+++ js/src/jit/AtomicOperations.h      2016-05-02 18:09:00.162942120 +0200
-@@ -316,6 +316,8 @@ AtomicOperations::isLockfree(int32_t siz
-     || defined(__ppc64le__) || defined(__PPC64LE__) \
-     || defined(__ppc__) || defined(__PPC__)
+--- js/src/jit/AtomicOperations.h.orig 2016-07-25 20:22:07.000000000 +0000
++++ js/src/jit/AtomicOperations.h
+@@ -328,6 +328,8 @@ AtomicOperations::isLockfree(int32_t siz
+ # include "jit/mips-shared/AtomicOperations-mips-shared.h"
+ #elif defined(__ppc__) || defined(__PPC__)
  # include "jit/none/AtomicOperations-ppc.h"
 +#elif defined(__sparc__)
 +# include "jit/none/AtomicOperations-sparc.h"
  #elif defined(JS_CODEGEN_NONE)
- # include "jit/none/AtomicOperations-none.h"
- #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+   // You can disable the JIT with --disable-ion but you must still
+   // provide the atomic operations that will be used by the JS engine.
Index: pkgsrc/www/firefox/patches/patch-media_libtremor_Makefile.in
diff -u pkgsrc/www/firefox/patches/patch-media_libtremor_Makefile.in:1.1 pkgsrc/www/firefox/patches/patch-media_libtremor_Makefile.in:1.2
--- pkgsrc/www/firefox/patches/patch-media_libtremor_Makefile.in:1.1    Thu Mar 20 21:02:00 2014
+++ pkgsrc/www/firefox/patches/patch-media_libtremor_Makefile.in        Sat Aug  6 08:46:59 2016
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libtremor_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $
+$NetBSD: patch-media_libtremor_Makefile.in,v 1.2 2016/08/06 08:46:59 ryoon Exp $
 
---- media/libtremor/Makefile.in.orig   2014-03-20 11:09:40.000000000 +0000
+--- media/libtremor/Makefile.in.orig   2016-08-04 17:13:18.579788654 +0000
 +++ media/libtremor/Makefile.in
 @@ -0,0 +1,9 @@
 +# This Source Code Form is subject to the terms of the Mozilla Public
@@ -9,6 +9,6 @@ $NetBSD: patch-media_libtremor_Makefile.
 +
 +include $(topsrcdir)/config/rules.mk
 +
-+ifdef MOZ_NATIVE_OGG
++ifdef MOZ_SYSTEM_OGG
 +CFLAGS += $(MOZ_OGG_CFLAGS)
 +endif
Index: pkgsrc/www/firefox/patches/patch-media_libvorbis_Makefile.in
diff -u pkgsrc/www/firefox/patches/patch-media_libvorbis_Makefile.in:1.1 pkgsrc/www/firefox/patches/patch-media_libvorbis_Makefile.in:1.2
--- pkgsrc/www/firefox/patches/patch-media_libvorbis_Makefile.in:1.1    Thu Mar 20 21:02:00 2014
+++ pkgsrc/www/firefox/patches/patch-media_libvorbis_Makefile.in        Sat Aug  6 08:46:59 2016
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libvorbis_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $
+$NetBSD: patch-media_libvorbis_Makefile.in,v 1.2 2016/08/06 08:46:59 ryoon Exp $
 
---- media/libvorbis/Makefile.in.orig   2014-03-20 11:09:40.000000000 +0000
+--- media/libvorbis/Makefile.in.orig   2016-08-04 17:13:18.580232660 +0000
 +++ media/libvorbis/Makefile.in
 @@ -0,0 +1,9 @@
 +# This Source Code Form is subject to the terms of the Mozilla Public
@@ -9,6 +9,6 @@ $NetBSD: patch-media_libvorbis_Makefile.
 +
 +include $(topsrcdir)/config/rules.mk
 +
-+ifdef MOZ_NATIVE_OGG
++ifdef MOZ_SYSTEM_OGG
 +CFLAGS += $(MOZ_OGG_CFLAGS)
 +endif

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.8 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.9
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.8   Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build       Sat Aug  6 08:46:59 2016
@@ -1,11 +1,11 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.8 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.9 2016/08/06 08:46:59 ryoon Exp $
 
 * Add OSS audio support
 * Support system library
 
---- media/libcubeb/src/moz.build.orig  2016-04-15 16:57:46.000000000 +0000
+--- media/libcubeb/src/moz.build.orig  2016-07-25 20:22:04.000000000 +0000
 +++ media/libcubeb/src/moz.build
-@@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']:
+@@ -19,6 +19,12 @@ if CONFIG['MOZ_ALSA']:
      ]
      DEFINES['USE_ALSA'] = True
  
@@ -18,17 +18,17 @@ $NetBSD: patch-media_libcubeb_src_moz.bu
  if CONFIG['MOZ_PULSEAUDIO']:
      SOURCES += [
          'cubeb_pulse.c',
-@@ -64,6 +70,9 @@ if CONFIG['OS_TARGET'] == 'Android':
+@@ -68,6 +74,9 @@ if CONFIG['OS_TARGET'] == 'Android':
  
  FINAL_LIBRARY = 'gkmedias'
  
-+if CONFIG['MOZ_NATIVE_SPEEX']:
++if CONFIG['MOZ_SYSTEM_SPEEX']:
 +    SOURCES['cubeb_resampler.cpp'].flags += CONFIG['MOZ_SPEEX_CFLAGS']
 +
  if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
      if CONFIG['ANDROID_VERSION'] >= '17':
          LOCAL_INCLUDES += [
-@@ -74,6 +83,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
+@@ -78,6 +87,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
              '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'],
          ]
  

Index: pkgsrc/www/firefox/patches/patch-media_libtremor_moz.build
diff -u pkgsrc/www/firefox/patches/patch-media_libtremor_moz.build:1.2 pkgsrc/www/firefox/patches/patch-media_libtremor_moz.build:1.3
--- pkgsrc/www/firefox/patches/patch-media_libtremor_moz.build:1.2      Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-media_libtremor_moz.build  Sat Aug  6 08:46:59 2016
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_libtremor_moz.build,v 1.2 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-media_libtremor_moz.build,v 1.3 2016/08/06 08:46:59 ryoon Exp $
 
 * Support system library
 
---- media/libtremor/moz.build.orig     2014-11-21 03:37:42.000000000 +0000
+--- media/libtremor/moz.build.orig     2016-05-12 17:13:17.000000000 +0000
 +++ media/libtremor/moz.build
-@@ -6,3 +6,5 @@
+@@ -9,3 +9,5 @@ with Files('*'):
  
  DIRS += ['include/tremor', 'lib']
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
Index: pkgsrc/www/firefox/patches/patch-media_libvorbis_moz.build
diff -u pkgsrc/www/firefox/patches/patch-media_libvorbis_moz.build:1.2 pkgsrc/www/firefox/patches/patch-media_libvorbis_moz.build:1.3
--- pkgsrc/www/firefox/patches/patch-media_libvorbis_moz.build:1.2      Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-media_libvorbis_moz.build  Sat Aug  6 08:46:59 2016
@@ -1,13 +1,13 @@
-$NetBSD: patch-media_libvorbis_moz.build,v 1.2 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-media_libvorbis_moz.build,v 1.3 2016/08/06 08:46:59 ryoon Exp $
 
 * Support system library
 
---- media/libvorbis/moz.build.orig     2014-11-21 03:37:42.000000000 +0000
+--- media/libvorbis/moz.build.orig     2016-05-12 17:13:17.000000000 +0000
 +++ media/libvorbis/moz.build
-@@ -55,3 +55,6 @@ FINAL_LIBRARY = 'gkmedias'
+@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias'
  # Suppress warnings in third-party code.
  if CONFIG['GNU_CC']:
      CFLAGS += ['-Wno-uninitialized']
 +
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
Index: pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
diff -u pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.2 
pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.3
--- pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.2      Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h  Sat Aug  6 08:46:59 2016
@@ -1,10 +1,8 @@
-$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.2 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.3 2016/08/06 08:46:59 ryoon Exp $
 
-* Support NetBSD/earm
-
---- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig     2015-09-29 21:45:03.000000000 +0000
+--- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig     2016-07-25 20:22:06.000000000 +0000
 +++ toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h
-@@ -76,9 +76,15 @@ typedef intptr_t Atomic64;
+@@ -76,6 +76,11 @@ typedef intptr_t Atomic64;
  #endif
  #endif
  
@@ -15,7 +13,11 @@ $NetBSD: patch-toolkit_components_protob
 +#else
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
  // Atomic64 routines below, depending on your architecture.
+ #if defined(__OpenBSD__) && !defined(GOOGLE_PROTOBUF_ARCH_64_BIT)
+@@ -83,6 +88,7 @@ typedef Atomic32 AtomicWord;
+ #else
  typedef intptr_t AtomicWord;
+ #endif
 +#endif
  
  // Atomically execute:

Added files:

Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure
diff -u /dev/null pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure:1.1
--- /dev/null   Sat Aug  6 08:46:59 2016
+++ pkgsrc/www/firefox/patches/patch-build_moz.configure_old.configure  Sat Aug  6 08:46:59 2016
@@ -0,0 +1,49 @@
+$NetBSD: patch-build_moz.configure_old.configure,v 1.1 2016/08/06 08:46:59 ryoon Exp $
+
+--- build/moz.configure/old.configure.orig     2016-07-25 20:22:04.000000000 +0000
++++ build/moz.configure/old.configure
+@@ -158,6 +158,7 @@ def old_configure_options(*options):
+     '--enable-accessibility',
+     '--enable-address-sanitizer',
+     '--enable-alsa',
++    '--enable-alsa-dlopen',
+     '--enable-android-omx',
+     '--enable-android-resource-constrained',
+     '--enable-approximate-location',
+@@ -266,6 +267,7 @@ def old_configure_options(*options):
+     '--enable-verify-mar',
+     '--enable-warnings-as-errors',
+     '--enable-webapp-runtime',
++    '--enable-webm',
+     '--enable-webrtc',
+     '--enable-websms-backend',
+     '--enable-webspeech',
+@@ -313,6 +315,7 @@ def old_configure_options(*options):
+     '--with-nspr-prefix',
+     '--with-nss-exec-prefix',
+     '--with-nss-prefix',
++    '--with-oss',
+     '--with-pthreads',
+     '--with-qemu-exe',
+     '--with-qtdir',
+@@ -320,13 +323,20 @@ def old_configure_options(*options):
+     '--with-sixgill',
+     '--with-soft-float',
+     '--with-system-bz2',
++    '--with-system-celt',
+     '--with-system-icu',
+     '--with-system-jpeg',
+     '--with-system-libevent',
+     '--with-system-libvpx',
+     '--with-system-nspr',
+     '--with-system-nss',
++    '--with-system-ogg',
++    '--with-system-opus',
+     '--with-system-png',
++    '--with-system-soundtouch',
++    '--with-system-theora',
++    '--with-system-tremor',
++    '--with-system-vorbis',
+     '--with-system-zlib',
+     '--with-thumb',
+     '--with-thumb-interwork',
Index: pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py
diff -u /dev/null pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py:1.1
--- /dev/null   Sat Aug  6 08:46:59 2016
+++ pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py      Sat Aug  6 08:46:59 2016
@@ -0,0 +1,26 @@
+$NetBSD: patch-python_mozbuild_mozbuild_configure_options.py,v 1.1 2016/08/06 08:46:59 ryoon Exp $
+
+* Allow lowercase environmental variables
+
+--- python/mozbuild/mozbuild/configure/options.py.orig 2016-07-25 20:22:07.000000000 +0000
++++ python/mozbuild/mozbuild/configure/options.py
+@@ -141,9 +141,6 @@ class Option(object):
+             if not isinstance(env, types.StringTypes):
+                 raise InvalidOptionError(
+                     'Environment variable name must be a string')
+-            if not env.isupper():
+-                raise InvalidOptionError(
+-                    'Environment variable name must be all uppercase')
+         if nargs not in (None, '?', '*', '+') and not (
+                 isinstance(nargs, int) and nargs >= 0):
+             raise InvalidOptionError(
+@@ -250,9 +247,6 @@ class Option(object):
+             if name.startswith('-'):
+                 raise InvalidOptionError(
+                     'Option must start with two dashes instead of one')
+-            if name.islower():
+-                raise InvalidOptionError(
+-                    'Environment variable name must be all uppercase')
+         return '', name, values
+ 
+     @staticmethod



Home | Main Index | Thread Index | Old Index