firefox: update to 79.0

New

    We’ve rolled out WebRender to more Windows users with Intel and AMD GPUs, bringing improved graphics performance to an even larger audience.

    Firefox users in Germany will now see more Pocket recommendations in their new tab featuring some of the best stories on the web. If you don’t see them, you can turn on Pocket articles in your new tab by following these steps.

Fixed

    Various security fixes.

    Several crashes while using a screen reader were fixed, including a frequently encountered crash when using the JAWS screen reader.

    Firefox Developer Tools received significant fixes allowing screen reader users to benefit from some of the tools that were previously inaccessible.

    SVG title and desc elements (labels and descriptions) are now correctly exposed to assistive technology products such as screen readers.

Enterprise

    A number of bug fixes and new policies have been implemented in the latest version of Firefox. You can see more details in the Firefox for Enterprise 79 Release Notes.

    Updates to the password policy allow admins to require a primary password (formerly called master password. Previously the policy could disable the primary password but not force a primary password. Users required to use a primary password will only be asked to create a primary password the first time they try to save a password.

Developer

    Developer Information

    Newly added asynchronous call stacks let developers trace their async code through events, timeouts, and promises. The async execution chains are shown in the Debugger’s call stack, but also for stack traces in Console errors and Network initiators.

    Erroneous network responses with 4xx/5xx status codes display as errors in the Console, making it easy to understand them in the context of related logs. The request/response details can be expanded or resent for quick debugging.

    JavaScript errors are now visible not only in the Console, but also in the Debugger. The relevant line of code will be highlighted and display error details on hover.

    Opening SCSS and CSS-in-JS sources from the Inspector now works more reliably thanks to improved source map handling across all panels.

    Inspecting accessibility properties from the browser context menu is now available to all users by default.

9 files changed, 159 insertions, 140 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e122301de11..6f86c680ff4 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.440 2020/07/24 11:31:01 wiz Exp $
+# $NetBSD: Makefile,v 1.441 2020/07/31 01:26:43 maya Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=		78.0
-MOZ_BRANCH_MINOR=	.2
-PKGREVISION=		1
+MOZ_BRANCH=		79.0
+#MOZ_BRANCH_MINOR=	.1
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	${DISTNAME:S/.source//:S/b/beta/:S/esr//}
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index af220d99245..a4c6ba87c3b 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.161 2020/07/01 13:01:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.162 2020/07/31 01:26:43 maya Exp $
 bin/firefox
 lib/firefox/actors/AboutHttpsOnlyErrorChild.jsm
 lib/firefox/actors/AboutHttpsOnlyErrorParent.jsm
@@ -57,6 +57,7 @@ lib/firefox/browser/actors/AboutPrivateBrowsingParent.jsm
 lib/firefox/browser/actors/AboutProtectionsChild.jsm
 lib/firefox/browser/actors/AboutProtectionsParent.jsm
 lib/firefox/browser/actors/AboutReaderChild.jsm
+lib/firefox/browser/actors/AboutReaderParent.jsm
 lib/firefox/browser/actors/AboutTabCrashedChild.jsm
 lib/firefox/browser/actors/AboutTabCrashedParent.jsm
 lib/firefox/browser/actors/AboutWelcomeChild.jsm
@@ -100,6 +101,7 @@ lib/firefox/browser/actors/WebRTCChild.jsm
 lib/firefox/browser/actors/WebRTCParent.jsm
 lib/firefox/browser/chrome.manifest
 lib/firefox/browser/chrome/browser/content/branding/about-logo.png
+lib/firefox/browser/chrome/browser/content/branding/about-logo.svg
 lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png
 lib/firefox/browser/chrome/browser/content/branding/about-wordmark.svg
 lib/firefox/browser/chrome/browser/content/branding/about.png
@@ -464,6 +466,7 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/dialogs/syncChoos
 lib/firefox/browser/chrome/browser/content/browser/preferences/dialogs/syncChooseWhatToSync.xhtml
 lib/firefox/browser/chrome/browser/content/browser/preferences/dialogs/translation.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/dialogs/translation.xhtml
+lib/firefox/browser/chrome/browser/content/browser/preferences/experimental.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/extensionControlled.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/findInPage.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/fxaPairDevice.js
@@ -686,6 +689,7 @@ lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trail
 lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/firefox-logo.png
 lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/firefox-systems.png
 lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/whatsnew-send-icon.png
+lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/zap.svg
 lib/firefox/browser/chrome/browser/res/activity-stream/data/content/newtab-render.js
 lib/firefox/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/aliexpress-com.ico
 lib/firefox/browser/chrome/browser/res/activity-stream/data/content/tippytop/favicons/allegro-pl.ico
@@ -1255,6 +1259,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/canva
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/default-info.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/drag-indicator.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/focus-tab-by-prompt.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo-detailed.svg
@@ -1453,7 +1458,6 @@ lib/firefox/browser/chrome/devtools/content/inspector/markup/markup.xhtml
 lib/firefox/browser/chrome/devtools/content/memory/index.xhtml
 lib/firefox/browser/chrome/devtools/content/netmonitor/index.html
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/icons/arrow-up.svg
-lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/icons/blocked.svg
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/icons/play.svg
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/icons/shield.svg
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/CustomRequestPanel.css
@@ -1462,16 +1466,17 @@ lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/Network
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/NetworkDetailsBar.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/RequestBlockingPanel.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/RequestList.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/ResponsePanel.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatisticsPanel.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatusBar.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatusCode.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/Toolbar.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/UrlPreview.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/httpi.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/messages.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/netmonitor.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/search.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/variables.css
-lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/websockets.css
 lib/firefox/browser/chrome/devtools/content/performance-new/aboutprofiling/index.xhtml
 lib/firefox/browser/chrome/devtools/content/performance-new/aboutprofiling/initializer.js
 lib/firefox/browser/chrome/devtools/content/performance-new/frame-script.js
@@ -1546,6 +1551,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/c
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/components/debugtarget/ServiceWorkerAction.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/components/debugtarget/ServiceWorkerAction.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/components/debugtarget/ServiceWorkerAdditionalActions.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/components/debugtarget/TabAction.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/components/debugtarget/TabDetail.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/components/debugtarget/TemporaryExtensionAdditionalActions.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/components/debugtarget/TemporaryExtensionDetail.js
@@ -1819,6 +1825,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/breakpoints/remapLocations.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/breakpoints/syncBreakpoint.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/event-listeners.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/exceptions.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/expressions.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/file-search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/index.js
@@ -1870,7 +1877,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/client/
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/client/firefox/commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/client/firefox/create.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/client/firefox/events.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/client/firefox/targets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/client/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/A11yIntention.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/A11yIntention.js
@@ -1887,6 +1893,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/compone
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Editor.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/EditorMenu.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/EmptyLines.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Exception.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Exceptions.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Footer.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Footer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/HighlightCalls.css
@@ -2000,6 +2008,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducer
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducers/async-requests.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducers/breakpoints.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducers/event-listeners.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducers/exceptions.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducers/expressions.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducers/file-search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/reducers/index.js
@@ -2180,9 +2189,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/addon/webexte
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/animation.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/array-buffer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/changes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/compatibility.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/content-viewer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/css-properties.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/descriptors/frame.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/descriptors/process.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/descriptors/tab.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/fronts/descriptors/webextension.js
@@ -2452,6 +2461,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/uti
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/walker-event-listener.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/store.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/toolsidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/Converter.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/Sniffer.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/Headers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/HeadersPanel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/HeadersToolbar.js
@@ -2464,7 +2475,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/TextToolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/Toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-child.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-observer.js
 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
@@ -2534,6 +2544,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/batching.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/filters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/request-blocking.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/requests.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/search.js
@@ -2541,7 +2552,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actio
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/sort.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/timing-markers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/ui.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/web-sockets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/api.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/app.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/App.js
@@ -2556,6 +2566,41 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/compo
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StatusCode.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/TabboxPanel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/Toolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnData.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnEventName.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnFinBit.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnLastEventId.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnMaskBit.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnOpCode.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnRetry.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnSize.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/ColumnTime.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessageFilterMenu.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessageListContent.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessageListContextMenu.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessageListHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessageListHeaderContextMenu.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessageListItem.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessagePayload.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/MessagesView.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/RawData.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/StatusBar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/Toolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/cbor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/msgpack.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/signalr/HandshakeProtocol.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/signalr/IHubProtocol.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/signalr/JSONHubProtocol.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/signalr/TextMessageFormat.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/signalr/Utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/signalr/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/socket-io/binary.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/socket-io/component-emitter.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/socket-io/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/socket-io/is-buffer.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/sockjs/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/wamp/arrayParser.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/messages/parsers/wamp/serializers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/previews/HtmlPreview.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/previews/ImagePreview.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/previews/SourcePreview.js
@@ -2597,38 +2642,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/compo
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/search/StatusBar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/search/Toolbar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/search/search-provider.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameFilterMenu.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListColumnData.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListColumnFinBit.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListColumnMaskBit.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListColumnOpCode.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListColumnSize.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListColumnTime.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListContent.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListContextMenu.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListHeader.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListHeaderContextMenu.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameListItem.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FramePayload.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/RawData.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/StatusBar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/Toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/WebSocketsPanel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/cbor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/msgpack.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/HandshakeProtocol.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/IHubProtocol.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/JSONHubProtocol.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/TextMessageFormat.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/Utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/socket-io/binary.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/socket-io/component-emitter.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/socket-io/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/socket-io/is-buffer.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/sockjs/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/wamp/arrayParser.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/wamp/serializers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-connector.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-data-provider.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/index.js
@@ -2653,19 +2666,19 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middl
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/batching.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/filters.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/request-blocking.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/requests.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/sort.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/timing-markers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/ui.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/web-sockets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/requests.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/timing-markers.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/ui.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/web-sockets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-predicates.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-text-utils.js
@@ -3118,11 +3131,12 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/array-buffer.
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/breakpoint.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/changes.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/common.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/compatibility.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/css-properties.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/frame.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/process.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/tab.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/watcher/FrameWatchers.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/watcher/WatcherRegistry.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/watcher/target-helpers/frame-helper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/watcher/watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/descriptors/webextension.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/device.js
@@ -3175,6 +3189,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monit
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-observer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-response-listener.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/stack-trace-collector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/utils/channel-map.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/utils/wildcard-to-regexp.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/websocket-actor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/object.js
@@ -3191,6 +3206,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance.j
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/preference.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/process.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/reflow.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/console-messages.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/resources/platform-messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/root.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/screenshot.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/source.js
@@ -3203,6 +3221,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/targets/chrom
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/targets/content-process.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/targets/frame.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/targets/parent-process.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/targets/target-actor-registry.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/targets/webextension.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/targets/worker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/thread.js
@@ -3219,6 +3238,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/logEven
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/shapes-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/source-map-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/source-url.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/track-change-emitter.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
@@ -3345,10 +3365,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/qrcode/decoder/index
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/qrcode/encoder/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/qrcode/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/console-messages.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/css-changes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/css-messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/error-messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/platform-messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/root-node.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-frames-watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-processes-watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-serviceworkers-watcher.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-sharedworkers-watcher.js
@@ -3368,9 +3389,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/addon/webexten
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/animation.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/array-buffer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/changes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/compatibility.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/content-viewer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/css-properties.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/frame.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/process.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/tab.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/webextension.js
@@ -3490,6 +3511,7 @@ lib/firefox/browser/chrome/devtools/skin/images/arrowhead-down.svg
 lib/firefox/browser/chrome/devtools/skin/images/arrowhead-left.svg
 lib/firefox/browser/chrome/devtools/skin/images/arrowhead-right.svg
 lib/firefox/browser/chrome/devtools/skin/images/arrowhead-up.svg
+lib/firefox/browser/chrome/devtools/skin/images/blocked.svg
 lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-divider.svg
 lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.svg
 lib/firefox/browser/chrome/devtools/skin/images/browsers/chrome.svg
@@ -3634,8 +3656,6 @@ lib/firefox/browser/chrome/en-US/locale/browser/downloads/downloads.properties
 lib/firefox/browser/chrome/en-US/locale/browser/downloads/settingsChange.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/feeds/subscribe.properties
 lib/firefox/browser/chrome/en-US/locale/browser/fxmonitor.properties
-lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.properties
 lib/firefox/browser/chrome/en-US/locale/browser/netError.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/newInstall.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/places/bookmarkProperties.properties
@@ -3709,8 +3729,8 @@ lib/firefox/browser/chrome/pdfjs/content/PdfJsDefaultPreferences.jsm
 lib/firefox/browser/chrome/pdfjs/content/PdfJsNetwork.jsm
 lib/firefox/browser/chrome/pdfjs/content/PdfJsTelemetry.jsm
 lib/firefox/browser/chrome/pdfjs/content/PdfStreamConverter.jsm
-lib/firefox/browser/chrome/pdfjs/content/PdfjsChromeUtils.jsm
-lib/firefox/browser/chrome/pdfjs/content/PdfjsContentUtils.jsm
+lib/firefox/browser/chrome/pdfjs/content/PdfjsChild.jsm
+lib/firefox/browser/chrome/pdfjs/content/PdfjsParent.jsm
 lib/firefox/browser/chrome/pdfjs/content/build/pdf.js
 lib/firefox/browser/chrome/pdfjs/content/build/pdf.worker.js
 lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-H.bcmap
@@ -3991,17 +4011,7 @@ lib/firefox/browser/defaults/settings/main/url-classifier-skip-urls.json
 lib/firefox/browser/defaults/settings/pinning/pins.json
 lib/firefox/browser/defaults/settings/security-state/intermediates.json
 lib/firefox/browser/defaults/settings/security-state/onecrl.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/de/messages.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/en_US/messages.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/es_ES/messages.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/es_MX/messages.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/fr/messages.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/it/messages.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/ru/messages.json
-lib/firefox/browser/features/doh-rollout@mozilla.org/_locales/zh_CN/messages.json
 lib/firefox/browser/features/doh-rollout@mozilla.org/background.js
-lib/firefox/browser/features/doh-rollout@mozilla.org/experiments/doorhanger/api.js
-lib/firefox/browser/features/doh-rollout@mozilla.org/experiments/doorhanger/schema.json
 lib/firefox/browser/features/doh-rollout@mozilla.org/experiments/heuristics/api.js
 lib/firefox/browser/features/doh-rollout@mozilla.org/experiments/heuristics/schema.json
 lib/firefox/browser/features/doh-rollout@mozilla.org/experiments/preferences/api.js
@@ -4162,7 +4172,6 @@ lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1568908-con
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1570119-teamcoco.com-scrollbar-width.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1570328-developer-apple.com-transform-scale.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1575000-apply.lloydsbank.co.uk-radio-buttons-fix.css
-lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1577270-binance.com-calc-height-fix.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1577297-kitkat.com.au-slider-width-fix.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1605611-maps.google.com-directions-time.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1609991-cracked.com-flex-basis-fix.css
@@ -4170,7 +4179,8 @@ lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1610016-gaa
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1610344-directv.com.co-hide-unsupported-message.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1631960-websube.ckbogazici.com.tr-table-row-fix.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1632019-everyman.co-gallery-width-fix.css
-lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1633796-www-la-poste-fr-placeholder-fix.css
+lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1644830-missingmail.usps.com-checkboxes-not-visible.css
+lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1645064-s-kanava.fi-invisible-charts.css
 lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug0000000-testbed-js-injection.js
 lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug1452707-window.controllers-shim-ib.absa.co.za.js
 lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug1457335-histography.io-ua-change.js
@@ -4181,6 +4191,7 @@ lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug1605611-maps
 lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug1610358-pcloud.com-appVersion-change.js
 lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug1623375-salesforce-communities-hide-unsupported.js
 lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug1625224-sixt-neuwagen.de-window-netscape-shim.js
+lib/firefox/browser/features/webcompat@mozilla.org/injections/js/bug1641998-embedded-twitter-videos-etp-indexeddb.js
 lib/firefox/browser/features/webcompat@mozilla.org/lib/about_compat_broker.js
 lib/firefox/browser/features/webcompat@mozilla.org/lib/custom_functions.js
 lib/firefox/browser/features/webcompat@mozilla.org/lib/injections.js
@@ -4213,6 +4224,7 @@ lib/firefox/browser/localization/en-US/browser/customizeMode.ftl
 lib/firefox/browser/localization/en-US/browser/downloads.ftl
 lib/firefox/browser/localization/en-US/browser/editBookmarkOverlay.ftl
 lib/firefox/browser/localization/en-US/browser/menubar.ftl
+lib/firefox/browser/localization/en-US/browser/migration.ftl
 lib/firefox/browser/localization/en-US/browser/newInstallPage.ftl
 lib/firefox/browser/localization/en-US/browser/newtab/asrouter.ftl
 lib/firefox/browser/localization/en-US/browser/newtab/newtab.ftl
@@ -4253,6 +4265,7 @@ lib/firefox/browser/localization/en-US/browser/webrtcIndicator.ftl
 lib/firefox/browser/localization/en-US/devtools/client/aboutdebugging.ftl
 lib/firefox/browser/localization/en-US/devtools/client/accessibility.ftl
 lib/firefox/browser/localization/en-US/devtools/client/application.ftl
+lib/firefox/browser/localization/en-US/devtools/client/compatibility.ftl
 lib/firefox/browser/localization/en-US/devtools/client/storage.ftl
 lib/firefox/browser/localization/en-US/devtools/client/styleeditor.ftl
 lib/firefox/browser/localization/en-US/devtools/client/toolbox-options.ftl
@@ -4310,7 +4323,6 @@ lib/firefox/browser/modules/PlacesUIUtils.jsm
 lib/firefox/browser/modules/ProcessHangMonitor.jsm
 lib/firefox/browser/modules/ProfileMigrator.jsm
 lib/firefox/browser/modules/PromptCollection.jsm
-lib/firefox/browser/modules/ReaderParent.jsm
 lib/firefox/browser/modules/Sanitizer.jsm
 lib/firefox/browser/modules/ScreenshotChild.jsm
 lib/firefox/browser/modules/SearchTelemetry.jsm
@@ -4336,6 +4348,7 @@ lib/firefox/browser/modules/UrlbarMuxerUnifiedComplete.jsm
 lib/firefox/browser/modules/UrlbarPrefs.jsm
 lib/firefox/browser/modules/UrlbarProviderExtension.jsm
 lib/firefox/browser/modules/UrlbarProviderInterventions.jsm
+lib/firefox/browser/modules/UrlbarProviderOmnibox.jsm
 lib/firefox/browser/modules/UrlbarProviderOpenTabs.jsm
 lib/firefox/browser/modules/UrlbarProviderPrivateSearch.jsm
 lib/firefox/browser/modules/UrlbarProviderSearchSuggestions.jsm
@@ -4345,6 +4358,7 @@ lib/firefox/browser/modules/UrlbarProviderTopSites.jsm
 lib/firefox/browser/modules/UrlbarProviderUnifiedComplete.jsm
 lib/firefox/browser/modules/UrlbarProvidersManager.jsm
 lib/firefox/browser/modules/UrlbarResult.jsm
+lib/firefox/browser/modules/UrlbarSearchUtils.jsm
 lib/firefox/browser/modules/UrlbarTokenizer.jsm
 lib/firefox/browser/modules/UrlbarUtils.jsm
 lib/firefox/browser/modules/UrlbarValueFormatter.jsm
@@ -4533,8 +4547,6 @@ lib/firefox/chrome/marionette/content/sync.js
 lib/firefox/chrome/marionette/content/transport.js
 lib/firefox/chrome/pippki/content/pippki/certManager.js
 lib/firefox/chrome/pippki/content/pippki/certManager.xhtml
-lib/firefox/chrome/pippki/content/pippki/certViewer.js
-lib/firefox/chrome/pippki/content/pippki/certViewer.xhtml
 lib/firefox/chrome/pippki/content/pippki/changepassword.js
 lib/firefox/chrome/pippki/content/pippki/changepassword.xhtml
 lib/firefox/chrome/pippki/content/pippki/clientauthask.js
@@ -4793,7 +4805,6 @@ lib/firefox/chrome/toolkit/content/global/printProgress.xhtml
 lib/firefox/chrome/toolkit/content/global/printUtils.js
 lib/firefox/chrome/toolkit/content/global/process-content.js
 lib/firefox/chrome/toolkit/content/global/reader/aboutReader.html
-lib/firefox/chrome/toolkit/content/global/reader/aboutReader.js
 lib/firefox/chrome/toolkit/content/global/remote-test-ipc.js
 lib/firefox/chrome/toolkit/content/global/resetProfile.css
 lib/firefox/chrome/toolkit/content/global/resetProfile.js
@@ -4992,6 +5003,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/check.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/close.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/columnpicker.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/delete.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/document.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/error-16.png
 lib/firefox/chrome/toolkit/skin/classic/global/icons/error.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/find-next-arrow.svg
@@ -5108,6 +5120,7 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/unknownContentType.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/blocklist.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-available.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extension.svg
@@ -5208,7 +5221,9 @@ lib/firefox/localization/en-US/toolkit/about/abuseReports.ftl
 lib/firefox/localization/en-US/toolkit/about/certviewer.ftl
 lib/firefox/localization/en-US/toolkit/about/url-classifier.ftl
 lib/firefox/localization/en-US/toolkit/extensions/blocklist.ftl
+lib/firefox/localization/en-US/toolkit/featuregates/features.ftl
 lib/firefox/localization/en-US/toolkit/global/createProfileWizard.ftl
+lib/firefox/localization/en-US/toolkit/global/handlerDialog.ftl
 lib/firefox/localization/en-US/toolkit/global/processTypes.ftl
 lib/firefox/localization/en-US/toolkit/global/profileDowngrade.ftl
 lib/firefox/localization/en-US/toolkit/global/profileSelection.ftl
@@ -5220,13 +5235,15 @@ lib/firefox/localization/en-US/toolkit/intl/languageNames.ftl
 lib/firefox/localization/en-US/toolkit/intl/regionNames.ftl
 lib/firefox/localization/en-US/toolkit/main-window/autocomplete.ftl
 lib/firefox/localization/en-US/toolkit/main-window/findbar.ftl
+lib/firefox/localization/en-US/toolkit/payments/payments.ftl
 lib/firefox/localization/en-US/toolkit/pictureinpicture/pictureinpicture.ftl
 lib/firefox/localization/en-US/toolkit/preferences/preferences.ftl
 lib/firefox/localization/en-US/toolkit/printing/printDialogs.ftl
 lib/firefox/localization/en-US/toolkit/printing/printPreview.ftl
 lib/firefox/localization/en-US/toolkit/updates/elevation.ftl
 lib/firefox/localization/en-US/toolkit/updates/history.ftl
-lib/firefox/modules/AboutCertViewerHandler.jsm
+lib/firefox/modules/AboutCertViewerChild.jsm
+lib/firefox/modules/AboutCertViewerParent.jsm
 lib/firefox/modules/AboutPagesUtils.jsm
 lib/firefox/modules/AboutReader.jsm
 lib/firefox/modules/AbuseReporter.jsm
@@ -5270,7 +5287,6 @@ lib/firefox/modules/ContentPrefServiceChild.jsm
 lib/firefox/modules/ContentPrefServiceParent.jsm
 lib/firefox/modules/ContentPrefStore.jsm
 lib/firefox/modules/ContentPrefUtils.jsm
-lib/firefox/modules/ContentProcessSingleton.jsm
 lib/firefox/modules/ContextualIdentityService.jsm
 lib/firefox/modules/Corroborate.jsm
 lib/firefox/modules/CoveragePing.jsm
@@ -5387,7 +5403,6 @@ lib/firefox/modules/LoginAutoComplete.jsm
 lib/firefox/modules/LoginExport.jsm
 lib/firefox/modules/LoginFormFactory.jsm
 lib/firefox/modules/LoginHelper.jsm
-lib/firefox/modules/LoginImport.jsm
 lib/firefox/modules/LoginInfo.jsm
 lib/firefox/modules/LoginManager.jsm
 lib/firefox/modules/LoginManagerAuthPrompter.jsm
@@ -5437,7 +5452,6 @@ lib/firefox/modules/PlacesCategoriesStarter.jsm
 lib/firefox/modules/PlacesDBUtils.jsm
 lib/firefox/modules/PlacesExpiration.jsm
 lib/firefox/modules/PlacesRemoteTabsAutocompleteProvider.jsm
-lib/firefox/modules/PlacesSearchAutocompleteProvider.jsm
 lib/firefox/modules/PlacesSyncUtils.jsm
 lib/firefox/modules/PlacesTransactions.jsm
 lib/firefox/modules/PlacesUtils.jsm
@@ -5476,12 +5490,12 @@ lib/firefox/modules/RecordingCmdLine.jsm
 lib/firefox/modules/Region.jsm
 lib/firefox/modules/RemotePageAccessManager.jsm
 lib/firefox/modules/RemoteWebNavigation.jsm
-lib/firefox/modules/RemoteWebProgress.jsm
 lib/firefox/modules/ResetProfile.jsm
 lib/firefox/modules/ResponsivenessMonitor.jsm
 lib/firefox/modules/RustFxAccount.js
 lib/firefox/modules/SafeBrowsing.jsm
 lib/firefox/modules/Schemas.jsm
+lib/firefox/modules/SearchCache.jsm
 lib/firefox/modules/SearchEngine.jsm
 lib/firefox/modules/SearchEngineSelector.jsm
 lib/firefox/modules/SearchService.jsm
@@ -5507,6 +5521,9 @@ lib/firefox/modules/SyncedBookmarksMirror.jsm
 lib/firefox/modules/TaggingService.jsm
 lib/firefox/modules/TelemetryArchive.jsm
 lib/firefox/modules/TelemetryController.jsm
+lib/firefox/modules/TelemetryControllerBase.jsm
+lib/firefox/modules/TelemetryControllerContent.jsm
+lib/firefox/modules/TelemetryControllerParent.jsm
 lib/firefox/modules/TelemetryEnvironment.jsm
 lib/firefox/modules/TelemetryReportingPolicy.jsm
 lib/firefox/modules/TelemetryScheduler.jsm
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index d26489d9601..9629afb5f9d 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.405 2020/07/16 14:47:50 riastradh Exp $
+$NetBSD: distinfo,v 1.406 2020/07/31 01:26:43 maya Exp $
 
-SHA1 (firefox-78.0.2.source.tar.xz) = 6dd99fc08df3f479fa3a8ff7a3ab527fbeeb4f61
-RMD160 (firefox-78.0.2.source.tar.xz) = 94efd51d47add86fe41ed50ba55ff901994e1a9e
-SHA512 (firefox-78.0.2.source.tar.xz) = 4aa753fb51459301379d186f3c93e15755530e5e1ea17795d620cc9da56eb5e76cce483ca57f4af339b6f17e47101dff772ca01fb1b469201a09283f14f567be
-Size (firefox-78.0.2.source.tar.xz) = 334406116 bytes
+SHA1 (firefox-79.0.source.tar.xz) = 3cbe88ce74cf834c7f91f72977ac443995bcee83
+RMD160 (firefox-79.0.source.tar.xz) = 58ee13d37da04099bae242df8534274e11776208
+SHA512 (firefox-79.0.source.tar.xz) = 19b068446757fca1247efe4135635c48c01f445a724ffb2a34c20b8b63f9bd920e9a78849f268997434d1863ba091eab8a99a02b2073f08d2891d2678d1ff73e
+Size (firefox-79.0.source.tar.xz) = 333220776 bytes
 SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
 SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
 SHA1 (patch-config_makefiles_rust.mk) = 8637cd3f56774648fd586c7ad8dd49e269b9eb2a
-SHA1 (patch-configure.in) = b40651b008dcecc49664660ac376df2bd7c2c6be
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
@@ -28,7 +27,7 @@ SHA1 (patch-media_libcubeb_src_moz.build) = e4e64a1135cf4157ae5b6f7c1710ebd07695
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
 SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
 SHA1 (patch-media_libvorbis_lib_vorbis__info.c) = b6b1a84a095db8459bdff24c04f4d56886ddbe45
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 2eda6a0adab376cd9b41514dac4a811d7fcf599c
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 2d2ff8b4f9fe883b345d0ffc0d8e81aacf37a292
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
 SHA1 (patch-third__party_rust_authenticator_.cargo-checksum.json) = 0c230417f33fca9e27bbb30a9ac80b864cd8c1e2
@@ -41,10 +40,10 @@ SHA1 (patch-third__party_rust_authenticator_src_netbsd_transaction.rs) = 0f3d490
 SHA1 (patch-third__party_rust_authenticator_src_netbsd_uhid.rs) = e0856c37eb1d73bca431da6048132233eace44bb
 SHA1 (patch-third__party_rust_getrandom_src_lib.rs) = 2ad80d10ebfeef0dc27435fc2c16be7b5e5d444a
 SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 3755f32fea84900cc0f00af3d9f53ed5fcfb0b4b
-SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5a516d377d491e0504aaf2d7aed04bb9ebeccc56
+SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = fb285a1d716a251aa133ab50609f72cbd1032536
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
 SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
-SHA1 (patch-widget_gtk_WaylandDMABufSurface.cpp) = 3c556b9321a5045363a1d567ea271c520f585850
+SHA1 (patch-widget_gtk_DMABufSurface.cpp) = 919a3cfca2b89e54b2d58e34f462a2abe1d98df6
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 1ad196d17e9..68a1b5edeb4 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.175 2020/07/12 01:37:50 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.176 2020/07/31 01:26:43 maya Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -37,7 +37,7 @@ UNLIMIT_RESOURCES+=	datasize virtualsize
 # selection framework.
 USE_LANGUAGES+=		c99 c++
 
-TOOL_DEPENDS+=		cbindgen>=0.14.2:../../devel/cbindgen
+TOOL_DEPENDS+=		cbindgen>=0.14.3:../../devel/cbindgen
 .if ${MACHINE_ARCH} == "sparc64"
 CONFIGURE_ARGS+=	--disable-nodejs
 .else
@@ -218,10 +218,10 @@ CONFIGURE_ENV.NetBSD+=	ac_cv_needs_atomic=yes
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.25
+BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.26
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nss+=	nss>=3.53
+BUILDLINK_API_DEPENDS.nss+=	nss>=3.54
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #.include "../../mk/jpeg.buildlink3.mk"
diff --git a/www/firefox/patches/patch-configure.in b/www/firefox/patches/patch-configure.in
deleted file mode 100644
index 29f5b363909..00000000000
--- a/www/firefox/patches/patch-configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2020/06/03 09:00:24 ryoon Exp $
-
-* Accept Python 3.x from pkgsrc.
-
---- configure.in.orig	2020-05-21 22:37:47.000000000 +0000
-+++ configure.in
-@@ -22,4 +22,4 @@ SRCDIR=$(dirname $0)
- TOPSRCDIR="$SRCDIR"
- export OLD_CONFIGURE="$SRCDIR"/old-configure
- 
--exec python3 "$TOPSRCDIR/configure.py" "$@"
-+exec ${PYTHON3} "$TOPSRCDIR/configure.py" "$@"
diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
index 8b185888ab9..a32aa040ede 100644
--- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
+++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.16 2020/07/01 13:01:01 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.17 2020/07/31 01:26:43 maya Exp $
 
 * Fix buiuld under NetBSD.
   NetBSD's sys/videoio.h does not have v4l2_capability.device_caps
   and video capture does not work for me anyway.
 
---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig	2020-06-19 00:11:06.000000000 +0000
+--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig	2020-07-20 20:53:59.000000000 +0000
 +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
 @@ -207,10 +207,12 @@ uint32_t DeviceInfoLinux::NumberOfDevice
      sprintf(device, "/dev/video%d", n);
      if ((fd = open(device, O_RDONLY)) != -1) {
        // query device capabilities and make sure this is a video capture device
 +#if !defined(__NetBSD__)
-       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !(cap.device_caps & V4L2_CAP_VIDEO_CAPTURE)) {
+       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !IsVideoCaptureDevice(&cap)) {
          close(fd);
          continue;
        }
@@ -24,7 +24,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__in
      if ((fd = open(device, O_RDONLY)) != -1) {
        // query device capabilities and make sure this is a video capture device
 +#if !defined(__NetBSD__)
-       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !(cap.device_caps & V4L2_CAP_VIDEO_CAPTURE)) {
+       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !IsVideoCaptureDevice(&cap)) {
          close(fd);
          continue;
        }
@@ -37,10 +37,26 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__in
      if (ioctl(fd, VIDIOC_QUERYCAP, &cap) == 0) {
        // skip devices without video capture capability
 +#if !defined(__NetBSD__)
-       if (!(cap.device_caps & V4L2_CAP_VIDEO_CAPTURE)) {
+       if (!IsVideoCaptureDevice(&cap)) {
          continue;
        }
 +#endif
  
        if (cap.bus_info[0] != 0) {
          if (strncmp((const char*)cap.bus_info, (const char*)deviceUniqueIdUTF8,
+@@ -383,6 +389,7 @@ bool DeviceInfoLinux::IsDeviceNameMatche
+   return false;
+ }
+ 
++#ifndef __NetBSD__
+ bool DeviceInfoLinux::IsVideoCaptureDevice(struct v4l2_capability* cap)
+ {
+   if (cap->capabilities & V4L2_CAP_DEVICE_CAPS) {
+@@ -391,6 +398,7 @@ bool DeviceInfoLinux::IsVideoCaptureDevi
+     return cap->capabilities & V4L2_CAP_VIDEO_CAPTURE;
+   }
+ }
++#endif
+ 
+ int32_t DeviceInfoLinux::FillCapabilities(int fd) {
+   // set image format
diff --git a/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp b/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp
index eed20c4c9c4..09f021fd1ea 100644
--- a/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp
+++ b/www/firefox/patches/patch-toolkit_components_terminator_nsTerminator.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-toolkit_components_terminator_nsTerminator.cpp,v 1.4 2020/06/03 09:00:24 ryoon Exp $
+$NetBSD: patch-toolkit_components_terminator_nsTerminator.cpp,v 1.5 2020/07/31 01:26:43 maya Exp $
 
 * Fix segfault on exit under NetBSD
 
---- toolkit/components/terminator/nsTerminator.cpp.orig	2020-05-21 22:38:09.000000000 +0000
+--- toolkit/components/terminator/nsTerminator.cpp.orig	2020-07-20 22:49:51.000000000 +0000
 +++ toolkit/components/terminator/nsTerminator.cpp
 @@ -36,7 +36,7 @@
  #if defined(XP_WIN)
@@ -13,7 +13,7 @@ $NetBSD: patch-toolkit_components_terminator_nsTerminator.cpp,v 1.4 2020/06/03 0
  #endif
  
  #include "mozilla/ArrayUtils.h"
-@@ -180,7 +180,10 @@ void RunWatchdog(void* arg) {
+@@ -171,7 +171,10 @@ void RunWatchdog(void* arg) {
  #if defined(XP_WIN)
      Sleep(1000 /* ms */);
  #else
@@ -23,5 +23,5 @@ $NetBSD: patch-toolkit_components_terminator_nsTerminator.cpp,v 1.4 2020/06/03 0
 +    tickd.tv_nsec = 0;
 +    nanosleep(&tickd, NULL);
  #endif
+ 
      if (gHeartbeat++ < timeToLive) {
- #if !defined(MOZ_VALGRIND) || !defined(MOZ_CODE_COVERAGE)
diff --git a/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp b/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp
new file mode 100644
index 00000000000..3a0cc7a4959
--- /dev/null
+++ b/www/firefox/patches/patch-widget_gtk_DMABufSurface.cpp
@@ -0,0 +1,32 @@
+$NetBSD: patch-widget_gtk_DMABufSurface.cpp,v 1.1 2020/07/31 01:26:43 maya Exp $
+
+No eventfd on netbsd, fix build
+
+--- widget/gtk/DMABufSurface.cpp.orig	2020-07-20 20:56:52.000000000 +0000
++++ widget/gtk/DMABufSurface.cpp
+@@ -18,7 +18,9 @@
+ #include <sys/time.h>
+ #include <dlfcn.h>
+ #include <sys/mman.h>
++#ifndef __NetBSD__
+ #include <sys/eventfd.h>
++#endif
+ #include <poll.h>
+ 
+ #include "mozilla/widget/gbm.h"
+@@ -91,6 +93,7 @@ void DMABufSurface::GlobalRefAdd() {
+ }
+ 
+ void DMABufSurface::GlobalRefCountCreate() {
++#ifndef __NetBSD__
+   MOZ_ASSERT(!mGlobalRefCountFd);
+   mGlobalRefCountFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
+   if (mGlobalRefCountFd < 0) {
+@@ -98,6 +101,7 @@ void DMABufSurface::GlobalRefCountCreate
+     mGlobalRefCountFd = 0;
+     return;
+   }
++#endif
+ }
+ 
+ void DMABufSurface::GlobalRefCountImport(int aFd) {
diff --git a/www/firefox/patches/patch-widget_gtk_WaylandDMABufSurface.cpp b/www/firefox/patches/patch-widget_gtk_WaylandDMABufSurface.cpp
deleted file mode 100644
index 52e42534c8e..00000000000
--- a/www/firefox/patches/patch-widget_gtk_WaylandDMABufSurface.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-widget_gtk_WaylandDMABufSurface.cpp,v 1.1 2020/07/01 13:01:01 ryoon Exp $
-
-* Fix build under NetBSD.
-
---- widget/gtk/WaylandDMABufSurface.cpp.orig	2020-06-19 02:17:05.000000000 +0000
-+++ widget/gtk/WaylandDMABufSurface.cpp
-@@ -18,7 +18,9 @@
- #include <sys/time.h>
- #include <dlfcn.h>
- #include <sys/mman.h>
-+#if !defined(__NetBSD__)
- #include <sys/eventfd.h>
-+#endif
- #include <poll.h>
- 
- #include "mozilla/widget/gbm.h"
-@@ -91,6 +93,7 @@ void WaylandDMABufSurface::GlobalRefAdd(
- }
- 
- void WaylandDMABufSurface::GlobalRefCountCreate() {
-+#if !defined(__NetBSD__)
-   MOZ_ASSERT(!mGlobalRefCountFd);
-   mGlobalRefCountFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
-   if (mGlobalRefCountFd < 0) {
-@@ -98,6 +101,7 @@ void WaylandDMABufSurface::GlobalRefCoun
-     mGlobalRefCountFd = 0;
-     return;
-   }
-+#endif
- }
- 
- void WaylandDMABufSurface::GlobalRefCountImport(int aFd) {