diff options
| author | ryoon <ryoon@pkgsrc.org> | 2017-06-14 11:28:44 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2017-06-14 11:28:44 +0000 |
| commit | 905e1f044f0bd2487c5a9f93d39e14b4e2878b2b (patch) | |
| tree | f62a9ae178fd0448b69f3414e41be22eaa0363c6 /www/firefox | |
| parent | febffa88bfc0b7387a3ebc10a83028dc16f8bf7c (diff) | |
| download | pkgsrc-905e1f044f0bd2487c5a9f93d39e14b4e2878b2b.tar.gz | |
Update to 54.0
* If your 54.0 is unstable, please disable e10s with
browser.tabs.remote.autostart.2=false (this works at least for me)
Changelog:
New
Simplified the download button and download status panel
Added support for multiple content processes (e10s-multi)
Added Burmese (my) locale
Fixed
Various security fixes
Changed
Moved the mobile bookmarks folder to the main bookmarks menu for easier access
Security fixes:
#CVE-2017-5472: Use-after-free using destroyed node when regenerating trees
#CVE-2017-7749: Use-after-free during docshell reloading
#CVE-2017-7750: Use-after-free with track elements
#CVE-2017-7751: Use-after-free with content viewer listeners
#CVE-2017-7752: Use-after-free with IME input
#CVE-2017-7754: Out-of-bounds read in WebGL with ImageInfo object
#CVE-2017-7755: Privilege escalation through Firefox Installer with same directory DLL files
#CVE-2017-7756: Use-after-free and use-after-scope logging XHR header errors
#CVE-2017-7757: Use-after-free in IndexedDB
#CVE-2017-7778: Vulnerabilities in the Graphite 2 library
#CVE-2017-7758: Out-of-bounds read in Opus encoder
#CVE-2017-7759: Android intent URLs can cause navigation to local file system
#CVE-2017-7760: File manipulation and privilege escalation via callback parameter in Mozilla Windows Updater and Maintenance Service
#CVE-2017-7761: File deletion and privilege escalation through Mozilla Maintenance Service helper.exe application
#CVE-2017-7762: Addressbar spoofing in Reader mode
#CVE-2017-7763: Mac fonts render some unicode characters as spaces
#CVE-2017-7764: Domain spoofing with combination of Canadian Syllabics and other unicode blocks
#CVE-2017-7765: Mark of the Web bypass when saving executable files
#CVE-2017-7766: File execution and privilege escalation through updater.ini, Mozilla Windows Updater, and Mozilla Maintenance Service
#CVE-2017-7767: Privilege escalation and arbitrary file overwrites through Mozilla Windows Updater and Mozilla Maintenance Service
#CVE-2017-7768: 32 byte arbitrary file read through Mozilla Maintenance Service
#CVE-2017-7770: Addressbar spoofing with JavaScript events and fullscreen mode
#CVE-2017-5471: Memory safety bugs fixed in Firefox 54
#CVE-2017-5470: Memory safety bugs fixed in Firefox 54 and Firefox ESR 52.2
Diffstat (limited to 'www/firefox')
41 files changed, 726 insertions, 701 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 95f5c6f4dd2..72cccae2508 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.296 2017/05/22 11:39:12 ryoon Exp $ +# $NetBSD: Makefile,v 1.297 2017/06/14 11:28:44 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 53.0 -MOZ_BRANCH_MINOR= .3 +MOZ_BRANCH= 54.0 +MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} diff --git a/www/firefox/PLIST b/www/firefox/PLIST index fcd79a30c00..61947bfc72d 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.119 2017/04/27 01:49:47 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.120 2017/06/14 11:28:44 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -15,7 +15,6 @@ lib/firefox/browser/chrome/browser/content/branding/icon32.png lib/firefox/browser/chrome/browser/content/branding/icon48.png lib/firefox/browser/chrome/browser/content/branding/icon64.png lib/firefox/browser/chrome/browser/content/branding/identity-icons-brand.svg -lib/firefox/browser/chrome/browser/content/branding/silhouette-40.svg lib/firefox/browser/chrome/browser/content/browser/aboutDialog-appUpdater.js lib/firefox/browser/chrome/browser/content/browser/aboutDialog.css lib/firefox/browser/chrome/browser/content/browser/aboutDialog.js @@ -38,7 +37,6 @@ lib/firefox/browser/chrome/browser/content/browser/aboutWelcomeBack.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.css lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.js lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.xhtml -lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/images/fox.png lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/main.css lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/normalize.css lib/firefox/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.css @@ -55,8 +53,7 @@ lib/firefox/browser/chrome/browser/content/browser/abouthome/downloads.png lib/firefox/browser/chrome/browser/content/browser/abouthome/downloads@2x.png lib/firefox/browser/chrome/browser/content/browser/abouthome/history.png lib/firefox/browser/chrome/browser/content/browser/abouthome/history@2x.png -lib/firefox/browser/chrome/browser/content/browser/abouthome/mozilla.png -lib/firefox/browser/chrome/browser/content/browser/abouthome/mozilla@2x.png +lib/firefox/browser/chrome/browser/content/browser/abouthome/mozilla.svg lib/firefox/browser/chrome/browser/content/browser/abouthome/restore-large.png lib/firefox/browser/chrome/browser/content/browser/abouthome/restore-large@2x.png lib/firefox/browser/chrome/browser/content/browser/abouthome/restore.png @@ -149,18 +146,23 @@ lib/firefox/browser/chrome/browser/content/browser/ext-browserAction.js lib/firefox/browser/chrome/browser/content/browser/ext-browsingData.js lib/firefox/browser/chrome/browser/content/browser/ext-c-contextMenus.js lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools-inspectedWindow.js +lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools-panels.js lib/firefox/browser/chrome/browser/content/browser/ext-c-omnibox.js lib/firefox/browser/chrome/browser/content/browser/ext-c-tabs.js lib/firefox/browser/chrome/browser/content/browser/ext-commands.js lib/firefox/browser/chrome/browser/content/browser/ext-contextMenus.js lib/firefox/browser/chrome/browser/content/browser/ext-desktop-runtime.js +lib/firefox/browser/chrome/browser/content/browser/ext-devtools-inspectedWindow.js +lib/firefox/browser/chrome/browser/content/browser/ext-devtools-network.js +lib/firefox/browser/chrome/browser/content/browser/ext-devtools-panels.js lib/firefox/browser/chrome/browser/content/browser/ext-devtools.js lib/firefox/browser/chrome/browser/content/browser/ext-history.js lib/firefox/browser/chrome/browser/content/browser/ext-omnibox.js lib/firefox/browser/chrome/browser/content/browser/ext-pageAction.js lib/firefox/browser/chrome/browser/content/browser/ext-sessions.js +lib/firefox/browser/chrome/browser/content/browser/ext-sidebarAction.js lib/firefox/browser/chrome/browser/content/browser/ext-tabs.js -lib/firefox/browser/chrome/browser/content/browser/ext-theme.js +lib/firefox/browser/chrome/browser/content/browser/ext-url-overrides.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.css @@ -174,7 +176,6 @@ lib/firefox/browser/chrome/browser/content/browser/hiddenWindow.xul lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul lib/firefox/browser/chrome/browser/content/browser/license.html lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png -lib/firefox/browser/chrome/browser/content/browser/migration/extra-migration-strings.properties lib/firefox/browser/chrome/browser/content/browser/migration/migration.js lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul lib/firefox/browser/chrome/browser/content/browser/newtab/alternativeDefaultSites.json @@ -246,6 +247,8 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/sanitize.js lib/firefox/browser/chrome/browser/content/browser/preferences/sanitize.xul lib/firefox/browser/chrome/browser/content/browser/preferences/selectBookmark.js lib/firefox/browser/chrome/browser/content/browser/preferences/selectBookmark.xul +lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataRemoveSelected.js +lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataRemoveSelected.xul lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.css lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.js lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.xul @@ -268,12 +271,15 @@ 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/devtools.json lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_inspected_window.json +lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_network.json +lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_panels.json lib/firefox/browser/chrome/browser/content/browser/schemas/history.json lib/firefox/browser/chrome/browser/content/browser/schemas/omnibox.json lib/firefox/browser/chrome/browser/content/browser/schemas/page_action.json lib/firefox/browser/chrome/browser/content/browser/schemas/sessions.json +lib/firefox/browser/chrome/browser/content/browser/schemas/sidebar_action.json lib/firefox/browser/chrome/browser/content/browser/schemas/tabs.json -lib/firefox/browser/chrome/browser/content/browser/schemas/theme.json +lib/firefox/browser/chrome/browser/content/browser/schemas/url_overrides.json lib/firefox/browser/chrome/browser/content/browser/schemas/windows.json lib/firefox/browser/chrome/browser/content/browser/search/search.xml lib/firefox/browser/chrome/browser/content/browser/search/searchReset.js @@ -286,17 +292,6 @@ lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs-bindings.x lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.css lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.js lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.xul -lib/firefox/browser/chrome/browser/content/browser/sync/addDevice.js -lib/firefox/browser/chrome/browser/content/browser/sync/addDevice.xul -lib/firefox/browser/chrome/browser/content/browser/sync/customize.css -lib/firefox/browser/chrome/browser/content/browser/sync/customize.js -lib/firefox/browser/chrome/browser/content/browser/sync/customize.xul -lib/firefox/browser/chrome/browser/content/browser/sync/genericChange.js -lib/firefox/browser/chrome/browser/content/browser/sync/genericChange.xul -lib/firefox/browser/chrome/browser/content/browser/sync/key.xhtml -lib/firefox/browser/chrome/browser/content/browser/sync/setup.js -lib/firefox/browser/chrome/browser/content/browser/sync/setup.xul -lib/firefox/browser/chrome/browser/content/browser/sync/utils.js lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.js lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.xhtml lib/firefox/browser/chrome/browser/content/browser/tab-content.js @@ -310,6 +305,8 @@ lib/firefox/browser/chrome/browser/content/browser/utilityOverlay.js lib/firefox/browser/chrome/browser/content/browser/viewSourceOverlay.xul lib/firefox/browser/chrome/browser/content/browser/web-panels.js lib/firefox/browser/chrome/browser/content/browser/web-panels.xul +lib/firefox/browser/chrome/browser/content/browser/webext-panels.js +lib/firefox/browser/chrome/browser/content/browser/webext-panels.xul lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.js lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.xul lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png @@ -327,7 +324,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSocialError.css lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSyncTabs.css lib/firefox/browser/chrome/browser/skin/classic/browser/aboutTabCrashed.css lib/firefox/browser/chrome/browser/skin/classic/browser/aboutWelcomeBack.css -lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-badge.svg lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-anchor.svg lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-blocked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-confirm.svg @@ -339,13 +335,13 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-war 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 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 lib/firefox/browser/chrome/browser/skin/classic/browser/click-to-play-warning-stripes.png lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme.css lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/loading-inverted.png lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/loading-inverted@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/urlbar-history-dropmarker.svg lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-active-loaded.svg lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-passive-loaded.svg lib/firefox/browser/chrome/browser/skin/classic/browser/connection-secure.svg @@ -382,7 +378,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-a lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy.png lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy@2x.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devedition/urlbar-history-dropmarker.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/allDownloadsViewOverlay.css lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/contentAreaDownloadsView.css @@ -407,9 +402,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/ios.png lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/ios@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/logo.png lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/logo@2x.png -lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.png lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/gear.svg lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-icon.svg lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-star-lit.svg @@ -468,6 +461,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/f lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css +lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/siteDataSettings.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css @@ -498,7 +492,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-64.png -lib/firefox/browser/chrome/browser/skin/classic/browser/sync-128.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-32.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-bg.png @@ -506,12 +499,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/sync-desktopIcon.svg lib/firefox/browser/chrome/browser/skin/classic/browser/sync-horizontalbar.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-horizontalbar@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-mobileIcon.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/sync-notification-24.png -lib/firefox/browser/chrome/browser/skin/classic/browser/syncCommon.css lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar.png lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar@2x.png -lib/firefox/browser/chrome/browser/skin/classic/browser/syncQuota.css -lib/firefox/browser/chrome/browser/skin/classic/browser/syncSetup.css lib/firefox/browser/chrome/browser/skin/classic/browser/syncedtabs/sidebar.css lib/firefox/browser/chrome/browser/skin/classic/browser/tab-crashed.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs-inverted.png @@ -578,27 +567,6 @@ lib/firefox/browser/chrome/devtools/content/debugger/debugger-controller.js lib/firefox/browser/chrome/devtools/content/debugger/debugger-view.js lib/firefox/browser/chrome/devtools/content/debugger/debugger.css lib/firefox/browser/chrome/devtools/content/debugger/debugger.xul -lib/firefox/browser/chrome/devtools/content/debugger/new/images/angle-brackets.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/arrow.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/blackBox.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/breakpoint.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/close.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/disableBreakpoints.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/domain.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/file.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/folder.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/globe.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/pause-circle.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/pause.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/play.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/prettyPrint.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/resume.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/settings.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/stepIn.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/stepOut.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/stepOver.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/subSettings.svg -lib/firefox/browser/chrome/devtools/content/debugger/new/images/worker.svg lib/firefox/browser/chrome/devtools/content/debugger/new/index.html lib/firefox/browser/chrome/devtools/content/debugger/utils.js lib/firefox/browser/chrome/devtools/content/debugger/views/filter-view.js @@ -631,7 +599,7 @@ lib/firefox/browser/chrome/devtools/content/inspector/markup/markup.xhtml lib/firefox/browser/chrome/devtools/content/memory/initializer.js lib/firefox/browser/chrome/devtools/content/memory/memory.xhtml lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor.js -lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor.xul +lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor.xhtml lib/firefox/browser/chrome/devtools/content/performance/performance-controller.js lib/firefox/browser/chrome/devtools/content/performance/performance-view.js lib/firefox/browser/chrome/devtools/content/performance/performance.xul @@ -696,6 +664,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/compo lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/target.js lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target-list.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/multi-e10s-warning.js lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/service-worker-target.js lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/target.js @@ -752,6 +721,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/attach-thr lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/browser-menus.js lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-controller.js lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-tab.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-tabs.js lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/components/toolbox-toolbar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/devtools-browser.js lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/devtools.js @@ -769,30 +739,43 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-ho lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-hosts.js lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/actions/box-model.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/actions/index.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/box-model.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModel.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelApp.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelEditable.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelInfo.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelMain.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/BoxModelProperties.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/components/ComputedProperty.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/reducers/box-model.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/types.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/utils/editing-session.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/breadcrumbs.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/box-model.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.css lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/grids.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/highlighter-settings.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/actions/index.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/Grid.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridDisplaySettings.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridItem.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridList.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/components/GridOutline.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/grid-inspector.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/reducers/grids.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/reducers/highlighter-settings.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/types.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/utils/l10n.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-commands.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-search.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/actions/grids.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/actions/highlighter-settings.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/actions/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.css lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/App.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Grid.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/GridDisplaySettings.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/GridList.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/layout.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/reducers/grids.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/reducers/highlighter-settings.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/reducers/index.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/store.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/types.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/utils/l10n.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/element-container.js @@ -805,6 +788,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/vie lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/text-container.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/text-editor.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/panel.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/reducers.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/element-style.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/rule.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/text-property.js @@ -817,6 +801,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/nod lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-menu.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/tooltips-overlay.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/utils.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/components/headers-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers.js @@ -901,35 +886,26 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/s lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/sort.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/timing-markers.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/ui.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/clear-button.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/filter-buttons.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/monitor-panel.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/network-monitor.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-content.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-empty.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-header.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-item.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-tooltip.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/search-box.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/summary-button.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/toggle-button.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/statistics-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/toolbar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/constants.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/custom-request-view.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/details-view.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/events.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/filter-predicates.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 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-exporter.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/toolbox-overlay.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/l10n.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/middleware/batching.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/middleware/prefs.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/netmonitor-controller.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/netmonitor-view.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/panel.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/prefs.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/batching.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/filters.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/index.js @@ -938,27 +914,33 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/timing-markers.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/ui.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/request-list-context-menu.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/request-utils.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/requests-menu-view.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/request-list-tooltip.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/filters.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/requests.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/ui.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/cookies-panel.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/custom-request-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/editor.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/headers-panel.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/mdn-link.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/network-details-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/params-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/preview-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/properties-view.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/response-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/security-panel.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/tabbox-panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/timings-panel.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/sidebar-view.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/sort-predicates.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/statistics-view.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/store.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/toolbar-view.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/client.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/filter-predicates.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/format-utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/l10n.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/mdn-utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/prefs.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/request-utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/sort-predicates.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/waterfall-background.js lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations-item.js lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations.js @@ -1044,6 +1026,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/brow lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/tunnel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/web-navigation.js 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-adder.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/dpr-selector.js @@ -1055,7 +1038,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/comp 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/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 @@ -1094,42 +1076,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/fr lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/h-split-box.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/notification-box.css lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/notification-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/comment-node.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/constants.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/element-node.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/error.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-map.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/infinity.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/load-reps.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/long-string.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/nan.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-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/promise.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/prop-rep.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/reps.js -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/symbol.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/window.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/search-box.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/sidebar-toggle.css lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/sidebar-toggle.js @@ -1158,6 +1106,7 @@ 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/enum.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-saver.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/getjson.js @@ -1187,6 +1136,7 @@ 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/jsol.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/jszip.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-addons-shallow-compare.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js @@ -1432,6 +1382,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension-inspected-window.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webgl.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/window.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/worker-list.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/worker.js lib/firefox/browser/chrome/devtools/modules/devtools/server/child.js @@ -1511,6 +1462,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/timeline.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/webaudio.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/webextension-inspected-window.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/webgl.js +lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/command-state.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/addon.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/appcache.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/calllog.js @@ -1975,6 +1927,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/bing.xml lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ddg.xml lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google-nocodes.xml lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google.xml +lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/wikipedia.ico lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-en.ico lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/list.json lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/twitter.xml @@ -1986,12 +1939,6 @@ lib/firefox/browser/chrome/en-US/locale/browser/setDesktopBackground.dtd lib/firefox/browser/chrome/en-US/locale/browser/shellservice.properties lib/firefox/browser/chrome/en-US/locale/browser/sitePermissions.properties lib/firefox/browser/chrome/en-US/locale/browser/syncBrand.dtd -lib/firefox/browser/chrome/en-US/locale/browser/syncCustomize.dtd -lib/firefox/browser/chrome/en-US/locale/browser/syncGenericChange.properties -lib/firefox/browser/chrome/en-US/locale/browser/syncKey.dtd -lib/firefox/browser/chrome/en-US/locale/browser/syncQuota.dtd -lib/firefox/browser/chrome/en-US/locale/browser/syncQuota.properties -lib/firefox/browser/chrome/en-US/locale/browser/syncSetup.dtd lib/firefox/browser/chrome/en-US/locale/browser/syncSetup.properties lib/firefox/browser/chrome/en-US/locale/browser/tabbrowser.properties lib/firefox/browser/chrome/en-US/locale/browser/taskbar.properties @@ -2072,7 +2019,6 @@ lib/firefox/browser/chrome/pdfjs/content/PdfjsChromeUtils.jsm lib/firefox/browser/chrome/pdfjs/content/PdfjsContentUtils.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/network.js lib/firefox/browser/chrome/pdfjs/content/pdfjschildbootstrap.js lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-H.bcmap lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-V.bcmap @@ -2395,7 +2341,12 @@ lib/firefox/browser/components/nsSessionStartup.js lib/firefox/browser/components/nsSessionStore.js lib/firefox/browser/components/nsSetDefaultBrowser.js lib/firefox/browser/components/webideCli.js +lib/firefox/browser/defaults/blocklists/addons.json +lib/firefox/browser/defaults/blocklists/certificates.json +lib/firefox/browser/defaults/blocklists/gfx.json +lib/firefox/browser/defaults/blocklists/plugins.json lib/firefox/browser/defaults/permissions +lib/firefox/browser/defaults/preferences/debugger.js lib/firefox/browser/defaults/preferences/devtools.js lib/firefox/browser/defaults/preferences/firefox-branding.js lib/firefox/browser/defaults/preferences/firefox-l10n.js @@ -2493,7 +2444,134 @@ lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/menuPanel lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/pocket.css lib/firefox/browser/features/firefox@getpocket.com/en-US/locale/en-US/pocket.properties lib/firefox/browser/features/firefox@getpocket.com/install.rdf +lib/firefox/browser/features/screenshots@mozilla.org/bootstrap.js +lib/firefox/browser/features/screenshots@mozilla.org/install.rdf +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ach/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/az/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/be/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/bg/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/bn_BD/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/cs/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/cy/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/de/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/dsb/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/el/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/en_GB/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/en_US/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/es_AR/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/es_CL/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/es_ES/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/es_MX/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/et/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/fa/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/fi/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/fr/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/fy_NL/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/gu_IN/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/he/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/hi_IN/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/hsb/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/hu/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/hy_AM/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/id/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/it/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ja/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/kab/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/kk/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/km/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ko/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/lij/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/lo/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/lt/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ms/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/my/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/nb_NO/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/nl/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/nn_NO/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/pa_IN/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/pl/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/pt_BR/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/pt_PT/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/rm/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ro/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ru/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/sk/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/sl/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/sq/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/sr/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/sv_SE/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/te/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/th/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/tl/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/tr/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/uk/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ur/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/uz/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/zh_CN/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/zh_TW/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/assertIsTrusted.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/analytics.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/auth.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/communication.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/deviceInfo.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/main.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/selectorLoader.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/senderror.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/background/takeshot.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/blank.html +lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/buildSettings.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/inlineSelectionCss.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/onboardingCss.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/onboardingHtml.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/raven.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/shot.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/buildSettings.js.template +lib/firefox/browser/features/screenshots@mozilla.org/webextension/catcher.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/clipboard.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/domainFromUrl.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/back-highlight.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/back.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/cancel.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/copy.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/done.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/download.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-128.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-16.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-16.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-19.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-256.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-32.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-32.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-38.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-48.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-64.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-highlight-32.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-starred-32.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-welcome-face-without-eyes.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/menu-fullpage.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/menu-myshot.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/menu-visible.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/onboarding-1.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/onboarding-2.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/onboarding-3.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/onboarding-4.png +lib/firefox/browser/features/screenshots@mozilla.org/webextension/log.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/makeUuid.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/manifest.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/onboarding/slides.html +lib/firefox/browser/features/screenshots@mozilla.org/webextension/onboarding/slides.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/randomString.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/callBackground.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/documentMetadata.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/shooter.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/ui.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/uicontrol.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/util.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/sitehelper.js lib/firefox/browser/features/webcompat@mozilla.org/bootstrap.js +lib/firefox/browser/features/webcompat@mozilla.org/chrome.manifest +lib/firefox/browser/features/webcompat@mozilla.org/chrome/content/data/ua_overrides.jsm +lib/firefox/browser/features/webcompat@mozilla.org/chrome/content/lib/ua_overrider.jsm lib/firefox/browser/features/webcompat@mozilla.org/install.rdf lib/firefox/browser/icons/mozicon128.png lib/firefox/browser/modules/AboutHome.jsm @@ -2518,10 +2596,12 @@ lib/firefox/browser/modules/DownloadsTaskbar.jsm lib/firefox/browser/modules/DownloadsViewUI.jsm lib/firefox/browser/modules/DragPositionManager.jsm lib/firefox/browser/modules/E10SUtils.jsm +lib/firefox/browser/modules/ExtensionPopups.jsm lib/firefox/browser/modules/ExtensionsUI.jsm lib/firefox/browser/modules/Feeds.jsm lib/firefox/browser/modules/FormSubmitObserver.jsm lib/firefox/browser/modules/FormValidationHandler.jsm +lib/firefox/browser/modules/FullZoomUI.jsm lib/firefox/browser/modules/HiddenFrame.jsm lib/firefox/browser/modules/LaterRun.jsm lib/firefox/browser/modules/MigrationUtils.jsm @@ -2552,7 +2632,6 @@ lib/firefox/browser/modules/Social.jsm lib/firefox/browser/modules/SocialService.jsm lib/firefox/browser/modules/TransientPrefs.jsm lib/firefox/browser/modules/UITour.jsm -lib/firefox/browser/modules/URLBarZoom.jsm lib/firefox/browser/modules/devtools/gDevTools.jsm lib/firefox/browser/modules/distribution.js lib/firefox/browser/modules/experiments/Experiments.jsm @@ -2563,7 +2642,6 @@ lib/firefox/browser/modules/sessionstore/FrameTree.jsm lib/firefox/browser/modules/sessionstore/GlobalState.jsm lib/firefox/browser/modules/sessionstore/PageStyle.jsm lib/firefox/browser/modules/sessionstore/PrivacyFilter.jsm -lib/firefox/browser/modules/sessionstore/PrivacyLevel.jsm lib/firefox/browser/modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm lib/firefox/browser/modules/sessionstore/RunState.jsm lib/firefox/browser/modules/sessionstore/SessionCookies.jsm @@ -2643,7 +2721,6 @@ lib/firefox/chrome/en-US/locale/en-US/global/crashes.properties lib/firefox/chrome/en-US/locale/en-US/global/css.properties lib/firefox/chrome/en-US/locale/en-US/global/customizeToolbar.dtd lib/firefox/chrome/en-US/locale/en-US/global/customizeToolbar.properties -lib/firefox/chrome/en-US/locale/en-US/global/dateFormat.properties lib/firefox/chrome/en-US/locale/en-US/global/datetimepicker.dtd lib/firefox/chrome/en-US/locale/en-US/global/dialog.properties lib/firefox/chrome/en-US/locale/en-US/global/dialogOverlay.dtd @@ -2754,7 +2831,6 @@ lib/firefox/chrome/marionette/content/browser.js lib/firefox/chrome/marionette/content/capture.js lib/firefox/chrome/marionette/content/cert.js lib/firefox/chrome/marionette/content/cookies.js -lib/firefox/chrome/marionette/content/dispatcher.js lib/firefox/chrome/marionette/content/driver.js lib/firefox/chrome/marionette/content/element.js lib/firefox/chrome/marionette/content/error.js @@ -2826,12 +2902,16 @@ lib/firefox/chrome/toolkit/content/extensions/ext-contextualIdentities.js lib/firefox/chrome/toolkit/content/extensions/ext-cookies.js lib/firefox/chrome/toolkit/content/extensions/ext-downloads.js lib/firefox/chrome/toolkit/content/extensions/ext-extension.js +lib/firefox/chrome/toolkit/content/extensions/ext-geolocation.js lib/firefox/chrome/toolkit/content/extensions/ext-i18n.js lib/firefox/chrome/toolkit/content/extensions/ext-idle.js lib/firefox/chrome/toolkit/content/extensions/ext-management.js lib/firefox/chrome/toolkit/content/extensions/ext-notifications.js +lib/firefox/chrome/toolkit/content/extensions/ext-privacy.js +lib/firefox/chrome/toolkit/content/extensions/ext-protocolHandlers.js lib/firefox/chrome/toolkit/content/extensions/ext-runtime.js lib/firefox/chrome/toolkit/content/extensions/ext-storage.js +lib/firefox/chrome/toolkit/content/extensions/ext-theme.js lib/firefox/chrome/toolkit/content/extensions/ext-topSites.js lib/firefox/chrome/toolkit/content/extensions/ext-webNavigation.js lib/firefox/chrome/toolkit/content/extensions/ext-webRequest.js @@ -2842,6 +2922,7 @@ lib/firefox/chrome/toolkit/content/extensions/schemas/downloads.json lib/firefox/chrome/toolkit/content/extensions/schemas/events.json lib/firefox/chrome/toolkit/content/extensions/schemas/experiments.json lib/firefox/chrome/toolkit/content/extensions/schemas/extension.json +lib/firefox/chrome/toolkit/content/extensions/schemas/extension_protocol_handlers.json lib/firefox/chrome/toolkit/content/extensions/schemas/extension_types.json lib/firefox/chrome/toolkit/content/extensions/schemas/i18n.json lib/firefox/chrome/toolkit/content/extensions/schemas/identity.json @@ -2850,16 +2931,15 @@ lib/firefox/chrome/toolkit/content/extensions/schemas/management.json lib/firefox/chrome/toolkit/content/extensions/schemas/manifest.json lib/firefox/chrome/toolkit/content/extensions/schemas/native_host_manifest.json lib/firefox/chrome/toolkit/content/extensions/schemas/notifications.json +lib/firefox/chrome/toolkit/content/extensions/schemas/privacy.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 +lib/firefox/chrome/toolkit/content/extensions/schemas/theme.json lib/firefox/chrome/toolkit/content/extensions/schemas/top_sites.json +lib/firefox/chrome/toolkit/content/extensions/schemas/types.json lib/firefox/chrome/toolkit/content/extensions/schemas/web_navigation.json lib/firefox/chrome/toolkit/content/extensions/schemas/web_request.json -lib/firefox/chrome/toolkit/content/gfxsanity/gfxFrameScript.js -lib/firefox/chrome/toolkit/content/gfxsanity/sanityparent.html -lib/firefox/chrome/toolkit/content/gfxsanity/sanitytest.html -lib/firefox/chrome/toolkit/content/gfxsanity/videotest.mp4 lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js lib/firefox/chrome/toolkit/content/global/BrowserElementCopyPaste.js @@ -2904,6 +2984,7 @@ lib/firefox/chrome/toolkit/content/global/alerts/alert.xul lib/firefox/chrome/toolkit/content/global/appPicker.js lib/firefox/chrome/toolkit/content/global/appPicker.xul lib/firefox/chrome/toolkit/content/global/autocomplete.css +lib/firefox/chrome/toolkit/content/global/backgroundPageThumbs.xhtml lib/firefox/chrome/toolkit/content/global/backgroundPageThumbsContent.js lib/firefox/chrome/toolkit/content/global/bindings/autocomplete.xml lib/firefox/chrome/toolkit/content/global/bindings/browser.xml @@ -3018,6 +3099,7 @@ lib/firefox/chrome/toolkit/content/global/test-ipc.xul lib/firefox/chrome/toolkit/content/global/textbox.css lib/firefox/chrome/toolkit/content/global/timepicker.xhtml lib/firefox/chrome/toolkit/content/global/treeUtils.js +lib/firefox/chrome/toolkit/content/global/unifiedcomplete-top-urls.json lib/firefox/chrome/toolkit/content/global/viewPartialSource.js lib/firefox/chrome/toolkit/content/global/viewPartialSource.xul lib/firefox/chrome/toolkit/content/global/viewSource-content.js @@ -3379,7 +3461,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/update/updates.css lib/firefox/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css lib/firefox/components/BrowserElementParent.js -lib/firefox/components/CSSUnprefixingService.js lib/firefox/components/ColorAnalyzer.js lib/firefox/components/ConsoleAPIStorage.js lib/firefox/components/ContentProcessSingleton.js @@ -3400,6 +3481,7 @@ lib/firefox/components/PresentationControlService.js lib/firefox/components/PresentationDataChannelSessionTransport.js lib/firefox/components/PresentationDeviceInfoManager.js lib/firefox/components/PrivateBrowsingTrackingProtectionWhitelist.js +lib/firefox/components/ProcessSelector.js lib/firefox/components/Push.js lib/firefox/components/PushComponents.js lib/firefox/components/RemoteWebNavigation.js @@ -3426,6 +3508,7 @@ lib/firefox/components/htmlMenuBuilder.js lib/firefox/components/interfaces.xpt lib/firefox/components/marionette.js lib/firefox/components/messageWakeupService.js +lib/firefox/components/mozIntl.js lib/firefox/components/mozProtocolHandler.js lib/firefox/components/multiprocessShims.js lib/firefox/components/nsAsyncShutdown.js @@ -3438,7 +3521,6 @@ lib/firefox/components/nsDNSServiceDiscovery.js lib/firefox/components/nsDefaultCLH.js lib/firefox/components/nsFilePicker.js lib/firefox/components/nsFormAutoComplete.js -lib/firefox/components/nsFormHistory.js lib/firefox/components/nsHandlerService.js lib/firefox/components/nsHelperAppDlg.js lib/firefox/components/nsINIProcessor.js @@ -3466,6 +3548,7 @@ lib/firefox/components/storage-json.js lib/firefox/components/txEXSLTRegExFunctions.js lib/firefox/defaults/autoconfig/prefcalls.js lib/firefox/defaults/pref/channel-prefs.js +lib/firefox/defaults/pref/marionette.js lib/firefox/defaults/pref/services-sync.js lib/firefox/dependentlibs.list lib/firefox/dictionaries/en-US.aff @@ -3591,9 +3674,12 @@ lib/firefox/modules/ExtensionCommon.jsm lib/firefox/modules/ExtensionContent.jsm lib/firefox/modules/ExtensionManagement.jsm lib/firefox/modules/ExtensionParent.jsm +lib/firefox/modules/ExtensionPreferencesManager.jsm lib/firefox/modules/ExtensionSearchHandler.jsm +lib/firefox/modules/ExtensionSettingsStore.jsm lib/firefox/modules/ExtensionStorage.jsm lib/firefox/modules/ExtensionStorageSync.jsm +lib/firefox/modules/ExtensionTabs.jsm lib/firefox/modules/ExtensionUtils.jsm lib/firefox/modules/FileUtils.jsm lib/firefox/modules/Finder.jsm @@ -3721,7 +3807,6 @@ lib/firefox/modules/ShimWaiver.jsm lib/firefox/modules/ShortcutUtils.jsm lib/firefox/modules/SimpleServiceDiscovery.jsm lib/firefox/modules/Sntp.jsm -lib/firefox/modules/SpatialNavigation.jsm lib/firefox/modules/Sqlite.jsm lib/firefox/modules/Subprocess.jsm lib/firefox/modules/Task.jsm @@ -3729,6 +3814,7 @@ lib/firefox/modules/TelemetryArchive.jsm lib/firefox/modules/TelemetryController.jsm lib/firefox/modules/TelemetryEnvironment.jsm lib/firefox/modules/TelemetryLog.jsm +lib/firefox/modules/TelemetryModules.jsm lib/firefox/modules/TelemetryReportingPolicy.jsm lib/firefox/modules/TelemetrySend.jsm lib/firefox/modules/TelemetrySession.jsm @@ -4042,16 +4128,6 @@ lib/firefox/modules/devtools/dbg-client.jsm lib/firefox/modules/devtools/dbg-server.jsm lib/firefox/modules/devtools/event-emitter.js lib/firefox/modules/devtools/shared/Loader.jsm -lib/firefox/modules/identity/FirefoxAccounts.jsm -lib/firefox/modules/identity/Identity.jsm -lib/firefox/modules/identity/IdentityProvider.jsm -lib/firefox/modules/identity/IdentityStore.jsm -lib/firefox/modules/identity/IdentityUtils.jsm -lib/firefox/modules/identity/LogUtils.jsm -lib/firefox/modules/identity/MinimalIdentity.jsm -lib/firefox/modules/identity/RelyingParty.jsm -lib/firefox/modules/identity/Sandbox.jsm -lib/firefox/modules/identity/jwcrypto.jsm lib/firefox/modules/jsdebugger.jsm lib/firefox/modules/lz4.js lib/firefox/modules/lz4_internal.js @@ -4102,15 +4178,18 @@ lib/firefox/modules/services-common/stringbundle.js lib/firefox/modules/services-common/tokenserverclient.js lib/firefox/modules/services-common/utils.js lib/firefox/modules/services-crypto/WeaveCrypto.js +lib/firefox/modules/services-crypto/jwcrypto.jsm lib/firefox/modules/services-crypto/utils.js -lib/firefox/modules/services-sync/FxaMigrator.jsm lib/firefox/modules/services-sync/SyncedTabs.jsm lib/firefox/modules/services-sync/addonsreconciler.js lib/firefox/modules/services-sync/addonutils.js +lib/firefox/modules/services-sync/bookmark_repair.js lib/firefox/modules/services-sync/bookmark_validator.js lib/firefox/modules/services-sync/browserid_identity.js +lib/firefox/modules/services-sync/collection_repair.js lib/firefox/modules/services-sync/collection_validator.js lib/firefox/modules/services-sync/constants.js +lib/firefox/modules/services-sync/doctor.js lib/firefox/modules/services-sync/engines.js lib/firefox/modules/services-sync/engines/addons.js lib/firefox/modules/services-sync/engines/bookmarks.js @@ -4121,8 +4200,6 @@ lib/firefox/modules/services-sync/engines/history.js lib/firefox/modules/services-sync/engines/passwords.js lib/firefox/modules/services-sync/engines/prefs.js lib/firefox/modules/services-sync/engines/tabs.js -lib/firefox/modules/services-sync/identity.js -lib/firefox/modules/services-sync/jpakeclient.js lib/firefox/modules/services-sync/keys.js lib/firefox/modules/services-sync/main.js lib/firefox/modules/services-sync/policies.js @@ -4130,15 +4207,13 @@ lib/firefox/modules/services-sync/record.js lib/firefox/modules/services-sync/resource.js lib/firefox/modules/services-sync/rest.js lib/firefox/modules/services-sync/service.js -lib/firefox/modules/services-sync/stages/cluster.js lib/firefox/modules/services-sync/stages/declined.js lib/firefox/modules/services-sync/stages/enginesync.js lib/firefox/modules/services-sync/status.js lib/firefox/modules/services-sync/telemetry.js -lib/firefox/modules/services-sync/userapi.js lib/firefox/modules/services-sync/util.js +lib/firefox/modules/sessionstore/PrivacyLevel.jsm lib/firefox/modules/sessionstore/Utils.jsm -lib/firefox/modules/sqlite/sqlite_internal.js lib/firefox/modules/subprocess/subprocess_common.jsm lib/firefox/modules/subprocess/subprocess_shared.js lib/firefox/modules/subprocess/subprocess_shared_unix.js @@ -4149,6 +4224,7 @@ 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 +lib/firefox/pingsender lib/firefox/platform.ini lib/firefox/plugin-container lib/firefox/removed-files diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 78af437f12e..1ae0a8c0d08 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,49 +1,44 @@ -$NetBSD: distinfo,v 1.281 2017/05/22 11:39:12 ryoon Exp $ +$NetBSD: distinfo,v 1.282 2017/06/14 11:28:44 ryoon Exp $ -SHA1 (firefox-53.0.3.source.tar.xz) = c185c345207597480ad169d10e9a770cf241f2da -RMD160 (firefox-53.0.3.source.tar.xz) = e62d22fec71f1488432611045d47134e0906410a -SHA512 (firefox-53.0.3.source.tar.xz) = cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118 -Size (firefox-53.0.3.source.tar.xz) = 215253212 bytes -SHA1 (patch-aa) = 60b2a879dac3f122828042b37aab597b07643a87 -SHA1 (patch-as) = 632ebd35287f8f97d18721d39a0514d4cdbb12cc -SHA1 (patch-browser_app_nsBrowserApp.cpp) = c89a51efa326824122e6a8ca7af8ff2d6fabc7a8 -SHA1 (patch-build_gyp.mozbuild) = b915b1a9ce38e5c567a0316ecbc507d91e85ef95 -SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e -SHA1 (patch-build_moz.configure_keyfiles.configure) = dd46c7c29464f374eed3f0762f4653d42032c261 +SHA1 (firefox-54.0.source.tar.xz) = 44e40c77f58e3b203dc60f51c5a02993f6c38ee5 +RMD160 (firefox-54.0.source.tar.xz) = 310f21498bc69939049d3ca881674a40fba8da21 +SHA512 (firefox-54.0.source.tar.xz) = 0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9 +Size (firefox-54.0.source.tar.xz) = 229178564 bytes +SHA1 (patch-aa) = 3ba9735f6b2da91f9699e54e9390ec90d3cc5577 +SHA1 (patch-browser_app_nsBrowserApp.cpp) = 915f03770ac4a73d7554f213ce3c7f76d7a34cf0 +SHA1 (patch-browser_confvars.sh) = d4f70fd4672416ce5c98181b974f8d8df9a6069f SHA1 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6 SHA1 (patch-build_moz.configure_old.configure) = 2f452e717f0c9dc8224019b58e531e5e95cc7697 -SHA1 (patch-build_pgo_profileserver.py) = 48ad50f716eda2157cbc225298f6672f164b4207 +SHA1 (patch-build_moz.configure_rust.configure) = de808375f731e9caa5ca8e572054a39acb715a85 SHA1 (patch-config_Makefile.in) = 2ad29cef869171aa29b6c3e4ba4a5c99311e0742 SHA1 (patch-config_baseconfig.mk) = fbc3fd75bf5d794284e5703a9df227949e819136 SHA1 (patch-config_external_moz.build) = 68708dc0fb94119b9f140d05dd737e69bb6bba81 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b -SHA1 (patch-config_system-headers) = 0b75cf68b0d2682e3453df02ce759b0cc7f48bf4 +SHA1 (patch-config_system-headers) = eaa6e692e2cfbbbf2fa1f365fb561e6faa08a57f SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c SHA1 (patch-dom_media_AudioStream.cpp) = 3d2e3d92849a355c05d7ec0ded61d551ffe0c581 SHA1 (patch-dom_media_AudioStream.h) = 26f70000cc4810834204d15b45e1469dd5f23617 SHA1 (patch-dom_media_CubebUtils.cpp) = 3632cd0dd4b95f53f01050b8898b33fe198916b6 +SHA1 (patch-dom_media_MediaPrefs.h) = b5815efdfbf79a7ff92197bbd906f702565ea46f SHA1 (patch-dom_media_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c -SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = 34c89f93b6a849b9daeeed43d4a9a91a2a2080c4 -SHA1 (patch-dom_media_webrtc_MediaEngine.h) = b5f1e65d15e8ce63b29a37db7ea35941014e09d9 +SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = f2965930c50961b42576a983e93a08d67da50a2a SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 308548409c2117209ed277a6d2b0a37c2efa5ec7 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 15c01df2fa7f989b533ef769ce77438b5e9bfdb9 -SHA1 (patch-dom_system_OSFileConstants.cpp) = e932ca46cbc78eb8486b9ff704434a962645c6b2 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 30abff0aaabff07e13939a1571cefc5216760109 SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426 SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = 09eb2fa66109d38a3aedc940fcaaee5f91e216ae -SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 9b357196b795f7698f0763cb6cfcd39b4aea6420 SHA1 (patch-gfx_moz.build) = 0d669ac6dc1af17ea8ed7e84e4915947c2a6b1ca SHA1 (patch-gfx_skia_generate__mozbuild.py) = fba2f212f84e6cc20a4269e21ed654c348ae8fee SHA1 (patch-gfx_skia_moz.build) = 7363e76ac75e27cffe5ee1194741d444a625b871 -SHA1 (patch-gfx_thebes_moz.build) = 0435f36d573fee1bb300612e4b7dc6fcda2d5456 +SHA1 (patch-gfx_thebes_moz.build) = 685c25bf0e4f70f121c032b413ade8904f029afc SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf -SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 79587891c2a1716a27d4dca0e5b5880069a430eb +SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 8ae94d3c10fc8472e0d6287a841f1366d4342770 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655 -SHA1 (patch-intl_unicharutil_util_moz.build) = 2e604c8695b490657ee14cae01ca84d7bd51236c +SHA1 (patch-intl_unicharutil_util_moz.build) = fffed7139faa3f15d6ab3be9b673cb0b14a30ce9 SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 99b9f3f9dd88f1c8008d2fb6058450695394f5cf SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = c81930280bd76a00fbad37aad02fb8451d80b1ee @@ -62,38 +57,37 @@ SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e SHA1 (patch-media_libcubeb_gtest_moz.build) = ebb4be6e6bca4a0ed6858516ec9fdb7828bbe2e1 SHA1 (patch-media_libcubeb_src_cubeb.c) = c689537aa7c3c40758d4b74e471e4dad1adeef5d -SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 7ddbcb17edb7671bdf6648ef87e9c898314a1fea +SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = bbd8796faaee52d9721bc406fb0a413b66ad9bc9 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 88cdfb9b9aa8c2607ca79bfa7fce4353e65638f7 SHA1 (patch-media_libcubeb_src_moz.build) = 59a2f95300b26c8047532c80445b958e7b8e738c SHA1 (patch-media_libcubeb_update.sh) = 7bd5145466c2af086a501be4e77432c0857236ce SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696 SHA1 (patch-media_libsoundtouch_src_soundtouch__perms.h) = 2d08a3b4176c155c57b458cb78043318b68d8fe2 +SHA1 (patch-media_libstagefright_binding_DecoderData.cpp) = 513bd02034156fa51fff08bf42e50a8e1b566031 +SHA1 (patch-media_libstagefright_binding_MP4Metadata.cpp) = dfe536b847dd665235b3debeae6fa4d7e3c69366 +SHA1 (patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h) = eb7d82470943ad8eecd1c955a578c23aa2c390e1 +SHA1 (patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h) = 2f02aa4049d0575b60492ef76fa48633185698f1 SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 3ef05c05799d56b3c160634327d90dd33764c3df SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81 SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf0 -SHA1 (patch-media_libyuv_source_mjpeg__decoder.cc) = d3b301dcec965b8f3efdd202db07fd75b503bc20 +SHA1 (patch-media_libyuv_libyuv_source_mjpeg__decoder.cc) = 8a264c439fa4749cd7c5acf96e1ae3f9bae0a886 SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7 -SHA1 (patch-media_webrtc_signaling_test_common.build) = c0d5003858e0c9e93247e3132274c2a4db3ad22e -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = f750f9e7ed6bb131e9c73b779067e8b81b159933 -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 2d2e97841bdf4943f5ca9cc7e348c5bcff4fbd1e -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 407d0c7315c71f501cbdcc2febc03ff1b8ce7caa +SHA1 (patch-media_webrtc_signaling_test_common.build) = 8becbb00cbe9e10b95d53f30c6d16b6f7afc38e8 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9e94002b01664a42af415639dc94caa127a73ac0 SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503 +SHA1 (patch-mobile_android_confvars.sh) = c8889907009c8a9a14df93a8193df96e2d12e1ca SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 133b1658839d9b0f932a601670862c1f4cd70881 SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249 SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0 -SHA1 (patch-python_futures_concurrent_futures_process.py) = 141d158d4699a10aca7e54138da324917df53eeb -SHA1 (patch-rc) = 9628b038f036f3fc0e37bdf84fa0abf99dbc8d2a -SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 27e90fdfd5587f670958d832cd56107740b226ee -SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = 4e5dc7cf11ea3d48cca86b5d21158d676ebd8957 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 5ffb0782bbbff2fd17ad71e98b349b4ec3dc6c8c +SHA1 (patch-toolkit_components_telemetry_Histograms.json) = 25af1d3da8f474942ac1766bfb2c9bba1b2c6492 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce -SHA1 (patch-toolkit_library_moz.build) = 1abf1fb95d54ee7dea09d3f3ea6c27612b80d106 -SHA1 (patch-toolkit_moz.configure) = 188d9b9ce6dd728f90f64d215db472758ad67a87 +SHA1 (patch-toolkit_library_moz.build) = 7691379b70c317a4be4ee066489739417f61872e +SHA1 (patch-toolkit_moz.configure) = 2ca61cfd7e338dbc142acd30f43894d05ce92071 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b -SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4db0dfc98ffeb09f524a471e6a727f2c3b045afe +SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4a6ae13adfdfc63d50c1a53ee71aad1ee82e6131 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4 SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54 SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 950874fbc255c93a828bddd84ffe8478094214cc diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index a4e9c2931f9..0f4b110025b 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,13 +1,12 @@ -$NetBSD: patch-aa,v 1.51 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-aa,v 1.52 2017/06/14 11:28:44 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 2017-04-23 15:21:06.933492440 +0000 +--- old-configure.in.orig 2017-06-05 20:45:16.000000000 +0000 +++ old-configure.in -@@ -2084,11 +2084,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then +@@ -2049,11 +2049,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -20,17 +19,7 @@ $NetBSD: patch-aa,v 1.51 2017/04/27 01:49:47 ryoon Exp $ MOZ_SYSTEM_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -2818,6 +2814,9 @@ if test -n "$MOZ_WEBRTC"; then - AC_DEFINE(MOZ_WEBRTC_ASSERT_ALWAYS) - MOZ_RAW=1 - -+ dnl with libv4l2 we can support more cameras -+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) -+ - dnl enable once Signaling lands - MOZ_WEBRTC_SIGNALING=1 - AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -2860,7 +2859,7 @@ dnl Use integers over floats for audio o +@@ -2825,7 +2821,7 @@ dnl Use integers over floats for audio o dnl (regarless of the CPU architecture, because audio dnl backends for those platforms don't support floats. We also dnl use integers on ARM with other OS, because it's more efficient. @@ -39,7 +28,7 @@ $NetBSD: patch-aa,v 1.51 2017/04/27 01:49:47 ryoon Exp $ MOZ_SAMPLE_TYPE_S16=1 AC_DEFINE(MOZ_SAMPLE_TYPE_S16) AC_SUBST(MOZ_SAMPLE_TYPE_S16) -@@ -2968,6 +2967,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then +@@ -2933,6 +2929,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then fi fi @@ -151,7 +140,7 @@ $NetBSD: patch-aa,v 1.51 2017/04/27 01:49:47 ryoon Exp $ dnl system libvpx Support dnl ======================================================== MOZ_ARG_WITH_BOOL(system-libvpx, -@@ -3128,6 +3232,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER) +@@ -3093,6 +3194,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER) AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -219,7 +208,7 @@ $NetBSD: patch-aa,v 1.51 2017/04/27 01:49:47 ryoon Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -4860,6 +5025,27 @@ dnl ==================================== +@@ -4818,6 +4980,27 @@ dnl ==================================== AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) dnl ======================================================== @@ -235,7 +224,7 @@ $NetBSD: patch-aa,v 1.51 2017/04/27 01:49:47 ryoon Exp $ + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,8) ++ #if !GR2_VERSION_REQUIRE(1,3,10) + #error "Insufficient graphite2 version." + #endif + ], [], diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as deleted file mode 100644 index abfba50ac4c..00000000000 --- a/www/firefox/patches/patch-as +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-as,v 1.22 2017/02/16 02:25:17 maya Exp $ - -* Treat DragonFly like FreeBSD. -* Add system ICU support - ---- js/src/old-configure.in.orig 2017-01-16 16:16:52.000000000 +0000 -+++ js/src/old-configure.in -@@ -140,6 +140,9 @@ fi - - MOZ_TOOL_VARIABLES - -+AC_PROG_CPP -+AC_PROG_CXXCPP -+ - dnl Special win32 checks - dnl ======================================================== - -@@ -1053,7 +1056,7 @@ dnl Checks for header files. - dnl ======================================================== - AC_HEADER_DIRENT - case "$target_os" in --freebsd*) -+freebsd*|*-*-dragonfly*) - # for stuff like -lXshm - CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" - ;; -@@ -1184,7 +1187,7 @@ then - fi - - case "$target" in -- *-*-freebsd*) -+ *-*-freebsd*|*-*-dragonfly*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) - dnl -pthread links in -lpthread, so don't specify it explicitly. diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp index ba53ffc2246..68ef3b8d793 100644 --- a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp +++ b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp @@ -1,11 +1,13 @@ -$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.12 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.13 2017/06/14 11:28:44 ryoon Exp $ ---- browser/app/nsBrowserApp.cpp.orig 2017-04-11 04:15:14.000000000 +0000 +--- browser/app/nsBrowserApp.cpp.orig 2017-06-05 20:45:13.000000000 +0000 +++ browser/app/nsBrowserApp.cpp -@@ -259,6 +259,9 @@ int main(int argc, char* argv[], char* e +@@ -261,6 +261,11 @@ int main(int argc, char* argv[], char* e { mozilla::TimeStamp start = mozilla::TimeStamp::Now(); ++ setenv("MOZ_PLUGIN_PATH", "@PREFIX@/lib/browser_plugins/symlinks/gecko", 0); ++ + setenv("MOZ_GMP_PATH", "@PREFIX@/lib/browser_plugins/symlinks/gecko", 0); + setenv("MOZ_PLUGIN_PATH", "@PREFIX@/lib/browser_plugins/symlinks/gecko", 0); + diff --git a/www/firefox/patches/patch-browser_confvars.sh b/www/firefox/patches/patch-browser_confvars.sh new file mode 100644 index 00000000000..492558858e5 --- /dev/null +++ b/www/firefox/patches/patch-browser_confvars.sh @@ -0,0 +1,12 @@ +$NetBSD: patch-browser_confvars.sh,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- browser/confvars.sh.orig 2017-06-05 20:45:14.000000000 +0000 ++++ browser/confvars.sh +@@ -30,6 +30,7 @@ if test "$OS_ARCH" = "WINNT"; then + fi + fi + ++MOZ_RUST_MP4PARSE=1 + if test "$NIGHTLY_BUILD"; then + MOZ_RUST_URLPARSE=1 + fi diff --git a/www/firefox/patches/patch-build_gyp.mozbuild b/www/firefox/patches/patch-build_gyp.mozbuild deleted file mode 100644 index 08bb9530dbc..00000000000 --- a/www/firefox/patches/patch-build_gyp.mozbuild +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-build_gyp.mozbuild,v 1.5 2017/04/27 01:49:47 ryoon Exp $ - -Hunk #1: - Try to add Video4Linux2 support - -Hunk #2: - On Darwin, don't assume iOS just because the toolkit is not - cocoa. Ideally there should be an AC_SUBST just like 'ARM_ARCH' but - nothing exists currently. - -Hunk #3: - MacOS X SDK version should be able to configure with - ./configure --enable-macos-target=VER - ---- build/gyp.mozbuild.orig 2017-04-11 04:15:17.000000000 +0000 -+++ build/gyp.mozbuild -@@ -16,6 +16,7 @@ gyp_vars.update({ - 'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0, - 'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0, - 'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0, -+ 'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0, - # basic stuff for everything - 'include_internal_video_render': 0, - 'clang': 1 if CONFIG['CLANG_CXX'] else 0, diff --git a/www/firefox/patches/patch-build_moz.configure_init.configure b/www/firefox/patches/patch-build_moz.configure_init.configure deleted file mode 100644 index 9de318543a3..00000000000 --- a/www/firefox/patches/patch-build_moz.configure_init.configure +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-build_moz.configure_init.configure,v 1.1 2016/12/03 09:58:26 ryoon Exp $ - ---- build/moz.configure/init.configure.orig 2016-10-31 20:15:27.000000000 +0000 -+++ build/moz.configure/init.configure -@@ -170,6 +170,7 @@ option(env='PYTHON', nargs=1, help='Pyth - @imports(_from='mozbuild.configure.util', _import='LineIO') - @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') - @imports(_from='mozbuild.virtualenv', _import='verify_python_version') -+@imports(_from='__builtin__', _import='KeyError') - @imports('distutils.sysconfig') - def virtualenv_python(env_python, build_env, mozconfig, help): - if help: -@@ -189,6 +190,12 @@ def virtualenv_python(env_python, build_ - python = mozconfig['vars']['added']['PYTHON'] - elif 'PYTHON' in mozconfig['vars']['modified']: - python = mozconfig['vars']['modified']['PYTHON'][1] -+ for i in ('env', 'vars'): -+ for j in ('added', 'modified'): -+ try: -+ del mozconfig[i][j]['PYTHON'] -+ except KeyError: -+ pass - - with LineIO(lambda l: log.error(l)) as out: - verify_python_version(out) -@@ -224,7 +231,10 @@ def virtualenv_python(env_python, build_ - if python != normsep(sys.executable): - log.info('Reexecuting in the virtualenv') - if env_python: -- del os.environ['PYTHON'] -+ try: -+ del os.environ['PYTHON'] -+ except KeyError: -+ pass - # One would prefer to use os.execl, but that's completely borked on - # Windows. - sys.exit(subprocess.call([python] + sys.argv)) diff --git a/www/firefox/patches/patch-build_moz.configure_keyfiles.configure b/www/firefox/patches/patch-build_moz.configure_keyfiles.configure deleted file mode 100644 index 3c740d59fca..00000000000 --- a/www/firefox/patches/patch-build_moz.configure_keyfiles.configure +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-build_moz.configure_keyfiles.configure,v 1.1 2017/03/07 20:45:43 ryoon Exp $ - ---- build/moz.configure/keyfiles.configure.orig 2017-01-26 04:20:09.000000000 +0000 -+++ build/moz.configure/keyfiles.configure -@@ -18,6 +18,7 @@ def keyfile(desc, help=None, callback=la - @checking('for the %s key' % desc, lambda x: x and x is not no_key) - @imports(_from='__builtin__', _import='open') - @imports(_from='__builtin__', _import='IOError') -+ @imports(_from='os', _import='environ') - def keyfile(value): - if value: - try: -@@ -28,7 +29,7 @@ def keyfile(desc, help=None, callback=la - raise FatalCheckError("'%s' is empty." % value[0]) - except IOError as e: - raise FatalCheckError("'%s': %s." % (value[0], e.strerror)) -- return no_key -+ return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key - - return keyfile - diff --git a/www/firefox/patches/patch-build_moz.configure_rust.configure b/www/firefox/patches/patch-build_moz.configure_rust.configure new file mode 100644 index 00000000000..ece538c4096 --- /dev/null +++ b/www/firefox/patches/patch-build_moz.configure_rust.configure @@ -0,0 +1,44 @@ +$NetBSD: patch-build_moz.configure_rust.configure,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- build/moz.configure/rust.configure.orig 2017-06-05 20:45:15.000000000 +0000 ++++ build/moz.configure/rust.configure +@@ -4,10 +4,20 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-# Rust is required by `rust_compiler` below. We allow_missing here +-# to propagate failures to the better error message there. +-rustc = check_prog('RUSTC', ['rustc'], allow_missing=True) +-cargo = check_prog('CARGO', ['cargo'], allow_missing=True) ++option('--disable-rust', help='Don\'t include Rust language sources') ++ ++@depends('--enable-rust') ++def rust_compiler_names(value): ++ if value: ++ return ['rustc'] ++ ++@depends('--enable-rust') ++def cargo_binary_names(value): ++ if value: ++ return ['cargo'] ++ ++rustc = check_prog('RUSTC', rust_compiler_names, allow_missing=True) ++cargo = check_prog('CARGO', cargo_binary_names, allow_missing=True) + + @depends_if(rustc) + @checking('rustc version', lambda info: info.version) +@@ -43,9 +53,12 @@ def cargo_info(cargo): + version=Version(version), + ) + +-@depends(rustc_info, cargo_info) ++@depends('--enable-rust', rustc_info, cargo_info) + @imports(_from='textwrap', _import='dedent') +-def rust_compiler(rustc_info, cargo_info): ++def rust_compiler(value, rustc_info, cargo_info): ++ if not value: ++ return None ++ + if not rustc_info: + die(dedent('''\ + Rust compiler not found. diff --git a/www/firefox/patches/patch-build_pgo_profileserver.py b/www/firefox/patches/patch-build_pgo_profileserver.py deleted file mode 100644 index e7fe31ddc1c..00000000000 --- a/www/firefox/patches/patch-build_pgo_profileserver.py +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-build_pgo_profileserver.py,v 1.5 2017/01/25 13:24:51 ryoon Exp $ - ---- build/pgo/profileserver.py.orig 2017-01-16 16:16:51.000000000 +0000 -+++ build/pgo/profileserver.py -@@ -80,7 +80,7 @@ if __name__ == '__main__': - env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog) - print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"] - -- cmdargs = ["http://localhost:%d/index.html" % PORT] -+ cmdargs = ["http://127.0.0.1:%d/index.html" % PORT] - runner = FirefoxRunner(profile=profile, - binary=build.get_binary_path(where="staged-package"), - cmdargs=cmdargs, diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers index 353960d28e8..3d3de6ba889 100644 --- a/www/firefox/patches/patch-config_system-headers +++ b/www/firefox/patches/patch-config_system-headers @@ -1,12 +1,12 @@ -$NetBSD: patch-config_system-headers,v 1.23 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-config_system-headers,v 1.24 2017/06/14 11:28:44 ryoon Exp $ * Try to support Video4Linux2 * Resolve libm undefined error * Support system libraries ---- config/system-headers.orig 2017-04-11 04:15:17.000000000 +0000 +--- config/system-headers.orig 2017-06-05 20:45:15.000000000 +0000 +++ config/system-headers -@@ -624,6 +624,7 @@ libgnome/libgnome.h +@@ -625,6 +625,7 @@ libgnome/libgnome.h libgnomeui/gnome-icon-lookup.h libgnomeui/gnome-icon-theme.h libgnomeui/gnome-ui-init.h @@ -14,7 +14,7 @@ $NetBSD: patch-config_system-headers,v 1.23 2017/04/27 01:49:47 ryoon Exp $ limits.h link.h #ifdef ANDROID -@@ -1267,6 +1268,15 @@ libsn/sn-launcher.h +@@ -1268,6 +1269,24 @@ libsn/sn-launcher.h libsn/sn-monitor.h libsn/sn-util.h #endif @@ -27,10 +27,19 @@ $NetBSD: patch-config_system-headers,v 1.23 2017/04/27 01:49:47 ryoon Exp $ +harfbuzz/hb-ot.h +harfbuzz/hb.h +#endif ++#if MOZ_SYSTEM_GRAPHITE2==1 ++graphite2/Font.h ++graphite2/Segment.h ++#endif ++#if MOZ_SYSTEM_HARFBUZZ==1 ++harfbuzz/hb-glib.h ++harfbuzz/hb-ot.h ++harfbuzz/hb.h ++#endif #if MOZ_SYSTEM_HUNSPELL==1 hunspell.hxx #endif -@@ -1337,3 +1347,17 @@ unicode/utypes.h +@@ -1338,3 +1357,31 @@ unicode/utypes.h libutil.h unwind.h fenv.h @@ -48,3 +57,17 @@ $NetBSD: patch-config_system-headers,v 1.23 2017/04/27 01:49:47 ryoon Exp $ +#if MOZ_SYSTEM_TREMOR==1 +tremor/ivorbiscodec.h +#endif ++#if MOZ_SYSTEM_OGG==1 ++ogg/ogg.h ++ogg/os_types.h ++#endif ++#if MOZ_SYSTEM_THEORA==1 ++theora/theoradec.h ++#endif ++#if MOZ_SYSTEM_VORBIS==1 ++vorbis/codec.h ++vorbis/vorbisenc.h ++#endif ++#if MOZ_SYSTEM_TREMOR==1 ++tremor/ivorbiscodec.h ++#endif diff --git a/www/firefox/patches/patch-dom_media_MediaPrefs.h b/www/firefox/patches/patch-dom_media_MediaPrefs.h new file mode 100644 index 00000000000..9da1e233e42 --- /dev/null +++ b/www/firefox/patches/patch-dom_media_MediaPrefs.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dom_media_MediaPrefs.h,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- dom/media/MediaPrefs.h.orig 2017-06-05 20:45:18.000000000 +0000 ++++ dom/media/MediaPrefs.h +@@ -165,7 +165,7 @@ private: + DECL_MEDIA_PREF("media.ogg.flac.enabled", FlacInOgg, bool, false); + DECL_MEDIA_PREF("media.flac.enabled", FlacEnabled, bool, true); + +-#if !defined(RELEASE_OR_BETA) ++#if defined(MOZ_RUST_MP4PARSE) && !defined(RELEASE_OR_BETA) + DECL_MEDIA_PREF("media.rust.test_mode", RustTestMode, bool, false); + #endif + diff --git a/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp b/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp index a897e4a0a26..8b24f954cfb 100644 --- a/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp +++ b/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp,v 1.1 2017/03/07 20:45:43 ryoon Exp $ +$NetBSD: patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp,v 1.2 2017/06/14 11:28:44 ryoon Exp $ ---- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp.orig 2016-10-14 08:14:07.000000000 +0000 +--- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp.orig 2017-06-05 20:45:19.000000000 +0000 +++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp @@ -11,9 +11,13 @@ #include "prmem.h" @@ -14,9 +14,9 @@ $NetBSD: patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp,v 1.1 201 #include "soundtouch/SoundTouch.h" +#endif - namespace mozilla - { -@@ -51,6 +55,12 @@ FFVPXRuntimeLinker::Init() + namespace mozilla { + +@@ -50,6 +54,12 @@ FFVPXRuntimeLinker::Init() sLinkStatus = LinkStatus_FAILED; @@ -29,7 +29,7 @@ $NetBSD: patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp,v 1.1 201 // We retrieve the path of the lgpllibs library as this is where mozavcodec // and mozavutil libs are located. char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs"); -@@ -61,6 +71,7 @@ FFVPXRuntimeLinker::Init() +@@ -60,6 +70,7 @@ FFVPXRuntimeLinker::Init() PR_GetLibraryFilePathname(lgpllibsname, (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); PR_FreeLibraryName(lgpllibsname); diff --git a/www/firefox/patches/patch-dom_media_webrtc_MediaEngine.h b/www/firefox/patches/patch-dom_media_webrtc_MediaEngine.h deleted file mode 100644 index 22dfbcd7a6a..00000000000 --- a/www/firefox/patches/patch-dom_media_webrtc_MediaEngine.h +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-dom_media_webrtc_MediaEngine.h,v 1.2 2017/04/27 14:08:34 ryoon Exp $ - -* Do not mix mozilla::ipc and mozilla::dom::ipc namespaces - ---- dom/media/webrtc/MediaEngine.h.orig 2017-04-11 04:15:22.000000000 +0000 -+++ dom/media/webrtc/MediaEngine.h -@@ -226,7 +226,7 @@ public: - ~AllocationHandle() {} - public: - AllocationHandle(const dom::MediaTrackConstraints& aConstraints, -- const ipc::PrincipalInfo& aPrincipalInfo, -+ const mozilla::ipc::PrincipalInfo& aPrincipalInfo, - const MediaEnginePrefs& aPrefs, - const nsString& aDeviceId) - -@@ -236,7 +236,7 @@ public: - mDeviceId(aDeviceId) {} - public: - NormalizedConstraints mConstraints; -- ipc::PrincipalInfo mPrincipalInfo; -+ mozilla::ipc::PrincipalInfo mPrincipalInfo; - MediaEnginePrefs mPrefs; - nsString mDeviceId; - }; -@@ -327,7 +327,7 @@ public: - virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints, - const MediaEnginePrefs &aPrefs, - const nsString& aDeviceId, -- const ipc::PrincipalInfo& aPrincipalInfo, -+ const mozilla::ipc::PrincipalInfo& aPrincipalInfo, - AllocationHandle** aOutHandle, - const char** aOutBadConstraint) - { diff --git a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp b/www/firefox/patches/patch-dom_system_OSFileConstants.cpp deleted file mode 100644 index 06b8fced197..00000000000 --- a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.10 2017/03/07 20:45:43 ryoon Exp $ - ---- dom/system/OSFileConstants.cpp.orig 2017-01-23 16:13:57.000000000 +0000 -+++ dom/system/OSFileConstants.cpp -@@ -16,14 +16,17 @@ - #include "dirent.h" - #include "poll.h" - #include "sys/stat.h" --#if defined(ANDROID) -+#if defined(XP_LINUX) - #include <sys/vfs.h> - #define statvfs statfs -+#define f_frsize f_bsize - #else - #include "sys/statvfs.h" -+#endif // defined(XP_LINUX) -+#if !defined(ANDROID) - #include "sys/wait.h" - #include <spawn.h> --#endif // defined(ANDROID) -+#endif // !defined(ANDROID) - #endif // defined(XP_UNIX) - - #if defined(XP_LINUX) -@@ -699,7 +702,7 @@ static const dom::ConstantSpec gLibcProp - - { "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) }, - -- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", JS::Int32Value(offsetof (struct statvfs, f_bsize)) }, -+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", JS::Int32Value(offsetof (struct statvfs, f_frsize)) }, - { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", JS::Int32Value(offsetof (struct statvfs, f_bavail)) }, - - #endif // defined(XP_UNIX) diff --git a/www/firefox/patches/patch-gfx_graphite2_src_Bidi.cpp b/www/firefox/patches/patch-gfx_graphite2_src_Bidi.cpp deleted file mode 100644 index ab93f9d881d..00000000000 --- a/www/firefox/patches/patch-gfx_graphite2_src_Bidi.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-gfx_graphite2_src_Bidi.cpp,v 1.4 2016/06/16 12:08:21 ryoon Exp $ - -* Support Solaris - ---- gfx/graphite2/src/Bidi.cpp.orig 2013-05-11 19:19:30.000000000 +0000 -+++ gfx/graphite2/src/Bidi.cpp -@@ -30,6 +30,11 @@ of the License or (at your option) any l - - using namespace graphite2; - -+#ifdef __sun -+#undef CS -+#undef ES -+#endif -+ - enum DirCode { // Hungarian: dirc - Unk = -1, - N = 0, // other neutrals (default) - ON diff --git a/www/firefox/patches/patch-gfx_thebes_moz.build b/www/firefox/patches/patch-gfx_thebes_moz.build index 82da413004b..da2b5824706 100644 --- a/www/firefox/patches/patch-gfx_thebes_moz.build +++ b/www/firefox/patches/patch-gfx_thebes_moz.build @@ -1,10 +1,10 @@ -$NetBSD: patch-gfx_thebes_moz.build,v 1.7 2017/03/07 20:45:43 ryoon Exp $ +$NetBSD: patch-gfx_thebes_moz.build,v 1.8 2017/06/14 11:28:44 ryoon Exp $ ---- gfx/thebes/moz.build.orig 2017-01-23 16:13:47.000000000 +0000 +--- gfx/thebes/moz.build.orig 2017-06-05 20:45:20.000000000 +0000 +++ gfx/thebes/moz.build -@@ -266,7 +266,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk +@@ -274,7 +274,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk + LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - LOCAL_INCLUDES += ['/media/libyuv/include'] -DEFINES['GRAPHITE2_STATIC'] = True +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: diff --git a/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.S b/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.S index 6d7674bc178..ee2b5384df1 100644 --- a/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.S +++ b/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.S @@ -1,8 +1,8 @@ -$NetBSD: patch-gfx_ycbcr_yuv__row__arm.S,v 1.3 2016/11/03 22:46:43 joerg Exp $ +$NetBSD: patch-gfx_ycbcr_yuv__row__arm.S,v 1.4 2017/06/14 11:28:44 ryoon Exp $ * Copy from yuv_row_arm.s to process it with pre-processor ---- gfx/ycbcr/yuv_row_arm.S.orig 2016-05-12 17:13:08.000000000 +0000 +--- gfx/ycbcr/yuv_row_arm.S.orig 2017-06-12 20:07:14.598490411 +0000 +++ gfx/ycbcr/yuv_row_arm.S @@ -2,6 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/www/firefox/patches/patch-intl_unicharutil_util_moz.build b/www/firefox/patches/patch-intl_unicharutil_util_moz.build index d04394898a1..7f58201ac62 100644 --- a/www/firefox/patches/patch-intl_unicharutil_util_moz.build +++ b/www/firefox/patches/patch-intl_unicharutil_util_moz.build @@ -1,12 +1,12 @@ -$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.5 2016/12/03 09:58:26 ryoon Exp $ +$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.6 2017/06/14 11:28:44 ryoon Exp $ ---- intl/unicharutil/util/moz.build.orig 2016-10-31 20:15:32.000000000 +0000 +--- intl/unicharutil/util/moz.build.orig 2017-06-05 20:45:20.000000000 +0000 +++ intl/unicharutil/util/moz.build -@@ -42,4 +42,7 @@ if CONFIG['_MSC_VER']: - if CONFIG['ENABLE_INTL_API']: - USE_LIBS += ['icu'] +@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']: + 'ICUUtils.cpp', + ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - DIST_INSTALL = True + FINAL_LIBRARY = 'xul' diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c index 5abdc39dde1..e1241549e23 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c @@ -1,19 +1,11 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.22 2017/06/14 11:28:44 ryoon Exp $ * Support alsa audio under NetBSD * Avoid https://github.com/kinetiknz/cubeb/issues/226 ---- media/libcubeb/src/cubeb_alsa.c.orig 2017-04-11 04:15:21.000000000 +0000 +--- media/libcubeb/src/cubeb_alsa.c.orig 2017-06-05 20:45:14.000000000 +0000 +++ media/libcubeb/src/cubeb_alsa.c -@@ -7,11 +7,15 @@ - #undef NDEBUG - #define _DEFAULT_SOURCE - #define _BSD_SOURCE -+#if defined(__NetBSD__) -+#define _NETBSD_SOURCE -+#endif - #define _XOPEN_SOURCE 500 - #include <pthread.h> +@@ -12,6 +12,7 @@ #include <sys/time.h> #include <assert.h> #include <limits.h> @@ -21,7 +13,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon #include <poll.h> #include <unistd.h> #include <alsa/asoundlib.h> -@@ -25,6 +29,52 @@ +@@ -25,6 +26,52 @@ #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" @@ -74,7 +66,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon /* ALSA is not thread-safe. snd_pcm_t instances are individually protected by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), -@@ -65,6 +115,8 @@ struct cubeb { +@@ -65,6 +112,8 @@ struct cubeb { workaround is not required. */ snd_config_t * local_config; int is_pa; @@ -83,7 +75,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon }; enum stream_state { -@@ -243,8 +295,8 @@ set_timeout(struct timeval * timeout, un +@@ -243,8 +292,8 @@ set_timeout(struct timeval * timeout, un static void stream_buffer_decrement(cubeb_stream * stm, long count) { @@ -94,7 +86,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon stm->bufframes -= count; } -@@ -276,9 +328,9 @@ alsa_process_stream(cubeb_stream * stm) +@@ -276,9 +325,9 @@ alsa_process_stream(cubeb_stream * stm) /* Call _poll_descriptors_revents() even if we don't use it to let underlying plugins clear null events. Otherwise poll() may wake up again and again, producing unnecessary CPU usage. */ @@ -106,7 +98,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon /* Got null event? Bail and wait for another wakeup. */ if (avail == 0) { -@@ -301,7 +353,7 @@ alsa_process_stream(cubeb_stream * stm) +@@ -301,7 +350,7 @@ alsa_process_stream(cubeb_stream * stm) // TODO: should it be marked as DRAINING? } @@ -115,7 +107,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (got < 0) { avail = got; // the error handler below will recover us -@@ -345,7 +397,7 @@ alsa_process_stream(cubeb_stream * stm) +@@ -345,7 +394,7 @@ alsa_process_stream(cubeb_stream * stm) (!stm->other_stream || stm->other_stream->bufframes > 0)) { long got = avail - stm->bufframes; void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; @@ -123,8 +115,8 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon + char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); /* Correct read size to the other stream available frames */ - if (stm->other_stream && got > stm->other_stream->bufframes) { -@@ -372,8 +424,8 @@ alsa_process_stream(cubeb_stream * stm) + if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { +@@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm) long drain_frames = avail - stm->bufframes; double drain_time = (double) drain_frames / stm->params.rate; @@ -135,7 +127,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon stm->bufframes = avail; /* Mark as draining, unless we're waiting for capture */ -@@ -400,7 +452,7 @@ alsa_process_stream(cubeb_stream * stm) +@@ -400,7 +449,7 @@ alsa_process_stream(cubeb_stream * stm) } } @@ -144,7 +136,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (wrote < 0) { avail = wrote; // the error handler below will recover us } else { -@@ -413,13 +465,13 @@ alsa_process_stream(cubeb_stream * stm) +@@ -413,13 +462,13 @@ alsa_process_stream(cubeb_stream * stm) /* Got some error? Let's try to recover the stream. */ if (avail < 0) { @@ -161,7 +153,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon } } -@@ -535,26 +587,26 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -535,26 +584,26 @@ get_slave_pcm_node(snd_config_t * lconf, slave_def = NULL; @@ -193,7 +185,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (r < 0) { break; } -@@ -563,7 +615,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -563,7 +612,7 @@ get_slave_pcm_node(snd_config_t * lconf, if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -202,7 +194,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (r < 0) { break; } -@@ -572,7 +624,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -572,7 +621,7 @@ get_slave_pcm_node(snd_config_t * lconf, } while (0); if (slave_def) { @@ -211,7 +203,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon } return NULL; -@@ -595,22 +647,22 @@ init_local_config_with_workaround(char c +@@ -595,22 +644,22 @@ init_local_config_with_workaround(char c lconf = NULL; @@ -238,7 +230,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (r < 0) { break; } -@@ -619,7 +671,7 @@ init_local_config_with_workaround(char c +@@ -619,7 +668,7 @@ init_local_config_with_workaround(char c if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -247,7 +239,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (r < 0) { break; } -@@ -630,12 +682,12 @@ init_local_config_with_workaround(char c +@@ -630,12 +679,12 @@ init_local_config_with_workaround(char c } /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ @@ -262,7 +254,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (r < 0) { break; } -@@ -646,18 +698,18 @@ init_local_config_with_workaround(char c +@@ -646,18 +695,18 @@ init_local_config_with_workaround(char c /* Don't clobber an explicit existing handle_underrun value, set it only if it doesn't already exist. */ @@ -284,7 +276,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (r < 0) { break; } -@@ -665,7 +717,7 @@ init_local_config_with_workaround(char c +@@ -665,7 +714,7 @@ init_local_config_with_workaround(char c return lconf; } while (0); @@ -293,7 +285,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon return NULL; } -@@ -677,9 +729,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c +@@ -677,9 +726,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c pthread_mutex_lock(&cubeb_alsa_mutex); if (local_config) { @@ -305,7 +297,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -692,7 +744,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) +@@ -692,7 +741,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) int r; pthread_mutex_lock(&cubeb_alsa_mutex); @@ -314,7 +306,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); return r; -@@ -755,12 +807,65 @@ alsa_init(cubeb ** context, char const * +@@ -755,12 +804,65 @@ alsa_init(cubeb ** context, char const * pthread_attr_t attr; snd_pcm_t * dummy; @@ -381,7 +373,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon cubeb_alsa_error_handler_set = 1; } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -768,6 +873,8 @@ alsa_init(cubeb ** context, char const * +@@ -768,6 +870,8 @@ alsa_init(cubeb ** context, char const * ctx = calloc(1, sizeof(*ctx)); assert(ctx); @@ -390,7 +382,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon ctx->ops = &alsa_ops; r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -817,7 +924,7 @@ alsa_init(cubeb ** context, char const * +@@ -817,7 +921,7 @@ alsa_init(cubeb ** context, char const * config fails with EINVAL, the PA PCM is too old for this workaround. */ if (r == -EINVAL) { pthread_mutex_lock(&cubeb_alsa_mutex); @@ -399,7 +391,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); ctx->local_config = NULL; } else if (r >= 0) { -@@ -857,9 +964,13 @@ alsa_destroy(cubeb * ctx) +@@ -857,9 +961,13 @@ alsa_destroy(cubeb * ctx) pthread_mutex_destroy(&ctx->mutex); free(ctx->fds); @@ -414,7 +406,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); } -@@ -939,7 +1050,7 @@ alsa_stream_init_single(cubeb * ctx, cub +@@ -942,7 +1050,7 @@ alsa_stream_init_single(cubeb * ctx, cub return CUBEB_ERROR; } @@ -423,7 +415,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon assert(r == 0); latency_us = latency_frames * 1e6 / stm->params.rate; -@@ -952,7 +1063,7 @@ alsa_stream_init_single(cubeb * ctx, cub +@@ -955,7 +1063,7 @@ alsa_stream_init_single(cubeb * ctx, cub latency_us = latency_us < min_latency ? min_latency: latency_us; } @@ -432,7 +424,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon stm->params.channels, stm->params.rate, 1, latency_us); if (r < 0) { -@@ -960,20 +1071,20 @@ alsa_stream_init_single(cubeb * ctx, cub +@@ -963,20 +1071,20 @@ alsa_stream_init_single(cubeb * ctx, cub return CUBEB_ERROR_INVALID_FORMAT; } @@ -456,8 +448,8 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon + r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); assert((nfds_t) r == stm->nfds); - r = pthread_cond_init(&stm->cond, NULL); -@@ -1048,7 +1159,7 @@ alsa_stream_destroy(cubeb_stream * stm) + if (alsa_register_stream(ctx, stm) != 0) { +@@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); if (stm->pcm) { if (stm->state == DRAINING) { @@ -466,7 +458,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon } alsa_locked_pcm_close(stm->pcm); stm->pcm = NULL; -@@ -1094,12 +1205,12 @@ alsa_get_max_channel_count(cubeb * ctx, +@@ -1094,12 +1202,12 @@ alsa_get_max_channel_count(cubeb * ctx, assert(stm); @@ -481,7 +473,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon if (r < 0) { return CUBEB_ERROR; } -@@ -1120,34 +1231,34 @@ alsa_get_preferred_sample_rate(cubeb * c +@@ -1120,34 +1228,34 @@ alsa_get_preferred_sample_rate(cubeb * c /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ @@ -524,7 +516,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon return CUBEB_OK; } -@@ -1180,10 +1291,10 @@ alsa_stream_start(cubeb_stream * stm) +@@ -1180,10 +1288,10 @@ alsa_stream_start(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); /* Capture pcm must be started after initial setup/recover */ if (stm->stream_type == SND_PCM_STREAM_CAPTURE && @@ -538,7 +530,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon gettimeofday(&stm->last_activity, NULL); pthread_mutex_unlock(&stm->mutex); -@@ -1223,7 +1334,7 @@ alsa_stream_stop(cubeb_stream * stm) +@@ -1223,7 +1331,7 @@ alsa_stream_stop(cubeb_stream * stm) pthread_mutex_unlock(&ctx->mutex); pthread_mutex_lock(&stm->mutex); @@ -547,7 +539,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1239,8 +1350,8 @@ alsa_stream_get_position(cubeb_stream * +@@ -1239,8 +1347,8 @@ alsa_stream_get_position(cubeb_stream * pthread_mutex_lock(&stm->mutex); delay = -1; @@ -558,7 +550,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon *position = stm->last_position; pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1265,7 +1376,7 @@ alsa_stream_get_latency(cubeb_stream * s +@@ -1265,7 +1373,7 @@ alsa_stream_get_latency(cubeb_stream * s snd_pcm_sframes_t delay; /* This function returns the delay in frames until a frame written using snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ diff --git a/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp b/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp new file mode 100644 index 00000000000..5d79b0755e8 --- /dev/null +++ b/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp @@ -0,0 +1,32 @@ +$NetBSD: patch-media_libstagefright_binding_DecoderData.cpp,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- media/libstagefright/binding/DecoderData.cpp.orig 2017-06-05 20:45:14.000000000 +0000 ++++ media/libstagefright/binding/DecoderData.cpp +@@ -13,9 +13,11 @@ + #include "mozilla/ArrayUtils.h" + #include "include/ESDS.h" + ++#ifdef MOZ_RUST_MP4PARSE + // OpusDecoder header is really needed only by MP4 in rust + #include "OpusDecoder.h" + #include "mp4parse.h" ++#endif // MOZ_RUST_MP4PARSE + + using namespace stagefright; + +@@ -187,6 +189,7 @@ MP4VideoInfo::Update(const MetaData* aMe + + } + ++#ifdef MOZ_RUST_MP4PARSE + static void + UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig, + const mp4parse_sinf_info& aSinf) +@@ -266,6 +269,7 @@ MP4VideoInfo::Update(const mp4parse_trac + mExtraData->AppendElements(video->extra_data.data, video->extra_data.length); + } + } ++#endif // MOZ_RUST_MP4PARSE + + bool + MP4VideoInfo::IsValid() const diff --git a/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp b/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp new file mode 100644 index 00000000000..abb5df13fbd --- /dev/null +++ b/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp @@ -0,0 +1,127 @@ +$NetBSD: patch-media_libstagefright_binding_MP4Metadata.cpp,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- media/libstagefright/binding/MP4Metadata.cpp.orig 2017-06-05 20:45:14.000000000 +0000 ++++ media/libstagefright/binding/MP4Metadata.cpp +@@ -19,14 +19,18 @@ + #include "mp4_demuxer/MP4Metadata.h" + #include "mp4_demuxer/Stream.h" + #include "MediaPrefs.h" ++#ifdef MOZ_RUST_MP4PARSE + #include "mp4parse.h" ++#endif // MOZ_RUST_MP4PARSE + + #include <limits> + #include <stdint.h> + #include <vector> + + ++#ifdef MOZ_RUST_MP4PARSE + struct FreeMP4Parser { void operator()(mp4parse_parser* aPtr) { mp4parse_free(aPtr); } }; ++#endif // MOZ_RUST_MP4PARSE + + using namespace stagefright; + +@@ -101,6 +105,7 @@ private: + bool mCanSeek; + }; + ++#ifdef MOZ_RUST_MP4PARSE + // Wrap an mp4_demuxer::Stream to remember the read offset. + + class RustStreamAdaptor { +@@ -145,9 +150,11 @@ private: + RustStreamAdaptor mRustSource; + mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser; + }; ++#endif // MOZ_RUST_MP4PARSE + + MP4Metadata::MP4Metadata(Stream* aSource) + : mStagefright(MakeUnique<MP4MetadataStagefright>(aSource)) ++#ifdef MOZ_RUST_MP4PARSE + , mRust(MakeUnique<MP4MetadataRust>(aSource)) + , mPreferRust(false) + , mReportedAudioTrackTelemetry(false) +@@ -155,6 +162,7 @@ MP4Metadata::MP4Metadata(Stream* aSource + #ifndef RELEASE_OR_BETA + , mRustTestMode(MediaPrefs::RustTestMode()) + #endif ++#endif // MOZ_RUST_MP4PARSE + { + } + +@@ -186,6 +194,7 @@ MP4Metadata::GetNumberTracks(mozilla::Tr + { + uint32_t numTracks = mStagefright->GetNumberTracks(aType); + ++#ifdef MOZ_RUST_MP4PARSE + if (!mRust) { + return numTracks; + } +@@ -211,10 +220,12 @@ MP4Metadata::GetNumberTracks(mozilla::Tr + mPreferRust = true; + return numTracksRust; + } ++#endif // MOZ_RUST_MP4PARSE + + return numTracks; + } + ++#ifdef MOZ_RUST_MP4PARSE + bool MP4Metadata::ShouldPreferRust() const { + if (!mRust) { + return false; +@@ -245,6 +256,7 @@ bool MP4Metadata::ShouldPreferRust() con + // Otherwise, fall back. + return false; + } ++#endif // MOZ_RUST_MP4PARSE + + mozilla::UniquePtr<mozilla::TrackInfo> + MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType, +@@ -253,6 +265,7 @@ MP4Metadata::GetTrackInfo(mozilla::Track + mozilla::UniquePtr<mozilla::TrackInfo> info = + mStagefright->GetTrackInfo(aType, aTrackNumber); + ++#ifdef MOZ_RUST_MP4PARSE + if (!mRust) { + return info; + } +@@ -305,6 +318,7 @@ MP4Metadata::GetTrackInfo(mozilla::Track + if (mPreferRust) { + return infoRust; + } ++#endif // MOZ_RUST_MP4PARSE + + return info; + } +@@ -319,6 +333,7 @@ const CryptoFile& + MP4Metadata::Crypto() const + { + const CryptoFile& crypto = mStagefright->Crypto(); ++#ifdef MOZ_RUST_MP4PARSE + const CryptoFile& rustCrypto = mRust->Crypto(); + + #ifndef RELEASE_OR_BETA +@@ -330,6 +345,7 @@ MP4Metadata::Crypto() const + if (mPreferRust) { + return rustCrypto; + } ++#endif // MOZ_RUST_MP4PARSE + + return crypto; + } +@@ -594,6 +610,7 @@ MP4MetadataStagefright::Metadata(Stream* + return parser->Metadata(); + } + ++#ifdef MOZ_RUST_MP4PARSE + bool + RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read) + { +@@ -859,5 +876,6 @@ MP4MetadataRust::Metadata(Stream* aSourc + MOZ_ASSERT(false, "Not yet implemented"); + return nullptr; + } ++#endif // MOZ_RUST_MP4PARSE + + } // namespace mp4_demuxer diff --git a/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h b/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h new file mode 100644 index 00000000000..c39d509666b --- /dev/null +++ b/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h @@ -0,0 +1,40 @@ +$NetBSD: patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- media/libstagefright/binding/include/mp4_demuxer/DecoderData.h.orig 2017-06-05 20:45:14.000000000 +0000 ++++ media/libstagefright/binding/include/mp4_demuxer/DecoderData.h +@@ -19,11 +19,13 @@ namespace stagefright + class MetaData; + } + ++#ifdef MOZ_RUST_MP4PARSE + extern "C" { + typedef struct mp4parse_track_info mp4parse_track_info; + typedef struct mp4parse_track_audio_info mp4parse_track_audio_info; + typedef struct mp4parse_track_video_info mp4parse_track_video_info; + } ++#endif // MOZ_RUST_MP4PARSE + + namespace mp4_demuxer + { +@@ -71,8 +73,10 @@ public: + void Update(const stagefright::MetaData* aMetaData, + const char* aMimeType); + ++#ifdef MOZ_RUST_MP4PARSE + void Update(const mp4parse_track_info* track, + const mp4parse_track_audio_info* audio); ++#endif // MOZ_RUST_MP4PARSE + + virtual bool IsValid() const override; + }; +@@ -85,8 +89,10 @@ public: + void Update(const stagefright::MetaData* aMetaData, + const char* aMimeType); + ++#ifdef MOZ_RUST_MP4PARSE + void Update(const mp4parse_track_info* track, + const mp4parse_track_video_info* video); ++#endif // MOZ_RUST_MP4PARSE + + virtual bool IsValid() const override; + }; diff --git a/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h b/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h new file mode 100644 index 00000000000..36519434a92 --- /dev/null +++ b/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h @@ -0,0 +1,20 @@ +$NetBSD: patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h.orig 2017-06-05 20:45:14.000000000 +0000 ++++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h +@@ -36,6 +36,7 @@ public: + + private: + UniquePtr<MP4MetadataStagefright> mStagefright; ++#ifdef MOZ_RUST_MP4PARSE + UniquePtr<MP4MetadataRust> mRust; + mutable bool mPreferRust; + mutable bool mReportedAudioTrackTelemetry; +@@ -44,6 +45,7 @@ private: + mutable bool mRustTestMode; + #endif + bool ShouldPreferRust() const; ++#endif // MOZ_RUST_MP4PARSE + }; + + } // namespace mp4_demuxer diff --git a/www/firefox/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc b/www/firefox/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc new file mode 100644 index 00000000000..63344b1c43f --- /dev/null +++ b/www/firefox/patches/patch-media_libyuv_libyuv_source_mjpeg__decoder.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-media_libyuv_libyuv_source_mjpeg__decoder.cc,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- media/libyuv/libyuv/source/mjpeg_decoder.cc.orig 2017-06-05 20:45:14.000000000 +0000 ++++ media/libyuv/libyuv/source/mjpeg_decoder.cc +@@ -25,7 +25,7 @@ + #endif + + #endif +-struct FILE; // For jpeglib.h. ++//struct FILE; // For jpeglib.h. + + // C++ build requires extern C for jpeg internals. + #ifdef __cplusplus diff --git a/www/firefox/patches/patch-media_libyuv_source_mjpeg__decoder.cc b/www/firefox/patches/patch-media_libyuv_source_mjpeg__decoder.cc deleted file mode 100644 index 478872192a7..00000000000 --- a/www/firefox/patches/patch-media_libyuv_source_mjpeg__decoder.cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-media_libyuv_source_mjpeg__decoder.cc,v 1.1 2016/12/03 09:58:26 ryoon Exp $ - ---- media/libyuv/source/mjpeg_decoder.cc.orig 2016-10-31 20:15:24.000000000 +0000 -+++ media/libyuv/source/mjpeg_decoder.cc -@@ -25,7 +25,6 @@ - #endif - - #endif --struct FILE; // For jpeglib.h. - - // C++ build requires extern C for jpeg internals. - #ifdef __cplusplus diff --git a/www/firefox/patches/patch-media_webrtc_signaling_test_common.build b/www/firefox/patches/patch-media_webrtc_signaling_test_common.build index dfebce359d7..102e42b746d 100644 --- a/www/firefox/patches/patch-media_webrtc_signaling_test_common.build +++ b/www/firefox/patches/patch-media_webrtc_signaling_test_common.build @@ -1,12 +1,8 @@ -$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.6 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.7 2017/06/14 11:28:44 ryoon Exp $ --- media/webrtc/signaling/test/common.build.orig 2016-10-31 20:15:24.000000000 +0000 +++ media/webrtc/signaling/test/common.build -@@ -96,11 +96,12 @@ if CONFIG['JS_SHARED_LIBRARY']: - - USE_LIBS += ['mozglue'] - -+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] +@@ -99,8 +99,8 @@ USE_LIBS += ['mozglue'] OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] OS_LIBS += CONFIG['REALTIME_LIBS'] 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 deleted file mode 100644 index 3dd2de8e17d..00000000000 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.12 2017/04/27 01:49:47 ryoon Exp $ - ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2017-04-11 04:15:17.000000000 +0000 -+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -@@ -25,6 +25,9 @@ - #else - #include <linux/videodev2.h> - #endif -+#ifdef HAVE_LIBV4L2 -+#include <libv4l2.h> -+#endif - - #include "webrtc/system_wrappers/include/ref_count.h" - #include "webrtc/system_wrappers/include/trace.h" -@@ -34,6 +37,15 @@ - #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) ) - #endif - -+#ifdef HAVE_LIBV4L2 -+#define open v4l2_open -+#define close v4l2_close -+#define dup v4l2_dup -+#define ioctl v4l2_ioctl -+#define mmap v4l2_mmap -+#define munmap v4l2_munmap -+#endif -+ - namespace webrtc - { - namespace videocapturemodule -@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName( - memset(deviceNameUTF8, 0, deviceNameLength); - memcpy(cameraName, cap.card, sizeof(cap.card)); - -+ if (cameraName[0] == '\0') -+ { -+ sprintf(cameraName, "Camera at /dev/video%d", deviceNumber); -+ } -+ - if (deviceNameLength >= strlen(cameraName)) - { - memcpy(deviceNameUTF8, cameraName, strlen(cameraName)); diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc deleted file mode 100644 index dab0ad4da0d..00000000000 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.12 2017/04/27 01:49:47 ryoon Exp $ - ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2017-04-11 04:15:17.000000000 +0000 -+++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc -@@ -24,6 +24,9 @@ - #else - #include <linux/videodev2.h> - #endif -+#ifdef HAVE_LIBV4L2 -+#include <libv4l2.h> -+#endif - - #include <new> - -@@ -32,6 +35,15 @@ - #include "webrtc/system_wrappers/include/ref_count.h" - #include "webrtc/system_wrappers/include/trace.h" - -+#ifdef HAVE_LIBV4L2 -+#define open v4l2_open -+#define close v4l2_close -+#define dup v4l2_dup -+#define ioctl v4l2_ioctl -+#define mmap v4l2_mmap -+#define munmap v4l2_munmap -+#endif -+ - namespace webrtc - { - namespace videocapturemodule diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi deleted file mode 100644 index 68fbd96dc19..00000000000 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.11 2017/04/27 01:49:47 ryoon Exp $ - ---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2017-04-11 04:15:17.000000000 +0000 -+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi -@@ -7,6 +7,9 @@ - # be found in the AUTHORS file in the root of the source tree. - - { -+ 'variables': { -+ 'use_libv4l2%': 0, -+ }, - 'targets': [ - { - # Note this library is missing an implementation for the video capture. -@@ -76,6 +79,19 @@ - 'linux/video_capture_linux.cc', - 'linux/video_capture_linux.h', - ], -+ 'conditions': [ -+ ['use_libv4l2==1', { -+ 'defines': [ -+ 'HAVE_LIBV4L2', -+ ], -+ 'cflags_mozilla': [ -+ '$(MOZ_LIBV4L2_CFLAGS)', -+ ], -+ 'libraries': [ -+ '-lv4l2', -+ ], -+ }], -+ ], - }], - ['OS=="mac"', { - 'sources': [ diff --git a/www/firefox/patches/patch-mobile_android_confvars.sh b/www/firefox/patches/patch-mobile_android_confvars.sh new file mode 100644 index 00000000000..2159ff3b27c --- /dev/null +++ b/www/firefox/patches/patch-mobile_android_confvars.sh @@ -0,0 +1,13 @@ +$NetBSD: patch-mobile_android_confvars.sh,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- mobile/android/confvars.sh.orig 2017-06-05 20:45:15.000000000 +0000 ++++ mobile/android/confvars.sh +@@ -30,6 +30,8 @@ MOZ_XULRUNNER= + MOZ_CAPTURE=1 + MOZ_RAW=1 + ++MOZ_RUST_MP4PARSE=1 ++ + # use custom widget for html:select + MOZ_USE_NATIVE_POPUP_WINDOWS=1 + diff --git a/www/firefox/patches/patch-python_futures_concurrent_futures_process.py b/www/firefox/patches/patch-python_futures_concurrent_futures_process.py deleted file mode 100644 index 2152bd7b5ea..00000000000 --- a/www/firefox/patches/patch-python_futures_concurrent_futures_process.py +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-python_futures_concurrent_futures_process.py,v 1.1 2017/04/27 01:49:47 ryoon Exp $ - ---- python/futures/concurrent/futures/process.py.orig 2017-04-11 04:15:19.000000000 +0000 -+++ python/futures/concurrent/futures/process.py -@@ -247,7 +247,11 @@ def _check_system_limits(): - _system_limits_checked = True - try: - import os -- nsems_max = os.sysconf("SC_SEM_NSEMS_MAX") -+ if sys.platform.startswith('freebsd'): -+ # sem(4) confuses sysconf(3) on FreeBSD < 11.1 -+ nsems_max = -1 -+ else: -+ nsems_max = os.sysconf("SC_SEM_NSEMS_MAX") - except (AttributeError, ValueError): - # sysconf not available or setting not available - return diff --git a/www/firefox/patches/patch-rc b/www/firefox/patches/patch-rc deleted file mode 100644 index 3fa70932c65..00000000000 --- a/www/firefox/patches/patch-rc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-rc,v 1.8 2016/06/16 12:08:21 ryoon Exp $ - -* Fix application name - ---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2015-08-24 21:53:06.000000000 +0000 -+++ browser/branding/unofficial/locales/en-US/brand.dtd -@@ -2,8 +2,8 @@ - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - --<!ENTITY brandShorterName "Nightly"> --<!ENTITY brandShortName "Nightly"> --<!ENTITY brandFullName "Nightly"> -+<!ENTITY brandShorterName "Browser"> -+<!ENTITY brandShortName "Browser"> -+<!ENTITY brandFullName "Browser"> - <!ENTITY vendorShortName "Mozilla"> - <!ENTITY trademarkInfo.part1 " "> diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm deleted file mode 100644 index d082234b1a5..00000000000 --- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.8 2016/12/03 09:58:26 ryoon Exp $ - ---- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2016-07-25 20:22:06.000000000 +0000 -+++ toolkit/components/osfile/modules/osfile_unix_back.jsm -@@ -228,8 +228,8 @@ - let statvfs = new SharedAll.HollowStructure("statvfs", - Const.OSFILE_SIZEOF_STATVFS); - -- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE, -- "f_bsize", Type.unsigned_long.implementation); -+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE, -+ "f_frsize", Type.unsigned_long.implementation); - statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL, - "f_bavail", Type.fsblkcnt_t.implementation); - diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm deleted file mode 100644 index 77a87fa22b8..00000000000 --- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.6 2016/12/03 09:58:26 ryoon Exp $ - ---- toolkit/components/osfile/modules/osfile_unix_front.jsm.orig 2016-05-12 17:13:27.000000000 +0000 -+++ toolkit/components/osfile/modules/osfile_unix_front.jsm -@@ -399,7 +399,7 @@ - throw_on_negative("statvfs", (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr)); - - let bytes = new Type.uint64_t.implementation( -- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail); -+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail); - - return bytes.value; - }; diff --git a/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json b/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json new file mode 100644 index 00000000000..8d05f3f2a8f --- /dev/null +++ b/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json @@ -0,0 +1,42 @@ +$NetBSD: patch-toolkit_components_telemetry_Histograms.json,v 1.1 2017/06/14 11:28:44 ryoon Exp $ + +--- toolkit/components/telemetry/Histograms.json.orig 2017-06-05 20:45:22.000000000 +0000 ++++ toolkit/components/telemetry/Histograms.json +@@ -7022,7 +7022,8 @@ + "expires_in_version": "55", + "kind": "boolean", + "bug_numbers": [1220885], +- "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment." ++ "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment.", ++ "cpp_guard": "MOZ_RUST_MP4PARSE" + }, + "MEDIA_RUST_MP4PARSE_ERROR_CODE": { + "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], +@@ -7030,21 +7031,24 @@ + "kind": "enumerated", + "n_values": 32, + "bug_numbers": [1238420], +- "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error." ++ "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error.", ++ "cpp_guard": "MOZ_RUST_MP4PARSE" + }, + "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": { + "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], + "expires_in_version": "55", + "kind": "boolean", + "bug_numbers": [1231169], +- "description": "Whether rust and stagefight mp4 parser audio track results match." ++ "description": "Whether rust and stagefight mp4 parser audio track results match.", ++ "cpp_guard": "MOZ_RUST_MP4PARSE" + }, + "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": { + "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], + "expires_in_version": "55", + "kind": "boolean", + "bug_numbers": [1231169], +- "description": "Whether rust and stagefight mp4 parser video track results match." ++ "description": "Whether rust and stagefight mp4 parser video track results match.", ++ "cpp_guard": "MOZ_RUST_MP4PARSE" + }, + "MEDIA_WMF_DECODE_ERROR": { + "expires_in_version": "55", diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build index 81d684bb9dd..66d6d945933 100644 --- a/www/firefox/patches/patch-toolkit_library_moz.build +++ b/www/firefox/patches/patch-toolkit_library_moz.build @@ -1,19 +1,11 @@ -$NetBSD: patch-toolkit_library_moz.build,v 1.12 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-toolkit_library_moz.build,v 1.13 2017/06/14 11:28:44 ryoon Exp $ * Support system libraries * Restore OSS support ---- toolkit/library/moz.build.orig 2017-04-11 04:15:18.000000000 +0000 +--- toolkit/library/moz.build.orig 2017-06-05 20:45:23.000000000 +0000 +++ toolkit/library/moz.build -@@ -216,6 +216,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF - ] - - OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] -+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] - OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] - - if CONFIG['SERVO_TARGET_DIR']: -@@ -230,9 +231,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']: +@@ -228,9 +228,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']: if CONFIG['MOZ_SYSTEM_PNG']: OS_LIBS += CONFIG['MOZ_PNG_LIBS'] @@ -44,7 +36,7 @@ $NetBSD: patch-toolkit_library_moz.build,v 1.12 2017/04/27 01:49:47 ryoon Exp $ if CONFIG['MOZ_SYSTEM_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] -@@ -242,8 +264,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: +@@ -240,8 +261,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] diff --git a/www/firefox/patches/patch-toolkit_moz.configure b/www/firefox/patches/patch-toolkit_moz.configure index 39d77675617..77368a5a029 100644 --- a/www/firefox/patches/patch-toolkit_moz.configure +++ b/www/firefox/patches/patch-toolkit_moz.configure @@ -1,10 +1,10 @@ -$NetBSD: patch-toolkit_moz.configure,v 1.2 2017/03/07 20:45:43 ryoon Exp $ +$NetBSD: patch-toolkit_moz.configure,v 1.3 2017/06/14 11:28:44 ryoon Exp $ * Enable widevide CDM for NetBSD ---- toolkit/moz.configure.orig 2017-01-23 16:13:54.000000000 +0000 +--- toolkit/moz.configure.orig 2017-06-05 20:45:23.000000000 +0000 +++ toolkit/moz.configure -@@ -338,6 +338,26 @@ add_old_configure_assignment('FT2_LIBS', +@@ -343,6 +343,26 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', delayed_getattr(ft2_info, 'cflags')) @@ -23,7 +23,7 @@ $NetBSD: patch-toolkit_moz.configure,v 1.2 2017/03/07 20:45:43 ryoon Exp $ +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.1', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.3', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) diff --git a/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp b/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp index 22bc7548298..64e69229c60 100644 --- a/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp +++ b/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.6 2016/06/16 12:08:21 ryoon Exp $ +$NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.7 2017/06/14 11:28:44 ryoon Exp $ * Support Solaris ---- toolkit/xre/nsEmbedFunctions.cpp.orig 2013-05-11 19:19:55.000000000 +0000 +--- toolkit/xre/nsEmbedFunctions.cpp.orig 2017-06-05 20:45:23.000000000 +0000 +++ toolkit/xre/nsEmbedFunctions.cpp -@@ -239,7 +239,7 @@ XRE_SetRemoteExceptionHandler(const char +@@ -285,7 +285,7 @@ XRE_SetRemoteExceptionHandler(const char { #if defined(XP_WIN) || defined(XP_MACOSX) return CrashReporter::SetRemoteExceptionHandler(nsDependentCString(aPipe)); @@ -13,7 +13,7 @@ $NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.6 2016/06/16 12:08:21 ryoon return CrashReporter::SetRemoteExceptionHandler(); #else # error "OOP crash reporter unsupported on this platform" -@@ -351,7 +351,7 @@ XRE_InitChildProcess(int aArgc, +@@ -504,7 +504,7 @@ XRE_InitChildProcess(int aArgc, // Bug 684322 will add better visibility into this condition NS_WARNING("Could not setup crash reporting\n"); } @@ -21,4 +21,4 @@ $NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.6 2016/06/16 12:08:21 ryoon +# elif defined(OS_LINUX) || defined(OS_SOLARIS) // on POSIX, |crashReporterArg| is "true" if crash reporting is // enabled, false otherwise - if (0 != strcmp("false", crashReporterArg) && + if (0 != strcmp("false", crashReporterArg) && |