summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/firefox/Makefile7
-rw-r--r--www/firefox/PLIST266
-rw-r--r--www/firefox/distinfo67
-rw-r--r--www/firefox/mozilla-common.mk10
-rw-r--r--www/firefox/patches/patch-aa20
-rw-r--r--www/firefox/patches/patch-ao15
-rw-r--r--www/firefox/patches/patch-browser_app_nsBrowserApp.cpp14
-rw-r--r--www/firefox/patches/patch-browser_installer_package-manifest.in15
-rw-r--r--www/firefox/patches/patch-build_buildconfig.py11
-rw-r--r--www/firefox/patches/patch-build_gyp.mozbuild8
-rw-r--r--www/firefox/patches/patch-build_moz.configure_old.configure8
-rw-r--r--www/firefox/patches/patch-config_Makefile.in4
-rw-r--r--www/firefox/patches/patch-config_system-headers6
-rw-r--r--www/firefox/patches/patch-dom_media_CubebUtils.cpp14
-rw-r--r--www/firefox/patches/patch-dom_media_webrtc_MediaEngine.h31
-rw-r--r--www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp12
-rw-r--r--www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp6
-rw-r--r--www/firefox/patches/patch-image_Downscaler.h33
-rw-r--r--www/firefox/patches/patch-image_decoders_nsIconDecoder.cpp16
-rw-r--r--www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp16
-rw-r--r--www/firefox/patches/patch-media_libcubeb_gtest_moz.build12
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_cubeb.c8
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c211
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c19
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_moz.build24
-rw-r--r--www/firefox/patches/patch-media_libcubeb_tests_moz.build12
-rw-r--r--www/firefox/patches/patch-media_libcubeb_update.sh8
-rw-r--r--www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c6
-rw-r--r--www/firefox/patches/patch-media_webrtc_signaling_test_common.build4
-rw-r--r--www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc8
-rw-r--r--www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc12
-rw-r--r--www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi8
-rw-r--r--www/firefox/patches/patch-mobile_android_installer_Makefile.in15
-rw-r--r--www/firefox/patches/patch-mobile_android_installer_package-manifest.in13
-rw-r--r--www/firefox/patches/patch-modules_woff2_src_store_bytes.h41
-rw-r--r--www/firefox/patches/patch-modules_woff2_src_woff2_common.cc26
-rw-r--r--www/firefox/patches/patch-python_futures_concurrent_futures_process.py17
-rw-r--r--www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h15
-rw-r--r--www/firefox/patches/patch-toolkit_library_dependentlibs.py21
-rw-r--r--www/firefox/patches/patch-toolkit_library_moz.build10
-rw-r--r--www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm14
-rw-r--r--www/firefox/patches/patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js14
42 files changed, 462 insertions, 635 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index d1411e4c478..2cb61fd0b76 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.292 2017/04/22 21:04:01 adam Exp $
+# $NetBSD: Makefile,v 1.293 2017/04/27 01:49:47 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 52.0
-MOZ_BRANCH_MINOR= .2
+MOZ_BRANCH= 53.0
+MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION= 1
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index e5b23963aa3..fcd79a30c00 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.118 2017/03/30 19:11:14 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.119 2017/04/27 01:49:47 ryoon Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -39,8 +39,6 @@ lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.c
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/images/graphic_sync_intro.png
-lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/images/graphic_sync_intro@2x.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
@@ -78,10 +76,10 @@ lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.xul
lib/firefox/browser/chrome/browser/content/browser/bookmarks/sidebarUtils.js
lib/firefox/browser/chrome/browser/content/browser/browser-addons.js
lib/firefox/browser/chrome/browser/content/browser/browser-captivePortal.js
+lib/firefox/browser/chrome/browser/content/browser/browser-compacttheme.js
lib/firefox/browser/chrome/browser/content/browser/browser-ctrlTab.js
lib/firefox/browser/chrome/browser/content/browser/browser-customization.js
lib/firefox/browser/chrome/browser/content/browser/browser-data-submission-info-bar.js
-lib/firefox/browser/chrome/browser/content/browser/browser-devedition.js
lib/firefox/browser/chrome/browser/content/browser/browser-feeds.js
lib/firefox/browser/chrome/browser/content/browser/browser-fullScreenAndPointerLock.js
lib/firefox/browser/chrome/browser/content/browser/browser-fullZoom.js
@@ -111,6 +109,7 @@ lib/firefox/browser/chrome/browser/content/browser/customizableui/panelUI.css
lib/firefox/browser/chrome/browser/content/browser/customizableui/panelUI.js
lib/firefox/browser/chrome/browser/content/browser/customizableui/panelUI.xml
lib/firefox/browser/chrome/browser/content/browser/customizableui/toolbar.xml
+lib/firefox/browser/chrome/browser/content/browser/default-theme-icon.svg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.footer.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.header.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.icon.jpg
@@ -131,8 +130,9 @@ lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.footer.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.header.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.icon.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.preview.jpg
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/devedition.header.png
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/devedition.icon.png
+lib/firefox/browser/chrome/browser/content/browser/defaultthemes/compact.header.png
+lib/firefox/browser/chrome/browser/content/browser/defaultthemes/compactdark.icon.svg
+lib/firefox/browser/chrome/browser/content/browser/defaultthemes/compactlight.icon.svg
lib/firefox/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.js
lib/firefox/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.xul
lib/firefox/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.css
@@ -146,17 +146,21 @@ lib/firefox/browser/chrome/browser/content/browser/downloads/indicator.js
lib/firefox/browser/chrome/browser/content/browser/downloads/indicatorOverlay.xul
lib/firefox/browser/chrome/browser/content/browser/ext-bookmarks.js
lib/firefox/browser/chrome/browser/content/browser/ext-browserAction.js
+lib/firefox/browser/chrome/browser/content/browser/ext-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-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.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-tabs.js
+lib/firefox/browser/chrome/browser/content/browser/ext-theme.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
@@ -242,6 +246,10 @@ 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/siteDataSettings.css
+lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.xul
+lib/firefox/browser/chrome/browser/content/browser/preferences/siteListItem.xml
lib/firefox/browser/chrome/browser/content/browser/preferences/translation.js
lib/firefox/browser/chrome/browser/content/browser/preferences/translation.xul
lib/firefox/browser/chrome/browser/content/browser/report-phishing-overlay.xul
@@ -254,14 +262,18 @@ lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.css
lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.js
lib/firefox/browser/chrome/browser/content/browser/schemas/bookmarks.json
lib/firefox/browser/chrome/browser/content/browser/schemas/browser_action.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/browsing_data.json
lib/firefox/browser/chrome/browser/content/browser/schemas/commands.json
lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus.json
lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus_internal.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/devtools.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_inspected_window.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/tabs.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/theme.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
@@ -302,7 +314,6 @@ lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.js
lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.xul
lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Privacy-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Security-broken.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-inverted.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-inverted@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-small.png
@@ -316,7 +327,7 @@ 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/actionicon-tab.png
+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
@@ -332,6 +343,9 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme
lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css
lib/firefox/browser/chrome/browser/skin/classic/browser/cert-error.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/click-to-play-warning-stripes.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/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/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
@@ -368,7 +382,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.css
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
@@ -379,15 +392,12 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notif
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-start.png
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-summary.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/downloads.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/menubutton-dropmarker.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/drm-icon.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/error-pages.css
lib/firefox/browser/chrome/browser/skin/classic/browser/favicon-search-16.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon.png
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/subscribe-ui.css
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/subscribe.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/filters.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/insecure.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/secure.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/android.png
@@ -420,7 +430,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/monitor_16-10.png
lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/close.png
lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/controls.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/newTab.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/whimsycorn.png
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/page-livemarks.png
lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.css
@@ -432,7 +441,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header.png
lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/icons.png
lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/icons@2x.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/places/autocomplete-star.png
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-menu-arrow.png
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish.png
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.png
@@ -488,12 +496,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/searchbar.css
lib/firefox/browser/chrome/browser/skin/classic/browser/session-restore.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css
lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/social/gear_clicked.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/social/gear_default.png
lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-64.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/social/share-button-active.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/social/share-button.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
@@ -506,10 +510,6 @@ 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/syncProgress-menuPanel.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-menuPanel@2x.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar-inverted.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar.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
@@ -542,8 +542,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-en
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/theme-switcher-icon.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/theme-switcher-icon@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/toolbarbutton-dropdown-arrow.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tracking-protection-16.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16.png
@@ -558,10 +556,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-star.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-tab.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/warning-white.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/warning.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-camera-white-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-indicator.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-microphone-white-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-screen-white-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/welcome-back.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/wifi.svg
lib/firefox/browser/chrome/browser/skin/classic/communicator/communicator.css
@@ -635,8 +630,7 @@ lib/firefox/browser/chrome/devtools/content/inspector/inspector.xhtml
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-controller.js
-lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor-view.js
+lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor.js
lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor.xul
lib/firefox/browser/chrome/devtools/content/performance/performance-controller.js
lib/firefox/browser/chrome/devtools/content/performance/performance-view.js
@@ -651,9 +645,6 @@ lib/firefox/browser/chrome/devtools/content/performance/views/details.js
lib/firefox/browser/chrome/devtools/content/performance/views/overview.js
lib/firefox/browser/chrome/devtools/content/performance/views/recordings.js
lib/firefox/browser/chrome/devtools/content/performance/views/toolbar.js
-lib/firefox/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor-loader.js
-lib/firefox/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor-loader.xul
-lib/firefox/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor-test.xul
lib/firefox/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor.xul
lib/firefox/browser/chrome/devtools/content/projecteditor/lib/helpers/readdir.js
lib/firefox/browser/chrome/devtools/content/responsive.html/index.js
@@ -668,6 +659,7 @@ lib/firefox/browser/chrome/devtools/content/shared/theme-switching.js
lib/firefox/browser/chrome/devtools/content/shared/vendor/d3.js
lib/firefox/browser/chrome/devtools/content/shared/vendor/dagre-d3.js
lib/firefox/browser/chrome/devtools/content/shared/widgets/VariablesView.xul
+lib/firefox/browser/chrome/devtools/content/shared/widgets/color-widget.css
lib/firefox/browser/chrome/devtools/content/shared/widgets/cubic-bezier.css
lib/firefox/browser/chrome/devtools/content/shared/widgets/filter-widget.css
lib/firefox/browser/chrome/devtools/content/shared/widgets/graphs-frame.xhtml
@@ -680,6 +672,7 @@ lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/tern/t
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/codemirror.bundle.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/lib/codemirror.css
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mozilla.css
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/old-debugger.css
lib/firefox/browser/chrome/devtools/content/storage/storage.xul
lib/firefox/browser/chrome/devtools/content/styleeditor/styleeditor.xul
lib/firefox/browser/chrome/devtools/content/webaudioeditor/controller.js
@@ -731,11 +724,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/uti
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/views/event-listeners-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/views/sources-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/debugger-commands.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/bundle.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/debugger.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/debugger.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/pretty-print-worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/source-map-worker.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/styles.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/definitions.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/filter.js
@@ -757,6 +750,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/ToolboxPro
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/about-devtools-toolbox.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/attach-thread.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/browser-menus.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/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-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
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/gDevTools.jsm
@@ -781,12 +777,18 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/computed/c
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.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
@@ -891,14 +893,29 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/telemetry.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/menus.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/batching.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/filters.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/sidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/requests.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/selection.js
+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/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/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
@@ -908,19 +925,41 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-e
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/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/performance-statistics-view.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
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/sidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/requests.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/sort.js
+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/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/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/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/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/format-utils.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
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/recording-button.js
@@ -1036,7 +1075,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/resp
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/types.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/e10s.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/enum.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/l10n.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/message.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/resize-commands.js
@@ -1060,15 +1098,18 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/re
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
@@ -1082,6 +1123,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/re
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
@@ -1115,6 +1157,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/developer-too
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-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
@@ -1145,6 +1188,7 @@ 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/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
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-proxy.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js
@@ -1158,7 +1202,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/webgl-utils.j
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/AbstractTreeItem.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/BarGraphWidget.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/BreadcrumbsWidget.jsm
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/Chart.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/Chart.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/ColorWidget.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/CubicBezierPresets.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/CubicBezierWidget.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/FastListWidget.js
@@ -1208,7 +1253,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEdi
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleSheetEditor.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-commands.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/audio/shutter.wav
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/common.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/splitters.css
@@ -1281,16 +1325,19 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-conso
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/types.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/context-menu.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/id-generator.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/messages.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/variables-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-connection-proxy.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/addons.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-manager.js
@@ -1359,13 +1406,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/promises.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/reflow.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/root.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/script.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/settings.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/source.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/storage.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/string.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/styleeditor.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/styles.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/stylesheets.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/tab.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/timeline.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/TabSources.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/actor-registry-utils.js
@@ -1376,13 +1423,16 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-de
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-listeners.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-worker-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/webconsole-worker-listeners.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webaudio.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webbrowser.js
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/worker-list.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/child.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/content-globals.js
@@ -1408,7 +1458,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/acorn/acorn.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/acorn/acorn_loose.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/acorn/walk.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/apps/Devices.jsm
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/apps/Simulator.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/shared/apps/app-actor-front.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/async-storage.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/async-utils.js
@@ -1454,13 +1503,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/preference.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/profiler.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/promises.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/reflow.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/settings.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/storage.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/string.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/styles.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/stylesheets.js
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/commands/addon.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/appcache.js
@@ -1615,7 +1664,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/profiler.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/promises.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/reflow.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/script.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/settings.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/source.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/storage.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/string.js
@@ -1624,6 +1672,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/styles.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/stylesheets.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/timeline.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webaudio.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webextension-inspected-window.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webgl.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/sprintfjs/sprintf.js
@@ -1656,7 +1705,6 @@ lib/firefox/browser/chrome/devtools/skin/computed.css
lib/firefox/browser/chrome/devtools/skin/dark-theme.css
lib/firefox/browser/chrome/devtools/skin/debugger.css
lib/firefox/browser/chrome/devtools/skin/devtools-browser.css
-lib/firefox/browser/chrome/devtools/skin/dom.css
lib/firefox/browser/chrome/devtools/skin/firebug-theme.css
lib/firefox/browser/chrome/devtools/skin/floating-scrollbars-dark-theme.css
lib/firefox/browser/chrome/devtools/skin/floating-scrollbars-responsive-design.css
@@ -1702,20 +1750,6 @@ lib/firefox/browser/chrome/devtools/skin/images/dock-side.svg
lib/firefox/browser/chrome/devtools/skin/images/dock-undock.svg
lib/firefox/browser/chrome/devtools/skin/images/dropmarker.svg
lib/firefox/browser/chrome/devtools/skin/images/editor-error.png
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-command-pick.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-canvas.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-debugger.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-dom.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-inspector.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-memory.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-network.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-profiler.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-scratchpad.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-shadereditor.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-storage.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-styleeditor.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-webaudio.svg
-lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-webconsole.svg
lib/firefox/browser/chrome/devtools/skin/images/fast-forward.svg
lib/firefox/browser/chrome/devtools/skin/images/filetypes/dir-close.svg
lib/firefox/browser/chrome/devtools/skin/images/filetypes/dir-open.svg
@@ -1925,6 +1959,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/preferences/privacy.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/search.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/security.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/selectBookmark.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences/siteDataSettings.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/sync.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/tabs.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/translation.dtd
@@ -2303,16 +2338,12 @@ lib/firefox/browser/chrome/webide/content/details.js
lib/firefox/browser/chrome/webide/content/details.xhtml
lib/firefox/browser/chrome/webide/content/devicepreferences.js
lib/firefox/browser/chrome/webide/content/devicepreferences.xhtml
-lib/firefox/browser/chrome/webide/content/devicesettings.js
-lib/firefox/browser/chrome/webide/content/devicesettings.xhtml
lib/firefox/browser/chrome/webide/content/logs.js
lib/firefox/browser/chrome/webide/content/logs.xhtml
lib/firefox/browser/chrome/webide/content/monitor.js
lib/firefox/browser/chrome/webide/content/monitor.xhtml
lib/firefox/browser/chrome/webide/content/newapp.js
lib/firefox/browser/chrome/webide/content/newapp.xul
-lib/firefox/browser/chrome/webide/content/permissionstable.js
-lib/firefox/browser/chrome/webide/content/permissionstable.xhtml
lib/firefox/browser/chrome/webide/content/prefs.js
lib/firefox/browser/chrome/webide/content/prefs.xhtml
lib/firefox/browser/chrome/webide/content/project-listing.js
@@ -2340,7 +2371,6 @@ lib/firefox/browser/chrome/webide/skin/monitor.css
lib/firefox/browser/chrome/webide/skin/newapp.css
lib/firefox/browser/chrome/webide/skin/noise.png
lib/firefox/browser/chrome/webide/skin/panel-listing.css
-lib/firefox/browser/chrome/webide/skin/permissionstable.css
lib/firefox/browser/chrome/webide/skin/rocket.svg
lib/firefox/browser/chrome/webide/skin/runtimedetails.css
lib/firefox/browser/chrome/webide/skin/simulator.css
@@ -2372,12 +2402,9 @@ lib/firefox/browser/defaults/preferences/firefox-l10n.js
lib/firefox/browser/defaults/preferences/firefox.js
lib/firefox/browser/defaults/preferences/webide-prefs.js
lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/firefox/browser/features/aushelper@mozilla.org/bootstrap.js
lib/firefox/browser/features/aushelper@mozilla.org/install.rdf
-lib/firefox/browser/features/deployment-checker@mozilla.org/bootstrap.js
-lib/firefox/browser/features/deployment-checker@mozilla.org/install.rdf
lib/firefox/browser/features/e10srollout@mozilla.org/bootstrap.js
lib/firefox/browser/features/e10srollout@mozilla.org/install.rdf
lib/firefox/browser/features/firefox@getpocket.com/bootstrap.js
@@ -2409,8 +2436,6 @@ lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/sig
lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_firefoxlogo@2x.png
lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_help@1x.png
lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_help@2x.png
-lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_or@1x.png
-lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_or@2x.png
lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/tag_close@1x.png
lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/tag_close@2x.png
lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/tag_closeactive@1x.png
@@ -2493,6 +2518,7 @@ 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/ExtensionsUI.jsm
lib/firefox/browser/modules/Feeds.jsm
lib/firefox/browser/modules/FormSubmitObserver.jsm
lib/firefox/browser/modules/FormValidationHandler.jsm
@@ -2520,13 +2546,13 @@ lib/firefox/browser/modules/Sanitizer.jsm
lib/firefox/browser/modules/ScrollbarSampler.jsm
lib/firefox/browser/modules/SelfSupportBackend.jsm
lib/firefox/browser/modules/ShellService.jsm
+lib/firefox/browser/modules/SiteDataManager.jsm
lib/firefox/browser/modules/SitePermissions.jsm
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/client/framework/gDevTools.jsm
lib/firefox/browser/modules/devtools/gDevTools.jsm
lib/firefox/browser/modules/distribution.js
lib/firefox/browser/modules/experiments/Experiments.jsm
@@ -2576,9 +2602,6 @@ lib/firefox/chrome/chrome.manifest
lib/firefox/chrome/en-US/locale/en-US/alerts/alert.dtd
lib/firefox/chrome/en-US/locale/en-US/alerts/alert.properties
lib/firefox/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties
-lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.dtd
-lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.properties
-lib/firefox/chrome/en-US/locale/en-US/formautofill/requestAutocomplete.dtd
lib/firefox/chrome/en-US/locale/en-US/global-platform/mac/accessible.properties
lib/firefox/chrome/en-US/locale/en-US/global-platform/mac/intl.properties
lib/firefox/chrome/en-US/locale/en-US/global-platform/mac/platformKeys.properties
@@ -2684,7 +2707,6 @@ lib/firefox/chrome/en-US/locale/en-US/global/xbl.properties
lib/firefox/chrome/en-US/locale/en-US/global/xml/prettyprint.dtd
lib/firefox/chrome/en-US/locale/en-US/global/xslt/xslt.properties
lib/firefox/chrome/en-US/locale/en-US/global/xul.properties
-lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/downloads.dtd
lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/downloads.properties
lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/settingsChange.dtd
lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/unknownContentType.dtd
@@ -2751,6 +2773,7 @@ lib/firefox/chrome/marionette/content/proxy.js
lib/firefox/chrome/marionette/content/server.js
lib/firefox/chrome/marionette/content/session.js
lib/firefox/chrome/marionette/content/simpletest.js
+lib/firefox/chrome/marionette/content/wait.js
lib/firefox/chrome/pippki/content/pippki/CAOverlay.xul
lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul
lib/firefox/chrome/pippki/content/pippki/OrphanOverlay.xul
@@ -2790,16 +2813,16 @@ lib/firefox/chrome/pippki/content/pippki/setp12password.xul
lib/firefox/chrome/pippki/content/pippki/viewCertDetails.xul
lib/firefox/chrome/recording/content/recording.js
lib/firefox/chrome/recording/content/recording.xul
-lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.js
-lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.xul
lib/firefox/chrome/toolkit/content/extensions/ext-alarms.js
lib/firefox/chrome/toolkit/content/extensions/ext-backgroundPage.js
lib/firefox/chrome/toolkit/content/extensions/ext-browser-content.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-backgroundPage.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-extension.js
+lib/firefox/chrome/toolkit/content/extensions/ext-c-identity.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-runtime.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-storage.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-test.js
+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
@@ -2813,6 +2836,7 @@ 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
lib/firefox/chrome/toolkit/content/extensions/schemas/alarms.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/contextual_identities.json
lib/firefox/chrome/toolkit/content/extensions/schemas/cookies.json
lib/firefox/chrome/toolkit/content/extensions/schemas/downloads.json
lib/firefox/chrome/toolkit/content/extensions/schemas/events.json
@@ -2820,6 +2844,7 @@ lib/firefox/chrome/toolkit/content/extensions/schemas/experiments.json
lib/firefox/chrome/toolkit/content/extensions/schemas/extension.json
lib/firefox/chrome/toolkit/content/extensions/schemas/extension_types.json
lib/firefox/chrome/toolkit/content/extensions/schemas/i18n.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/identity.json
lib/firefox/chrome/toolkit/content/extensions/schemas/idle.json
lib/firefox/chrome/toolkit/content/extensions/schemas/management.json
lib/firefox/chrome/toolkit/content/extensions/schemas/manifest.json
@@ -2831,8 +2856,6 @@ lib/firefox/chrome/toolkit/content/extensions/schemas/test.json
lib/firefox/chrome/toolkit/content/extensions/schemas/top_sites.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/formautofill/requestAutocomplete.js
-lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.xhtml
lib/firefox/chrome/toolkit/content/gfxsanity/gfxFrameScript.js
lib/firefox/chrome/toolkit/content/gfxsanity/sanityparent.html
lib/firefox/chrome/toolkit/content/gfxsanity/sanitytest.html
@@ -2885,8 +2908,11 @@ 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
lib/firefox/chrome/toolkit/content/global/bindings/button.xml
+lib/firefox/chrome/toolkit/content/global/bindings/calendar.js
lib/firefox/chrome/toolkit/content/global/bindings/checkbox.xml
lib/firefox/chrome/toolkit/content/global/bindings/colorpicker.xml
+lib/firefox/chrome/toolkit/content/global/bindings/datekeeper.js
+lib/firefox/chrome/toolkit/content/global/bindings/datepicker.js
lib/firefox/chrome/toolkit/content/global/bindings/datetimebox.css
lib/firefox/chrome/toolkit/content/global/bindings/datetimebox.xml
lib/firefox/chrome/toolkit/content/global/bindings/datetimepicker.xml
@@ -2940,20 +2966,17 @@ lib/firefox/chrome/toolkit/content/global/contentAreaUtils.js
lib/firefox/chrome/toolkit/content/global/customizeToolbar.css
lib/firefox/chrome/toolkit/content/global/customizeToolbar.js
lib/firefox/chrome/toolkit/content/global/customizeToolbar.xul
-lib/firefox/chrome/toolkit/content/global/devicestorage.properties
+lib/firefox/chrome/toolkit/content/global/datepicker.xhtml
lib/firefox/chrome/toolkit/content/global/directionDetector.html
lib/firefox/chrome/toolkit/content/global/editMenuOverlay.js
lib/firefox/chrome/toolkit/content/global/editMenuOverlay.xul
-lib/firefox/chrome/toolkit/content/global/extensions.js
lib/firefox/chrome/toolkit/content/global/filepicker.js
lib/firefox/chrome/toolkit/content/global/filepicker.properties
lib/firefox/chrome/toolkit/content/global/filepicker.xul
lib/firefox/chrome/toolkit/content/global/findUtils.js
lib/firefox/chrome/toolkit/content/global/finddialog.js
lib/firefox/chrome/toolkit/content/global/finddialog.xul
-lib/firefox/chrome/toolkit/content/global/forms.js
lib/firefox/chrome/toolkit/content/global/globalOverlay.js
-lib/firefox/chrome/toolkit/content/global/gmp-sources/eme-adobe.json
lib/firefox/chrome/toolkit/content/global/gmp-sources/openh264.json
lib/firefox/chrome/toolkit/content/global/gmp-sources/widevinecdm.json
lib/firefox/chrome/toolkit/content/global/license.html
@@ -2966,7 +2989,6 @@ lib/firefox/chrome/toolkit/content/global/notfound.wav
lib/firefox/chrome/toolkit/content/global/platformHTMLBindings.xml
lib/firefox/chrome/toolkit/content/global/plugins.css
lib/firefox/chrome/toolkit/content/global/plugins.html
-lib/firefox/chrome/toolkit/content/global/preload.js
lib/firefox/chrome/toolkit/content/global/printPageSetup.js
lib/firefox/chrome/toolkit/content/global/printPageSetup.xul
lib/firefox/chrome/toolkit/content/global/printPreviewBindings.xml
@@ -2987,11 +3009,9 @@ lib/firefox/chrome/toolkit/content/global/resetProfile.css
lib/firefox/chrome/toolkit/content/global/resetProfile.js
lib/firefox/chrome/toolkit/content/global/resetProfile.xul
lib/firefox/chrome/toolkit/content/global/resetProfileProgress.xul
-lib/firefox/chrome/toolkit/content/global/select-child.js
lib/firefox/chrome/toolkit/content/global/selectDialog.js
lib/firefox/chrome/toolkit/content/global/selectDialog.xul
lib/firefox/chrome/toolkit/content/global/simplifyMode.css
-lib/firefox/chrome/toolkit/content/global/svg/svgBindings.xml
lib/firefox/chrome/toolkit/content/global/tabprompts.css
lib/firefox/chrome/toolkit/content/global/tabprompts.xml
lib/firefox/chrome/toolkit/content/global/test-ipc.xul
@@ -3011,11 +3031,6 @@ lib/firefox/chrome/toolkit/content/global/xml/XMLPrettyPrint.css
lib/firefox/chrome/toolkit/content/global/xml/XMLPrettyPrint.xml
lib/firefox/chrome/toolkit/content/global/xml/XMLPrettyPrint.xsl
lib/firefox/chrome/toolkit/content/global/xul.css
-lib/firefox/chrome/toolkit/content/mozapps/downloads/DownloadProgressListener.js
-lib/firefox/chrome/toolkit/content/mozapps/downloads/download.xml
-lib/firefox/chrome/toolkit/content/mozapps/downloads/downloads.css
-lib/firefox/chrome/toolkit/content/mozapps/downloads/downloads.js
-lib/firefox/chrome/toolkit/content/mozapps/downloads/downloads.xul
lib/firefox/chrome/toolkit/content/mozapps/downloads/unknownContentType.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/OpenH264-license.txt
lib/firefox/chrome/toolkit/content/mozapps/extensions/about.js
@@ -3060,6 +3075,8 @@ lib/firefox/chrome/toolkit/content/mozapps/xpinstall/xpinstallItem.xml
lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.js
lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.xul
lib/firefox/chrome/toolkit/content/passwordmgr/recipes.json
+lib/firefox/chrome/toolkit/content/requestautocomplete/requestAutocomplete.js
+lib/firefox/chrome/toolkit/content/requestautocomplete/requestAutocomplete.xhtml
lib/firefox/chrome/toolkit/content/satchel/formSubmitListener.js
lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.css
lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.xml
@@ -3142,7 +3159,9 @@ lib/firefox/chrome/toolkit/skin/classic/global/colorpicker.css
lib/firefox/chrome/toolkit/skin/classic/global/commonDialog.css
lib/firefox/chrome/toolkit/skin/classic/global/config.css
lib/firefox/chrome/toolkit/skin/classic/global/customizeToolbar.css
+lib/firefox/chrome/toolkit/skin/classic/global/datetimeinputpickers.css
lib/firefox/chrome/toolkit/skin/classic/global/datetimepicker.css
+lib/firefox/chrome/toolkit/skin/classic/global/datetimepopup.css
lib/firefox/chrome/toolkit/skin/classic/global/dialog.css
lib/firefox/chrome/toolkit/skin/classic/global/dirListing/dirListing.css
lib/firefox/chrome/toolkit/skin/classic/global/dirListing/folder.png
@@ -3153,6 +3172,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/dropmarker.css
lib/firefox/chrome/toolkit/skin/classic/global/expander.css
lib/firefox/chrome/toolkit/skin/classic/global/filefield.css
lib/firefox/chrome/toolkit/skin/classic/global/filepicker.css
+lib/firefox/chrome/toolkit/skin/classic/global/filters.svg
lib/firefox/chrome/toolkit/skin/classic/global/findBar.css
lib/firefox/chrome/toolkit/skin/classic/global/global.css
lib/firefox/chrome/toolkit/skin/classic/global/globalBindings.xml
@@ -3174,6 +3194,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_favicon.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_large.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/blocked.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/calendar-arrows.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/close-inverted.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/close-inverted@2x.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/close.png
@@ -3192,10 +3213,12 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/information-32.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/input-clear.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/loading.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/loading@2x.png
+lib/firefox/chrome/toolkit/skin/classic/global/icons/menubutton-dropmarker.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/question-16.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/question-64.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/resizer-rtl.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/resizer.png
+lib/firefox/chrome/toolkit/skin/classic/global/icons/spinner-arrows.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/sslWarning.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/tabprompts-bgtexture.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-16.png
@@ -3215,35 +3238,18 @@ lib/firefox/chrome/toolkit/skin/classic/global/listbox.css
lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css
lib/firefox/chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/closeCaptionButton.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/closeCaptionButton@2x.png
+lib/firefox/chrome/toolkit/skin/classic/global/media/closedCaptionButton.svg
lib/firefox/chrome/toolkit/skin/classic/global/media/error.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/fullscreenButton.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/fullscreenButton@2x.png
+lib/firefox/chrome/toolkit/skin/classic/global/media/fullscreenButton.svg
lib/firefox/chrome/toolkit/skin/classic/global/media/imagedoc-darknoise.png
lib/firefox/chrome/toolkit/skin/classic/global/media/imagedoc-lightnoise.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/muteButton.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/muteButton@2x.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/noAudio.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/noAudio@2x.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/pauseButton.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/pauseButton@2x.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/playButton.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/playButton@2x.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/scrubberThumb.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/scrubberThumb@2x.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/scrubberThumbWide.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/scrubberThumbWide@2x.png
+lib/firefox/chrome/toolkit/skin/classic/global/media/muteButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/pauseButton.svg
+lib/firefox/chrome/toolkit/skin/classic/global/media/playButton.svg
lib/firefox/chrome/toolkit/skin/classic/global/media/stalled.png
lib/firefox/chrome/toolkit/skin/classic/global/media/throbber.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/unmuteButton.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/unmuteButton@2x.png
lib/firefox/chrome/toolkit/skin/classic/global/media/videoClickToPlayButton.svg
lib/firefox/chrome/toolkit/skin/classic/global/media/videocontrols.css
-lib/firefox/chrome/toolkit/skin/classic/global/media/volume-empty.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/volume-empty@2x.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/volume-full.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/volume-full@2x.png
lib/firefox/chrome/toolkit/skin/classic/global/menu.css
lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-active.svg
lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-black.svg
@@ -3298,7 +3304,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/splitter/grip-top.gif
lib/firefox/chrome/toolkit/skin/classic/global/tabbox.css
lib/firefox/chrome/toolkit/skin/classic/global/tabprompts.css
lib/firefox/chrome/toolkit/skin/classic/global/textbox.css
-lib/firefox/chrome/toolkit/skin/classic/global/timepicker.css
lib/firefox/chrome/toolkit/skin/classic/global/toolbar.css
lib/firefox/chrome/toolkit/skin/classic/global/toolbar/chevron-inverted.png
lib/firefox/chrome/toolkit/skin/classic/global/toolbar/chevron.gif
@@ -3318,7 +3323,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutProfiles.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutServiceWorkers.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloadIcon.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloads.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/unknownContentType.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/about.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-error.svg
@@ -3374,9 +3378,7 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/update/updates.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
-lib/firefox/components/AppsService.js
lib/firefox/components/BrowserElementParent.js
-lib/firefox/components/BrowserElementProxy.js
lib/firefox/components/CSSUnprefixingService.js
lib/firefox/components/ColorAnalyzer.js
lib/firefox/components/ConsoleAPIStorage.js
@@ -3389,12 +3391,10 @@ lib/firefox/components/FormAutofillStartup.js
lib/firefox/components/FormHistoryStartup.js
lib/firefox/components/FxAccountsPush.js
lib/firefox/components/MainProcessSingleton.js
-lib/firefox/components/MozKeyboard.js
lib/firefox/components/NetworkGeolocationProvider.js
lib/firefox/components/NotificationStorage.js
lib/firefox/components/PageIconProtocolHandler.js
lib/firefox/components/PageThumbsProtocol.js
-lib/firefox/components/PermissionSettings.js
lib/firefox/components/PlacesCategoriesStarter.js
lib/firefox/components/PresentationControlService.js
lib/firefox/components/PresentationDataChannelSessionTransport.js
@@ -3404,7 +3404,6 @@ lib/firefox/components/Push.js
lib/firefox/components/PushComponents.js
lib/firefox/components/RemoteWebNavigation.js
lib/firefox/components/SecurityReporter.js
-lib/firefox/components/SettingsManager.js
lib/firefox/components/SiteSpecificUserAgent.js
lib/firefox/components/SlowScriptDebug.js
lib/firefox/components/TelemetryStartup.js
@@ -3418,7 +3417,6 @@ lib/firefox/components/addonManager.js
lib/firefox/components/amContentHandler.js
lib/firefox/components/amInstallTrigger.js
lib/firefox/components/amWebAPI.js
-lib/firefox/components/amWebInstallListener.js
lib/firefox/components/captivedetect.js
lib/firefox/components/components.manifest
lib/firefox/components/contentAreaDropListener.js
@@ -3474,8 +3472,8 @@ lib/firefox/dictionaries/en-US.aff
lib/firefox/dictionaries/en-US.dic
lib/firefox/firefox
lib/firefox/firefox-bin
-lib/firefox/gmp-clearkey/0.1/clearkey.info
lib/firefox/gmp-clearkey/0.1/libclearkey.so
+lib/firefox/gmp-clearkey/0.1/manifest.json
lib/firefox/greprefs.js
${PLIST.gtk3}lib/firefox/gtk2/libmozgtk.so
lib/firefox/hyphenation/hyph_af.dic
@@ -3515,17 +3513,15 @@ lib/firefox/hyphenation/hyph_sv.dic
lib/firefox/hyphenation/hyph_tr.dic
lib/firefox/hyphenation/hyph_uk.dic
lib/firefox/liblgpllibs.so
-${PLIST.gtk3}lib/firefox/libmozgtk.so
${PLIST.avx86}lib/firefox/libmozavcodec.so
${PLIST.avx86}lib/firefox/libmozavutil.so
+${PLIST.gtk3}lib/firefox/libmozgtk.so
lib/firefox/libmozsqlite3.so
lib/firefox/libxul.so
lib/firefox/modules/AboutReader.jsm
lib/firefox/modules/AddonManager.jsm
lib/firefox/modules/AddonWatcher.jsm
lib/firefox/modules/AppConstants.jsm
-lib/firefox/modules/AppsServiceChild.jsm
-lib/firefox/modules/AppsUtils.jsm
lib/firefox/modules/AsyncPrefs.jsm
lib/firefox/modules/AsyncShutdown.jsm
lib/firefox/modules/AsyncSpellCheckTestHelper.jsm
@@ -3585,7 +3581,6 @@ lib/firefox/modules/DownloadLastDir.jsm
lib/firefox/modules/DownloadList.jsm
lib/firefox/modules/DownloadPaths.jsm
lib/firefox/modules/DownloadStore.jsm
-lib/firefox/modules/DownloadTaskbarProgress.jsm
lib/firefox/modules/DownloadUIHelper.jsm
lib/firefox/modules/DownloadUtils.jsm
lib/firefox/modules/Downloads.jsm
@@ -3614,11 +3609,9 @@ lib/firefox/modules/FxAccounts.jsm
lib/firefox/modules/FxAccountsClient.jsm
lib/firefox/modules/FxAccountsCommon.js
lib/firefox/modules/FxAccountsConfig.jsm
-lib/firefox/modules/FxAccountsOAuthClient.jsm
lib/firefox/modules/FxAccountsOAuthGrantClient.jsm
lib/firefox/modules/FxAccountsProfile.jsm
lib/firefox/modules/FxAccountsProfileClient.jsm
-lib/firefox/modules/FxAccountsPush.js
lib/firefox/modules/FxAccountsStorage.jsm
lib/firefox/modules/FxAccountsWebChannel.jsm
lib/firefox/modules/GCTelemetry.jsm
@@ -3635,7 +3628,6 @@ lib/firefox/modules/InlineSpellCheckerContent.jsm
lib/firefox/modules/InsecurePasswordUtils.jsm
lib/firefox/modules/Integration.jsm
lib/firefox/modules/JSONFile.jsm
-lib/firefox/modules/Keyboard.jsm
lib/firefox/modules/LegacyExtensionsUtils.jsm
lib/firefox/modules/LightweightThemeConsumer.jsm
lib/firefox/modules/LightweightThemeManager.jsm
@@ -3649,7 +3641,9 @@ lib/firefox/modules/LoginManagerContextMenu.jsm
lib/firefox/modules/LoginManagerParent.jsm
lib/firefox/modules/LoginRecipes.jsm
lib/firefox/modules/LoginStore.jsm
+lib/firefox/modules/Manifest.jsm
lib/firefox/modules/ManifestFinder.jsm
+lib/firefox/modules/ManifestIcons.jsm
lib/firefox/modules/ManifestObtainer.jsm
lib/firefox/modules/ManifestProcessor.jsm
lib/firefox/modules/MatchPattern.jsm
@@ -3673,9 +3667,6 @@ lib/firefox/modules/PerformanceStats-content.js
lib/firefox/modules/PerformanceStats.jsm
lib/firefox/modules/PerformanceWatcher-content.js
lib/firefox/modules/PerformanceWatcher.jsm
-lib/firefox/modules/PermissionSettings.jsm
-lib/firefox/modules/PermissionsInstaller.jsm
-lib/firefox/modules/PermissionsTable.jsm
lib/firefox/modules/PermissionsUtils.jsm
lib/firefox/modules/PlacesBackups.jsm
lib/firefox/modules/PlacesDBUtils.jsm
@@ -3688,7 +3679,6 @@ lib/firefox/modules/PluralForm.jsm
lib/firefox/modules/PopupNotifications.jsm
lib/firefox/modules/Preferences.jsm
lib/firefox/modules/Prefetcher.jsm
-lib/firefox/modules/PresentationApp.jsm
lib/firefox/modules/PresentationDeviceInfoManager.jsm
lib/firefox/modules/PrivateBrowsingUtils.jsm
lib/firefox/modules/ProfileAge.jsm
@@ -3726,8 +3716,6 @@ lib/firefox/modules/SelectParentHelper.jsm
lib/firefox/modules/ServiceRequest.jsm
lib/firefox/modules/Services.jsm
lib/firefox/modules/SessionRecorder.jsm
-lib/firefox/modules/SettingsDB.jsm
-lib/firefox/modules/SettingsRequestManager.jsm
lib/firefox/modules/SharedPromptUtils.jsm
lib/firefox/modules/ShimWaiver.jsm
lib/firefox/modules/ShortcutUtils.jsm
@@ -3736,7 +3724,6 @@ lib/firefox/modules/Sntp.jsm
lib/firefox/modules/SpatialNavigation.jsm
lib/firefox/modules/Sqlite.jsm
lib/firefox/modules/Subprocess.jsm
-lib/firefox/modules/SystemUpdateService.jsm
lib/firefox/modules/Task.jsm
lib/firefox/modules/TelemetryArchive.jsm
lib/firefox/modules/TelemetryController.jsm
@@ -4051,13 +4038,10 @@ lib/firefox/modules/ctypes.jsm
lib/firefox/modules/debug.js
lib/firefox/modules/devtools/Console.jsm
lib/firefox/modules/devtools/Loader.jsm
-lib/firefox/modules/devtools/Simulator.jsm
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/Console.jsm
lib/firefox/modules/devtools/shared/Loader.jsm
-lib/firefox/modules/devtools/shared/apps/Simulator.jsm
lib/firefox/modules/identity/FirefoxAccounts.jsm
lib/firefox/modules/identity/Identity.jsm
lib/firefox/modules/identity/IdentityProvider.jsm
@@ -4088,9 +4072,6 @@ lib/firefox/modules/osfile/osfile_shared_front.jsm
lib/firefox/modules/osfile/osfile_unix_allthreads.jsm
lib/firefox/modules/osfile/osfile_unix_back.jsm
lib/firefox/modules/osfile/osfile_unix_front.jsm
-lib/firefox/modules/osfile/osfile_win_allthreads.jsm
-lib/firefox/modules/osfile/osfile_win_back.jsm
-lib/firefox/modules/osfile/osfile_win_front.jsm
lib/firefox/modules/osfile/ospath.jsm
lib/firefox/modules/osfile/ospath_unix.jsm
lib/firefox/modules/osfile/ospath_win.jsm
@@ -4113,6 +4094,7 @@ lib/firefox/modules/services-common/hawkclient.js
lib/firefox/modules/services-common/hawkrequest.js
lib/firefox/modules/services-common/kinto-http-client.js
lib/firefox/modules/services-common/kinto-offline-client.js
+lib/firefox/modules/services-common/kinto-storage-adapter.js
lib/firefox/modules/services-common/logmanager.js
lib/firefox/modules/services-common/observers.js
lib/firefox/modules/services-common/rest.js
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index cf30c93edc9..7bd64711455 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,36 +1,36 @@
-$NetBSD: distinfo,v 1.277 2017/03/30 19:11:14 ryoon Exp $
+$NetBSD: distinfo,v 1.278 2017/04/27 01:49:47 ryoon Exp $
-SHA1 (firefox-52.0.2.source.tar.xz) = 5631e49d8ae064764b64643534acfdd619061ba9
-RMD160 (firefox-52.0.2.source.tar.xz) = 2a02867e597ba41fa1048c9b9458449b8c63f8b9
-SHA512 (firefox-52.0.2.source.tar.xz) = 15668625d212acf874b560d0adf738faf3e0df532c549ab94e1d91944542e13bf16265f08fca1eded42820f9b7ad3f0ff70a8b5bc9adde0a79d11e022bb1158e
-Size (firefox-52.0.2.source.tar.xz) = 211407880 bytes
-SHA1 (patch-aa) = c1084caa275e57b716c3499301f7fc3f99ef5026
-SHA1 (patch-ao) = 1564bc503670dc07ec8b9b43927f0c5879f3a44d
+SHA1 (firefox-53.0.source.tar.xz) = 5a617605f60da87f33bc82eaa46710666f134d84
+RMD160 (firefox-53.0.source.tar.xz) = 470d1214f98c2c75e27e5084c1176eacb8ba1f4b
+SHA512 (firefox-53.0.source.tar.xz) = 36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886
+Size (firefox-53.0.source.tar.xz) = 213676692 bytes
+SHA1 (patch-aa) = 60b2a879dac3f122828042b37aab597b07643a87
SHA1 (patch-as) = 632ebd35287f8f97d18721d39a0514d4cdbb12cc
-SHA1 (patch-browser_installer_package-manifest.in) = d1f003f9ac65e12eb04b1d19a4d9a780bded9fd9
-SHA1 (patch-build_buildconfig.py) = 9ed9af92d8fd1015d15c658b649a6c9d9a6b5c1b
-SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
+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 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6
-SHA1 (patch-build_moz.configure_old.configure) = d57f718ff0c1d2901ec9f4c958f5a7323ee7c700
+SHA1 (patch-build_moz.configure_old.configure) = 2f452e717f0c9dc8224019b58e531e5e95cc7697
SHA1 (patch-build_pgo_profileserver.py) = 48ad50f716eda2157cbc225298f6672f164b4207
-SHA1 (patch-config_Makefile.in) = fc6d4de55f4d9ab8598d5b89e6630e4685af1795
+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) = fd0cb4d2061af1eaa34313370a57720ed693607f
+SHA1 (patch-config_system-headers) = 0b75cf68b0d2682e3453df02ce759b0cc7f48bf4
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_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c
SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = 34c89f93b6a849b9daeeed43d4a9a91a2a2080c4
-SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 9961e956016f274a1b9b52b489bd749e8e2bbcb6
+SHA1 (patch-dom_media_webrtc_MediaEngine.h) = f3b1c71dfa10054d70f8f953263d5cf7adfce8ba
+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) = 2aaf5f82a57dbb375558442718c239e2e7da1406
+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
@@ -41,8 +41,6 @@ SHA1 (patch-gfx_skia_moz.build) = 7363e76ac75e27cffe5ee1194741d444a625b871
SHA1 (patch-gfx_thebes_moz.build) = 0435f36d573fee1bb300612e4b7dc6fcda2d5456
SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf
SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 79587891c2a1716a27d4dca0e5b5880069a430eb
-SHA1 (patch-image_Downscaler.h) = c92aa17c22310d0b16cdc4bb778d3029c4b154e3
-SHA1 (patch-image_decoders_nsIconDecoder.cpp) = 804e3bdade8b0c56979e811a0e44df5eaf158381
SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f
SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655
SHA1 (patch-intl_unicharutil_util_moz.build) = 2e604c8695b490657ee14cae01ca84d7bd51236c
@@ -56,51 +54,44 @@ SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 5313c4097c278640573c7e1
SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba4e0872490f870e7d2f468e1fe87c33cf9a3500
SHA1 (patch-ipc_chromium_src_build_build__config.h) = 9e4f15226c494f5015dbea3a0df6af851449ae15
SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 33ea11a8c23f2fefcb318342ac9e94d3885cb3b1
-SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = b9c202645a4b6f691a6eb81ef0daf4278d10dcc4
+SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 37fca99dc5359a7c1403b7674080bd27b0a5eafe
SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782
SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = b44992a869d6d08809a9edc28f1ad6f40632d392
SHA1 (patch-js_src_moz.build) = ce9110506086d15a011d0985b58dd4e7d1b6ec5f
SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e
-SHA1 (patch-media_libcubeb_src_cubeb.c) = 3be0bf511cbd3b1c691fadb081acaf38838c36f4
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = c59eaf40973193885f32819b465b401c1ba45fce
-SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = e15cc2d0c220738ccfd57f79eec242095c8ea536
-SHA1 (patch-media_libcubeb_src_moz.build) = 2b6d7e3bb265220decf9629b1d4b980cadb363fb
-SHA1 (patch-media_libcubeb_tests_moz.build) = 63d8b749a6ebbe8fd662ce1e2bde6aa9cb0b807d
-SHA1 (patch-media_libcubeb_update.sh) = 333e1e2898f1703a298ba2a3f731ffc63f09a184
+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__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_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
+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_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7
-SHA1 (patch-media_webrtc_signaling_test_common.build) = 75729fb2983b272e433ff07853902f4b8d363ba6
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 22f4d0bb290f02bf6158facc1e47354dc8a0b211
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 07158ae777fc4743f17cedc106cc9c85fb327d55
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 9fb89480e47fce4df99a82fe90259bf444bd2e11
+SHA1 (patch-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-memory_mozalloc_mozalloc__abort.cpp) = 9e94002b01664a42af415639dc94caa127a73ac0
SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
-SHA1 (patch-mobile_android_installer_Makefile.in) = fcf4ab03ab033f8637813e30b75a0a2050450933
-SHA1 (patch-mobile_android_installer_package-manifest.in) = e978af41ff0c4b5e477bd3387594e238dc2ec224
SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 133b1658839d9b0f932a601670862c1f4cd70881
-SHA1 (patch-modules_woff2_src_store_bytes.h) = f7081a6ffadc79e19f30137ca805b962e60821e8
-SHA1 (patch-modules_woff2_src_woff2_common.cc) = 77dec15dad41d47a3f85e578587c3a137a8dc7f3
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_protobuf_src_google_protobuf_stubs_platform__macros.h) = bd4388323851fcb7b10392d6a27f9bc56633a52e
SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
-SHA1 (patch-toolkit_library_dependentlibs.py) = d7ee2ca0a47cd3fba6bb249c5b2e83b619640dde
-SHA1 (patch-toolkit_library_moz.build) = d4136a5d3c42f2a44155f029a3201959273c5e94
-SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 29ae1476560623bf1871c927d3728761112529e9
+SHA1 (patch-toolkit_library_moz.build) = 1abf1fb95d54ee7dea09d3f3ea6c27612b80d106
SHA1 (patch-toolkit_moz.configure) = 188d9b9ce6dd728f90f64d215db472758ad67a87
-SHA1 (patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js) = eacc4f45f724eb42869a1dba015e127e049fdec4
SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4db0dfc98ffeb09f524a471e6a727f2c3b045afe
SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 7f830c76dc9..47e4510bf66 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.90 2017/03/20 10:54:46 szptvlfn Exp $
+# $NetBSD: mozilla-common.mk,v 1.91 2017/04/27 01:49:47 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -51,7 +51,8 @@ CONFIGURE_ARGS+= --with-pthreads
CONFIGURE_ARGS+= --enable-system-cairo
CONFIGURE_ARGS+= --enable-system-pixman
CONFIGURE_ARGS+= --with-system-libvpx
-CONFIGURE_ARGS+= --enable-system-hunspell
+# textproc/hunspell 1.3 is too old
+#CONFIGURE_ARGS+= --enable-system-hunspell
CONFIGURE_ARGS+= --enable-system-ffi
CONFIGURE_ARGS+= --with-system-icu
CONFIGURE_ARGS+= --with-system-nss
@@ -74,6 +75,8 @@ CONFIGURE_ARGS+= --enable-url-classifier
CONFIGURE_ARGS+= --disable-icf
CONFIGURE_ARGS+= --disable-updater
+CONFIGURE_ARGS+= --disable-rust
+
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= pre-configure
SUBST_MESSAGE.fix-paths= Fixing absolute paths.
@@ -191,7 +194,8 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
.include "../../multimedia/libvpx/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
-.include "../../textproc/hunspell/buildlink3.mk"
+# textproc/hunspell 1.3 is too old
+#.include "../../textproc/hunspell/buildlink3.mk"
.include "../../multimedia/ffmpeg3/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 3c1285d03f0..a4e9c2931f9 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-aa,v 1.51 2017/04/27 01:49:47 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-03-04 10:47:32.150192599 +0000
+--- old-configure.in.orig 2017-04-23 15:21:06.933492440 +0000
+++ old-configure.in
-@@ -2159,11 +2159,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
+@@ -2084,11 +2084,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -20,9 +20,9 @@ $NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 ryoon Exp $
MOZ_SYSTEM_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -2894,6 +2890,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -2818,6 +2814,9 @@ if test -n "$MOZ_WEBRTC"; then
+ AC_DEFINE(MOZ_WEBRTC_ASSERT_ALWAYS)
MOZ_RAW=1
- MOZ_VPX_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 ryoon Exp $
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -2936,7 +2935,7 @@ dnl Use integers over floats for audio o
+@@ -2860,7 +2859,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 +39,7 @@ $NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 ryoon Exp $
MOZ_SAMPLE_TYPE_S16=1
AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
AC_SUBST(MOZ_SAMPLE_TYPE_S16)
-@@ -3044,6 +3043,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
+@@ -2968,6 +2967,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
fi
fi
@@ -151,7 +151,7 @@ $NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 ryoon Exp $
dnl system libvpx Support
dnl ========================================================
MOZ_ARG_WITH_BOOL(system-libvpx,
-@@ -3208,6 +3312,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
+@@ -3128,6 +3232,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
AC_SUBST(MOZ_WEBM_ENCODER)
dnl ==================================
@@ -219,8 +219,8 @@ $NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 ryoon Exp $
dnl = Check alsa availability on Linux
dnl ==================================
-@@ -5023,6 +5188,27 @@ if test "$USE_FC_FREETYPE"; then
- fi
+@@ -4860,6 +5025,27 @@ dnl ====================================
+ AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
dnl ========================================================
+dnl Check for graphite2
diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao
deleted file mode 100644
index 5be1ac2a7be..00000000000
--- a/www/firefox/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.15 2016/06/16 12:08:21 ryoon Exp $
-
-* For devel/xulrunner*
-
---- toolkit/mozapps/installer/packager.mk.orig 2016-01-23 23:23:49.000000000 +0000
-+++ toolkit/mozapps/installer/packager.mk
-@@ -132,7 +132,7 @@ endif
- $(NSINSTALL) -D $(DESTDIR)$(bindir)
- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
--ifdef INSTALL_SDK # Here comes the hard part
-+ifeq ($(MOZ_APP_NAME),xulrunner)
- $(NSINSTALL) -D $(DESTDIR)$(includedir)
- (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
- (cd $(DESTDIR)$(includedir) && tar -xf -)
diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
new file mode 100644
index 00000000000..ba53ffc2246
--- /dev/null
+++ b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.12 2017/04/27 01:49:47 ryoon Exp $
+
+--- browser/app/nsBrowserApp.cpp.orig 2017-04-11 04:15:14.000000000 +0000
++++ browser/app/nsBrowserApp.cpp
+@@ -259,6 +259,9 @@ int main(int argc, char* argv[], char* e
+ {
+ mozilla::TimeStamp start = mozilla::TimeStamp::Now();
+
++ setenv("MOZ_GMP_PATH", "@PREFIX@/lib/browser_plugins/symlinks/gecko", 0);
++ setenv("MOZ_PLUGIN_PATH", "@PREFIX@/lib/browser_plugins/symlinks/gecko", 0);
++
+ #ifdef HAS_DLL_BLOCKLIST
+ DllBlocklist_Initialize();
+ #endif
diff --git a/www/firefox/patches/patch-browser_installer_package-manifest.in b/www/firefox/patches/patch-browser_installer_package-manifest.in
deleted file mode 100644
index 56d833cb200..00000000000
--- a/www/firefox/patches/patch-browser_installer_package-manifest.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-browser_installer_package-manifest.in,v 1.8 2017/01/25 13:24:51 ryoon Exp $
-
-Limit SPARC bits to just SPARC (untested, but fixes x86).
-
---- browser/installer/package-manifest.in.orig 2017-01-16 16:16:50.000000000 +0000
-+++ browser/installer/package-manifest.in
-@@ -575,7 +575,7 @@
- @RESPATH@/components/MozKeyboard.js
- @RESPATH@/components/InputMethod.manifest
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @RESPATH@/components/TestInterfaceJS.js
- @RESPATH@/components/TestInterfaceJS.manifest
- @RESPATH@/components/TestInterfaceJSMaplike.js
diff --git a/www/firefox/patches/patch-build_buildconfig.py b/www/firefox/patches/patch-build_buildconfig.py
deleted file mode 100644
index 4df517df24d..00000000000
--- a/www/firefox/patches/patch-build_buildconfig.py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-build_buildconfig.py,v 1.1 2017/03/07 20:45:43 ryoon Exp $
-
---- build/buildconfig.py.orig 2016-09-19 16:19:29.000000000 +0000
-+++ build/buildconfig.py
-@@ -16,5 +16,5 @@ for var in ('topsrcdir', 'topobjdir', 'd
- substs = dict(substs)
-
- for var in os.environ:
-- if var != 'SHELL' and var in substs:
-+ if var not in ('CPP', 'CXXCPP', 'SHELL') and var in substs:
- substs[var] = os.environ[var]
diff --git a/www/firefox/patches/patch-build_gyp.mozbuild b/www/firefox/patches/patch-build_gyp.mozbuild
index 42ea0d7b928..08bb9530dbc 100644
--- a/www/firefox/patches/patch-build_gyp.mozbuild
+++ b/www/firefox/patches/patch-build_gyp.mozbuild
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_gyp.mozbuild,v 1.4 2016/09/20 20:01:41 ryoon Exp $
+$NetBSD: patch-build_gyp.mozbuild,v 1.5 2017/04/27 01:49:47 ryoon Exp $
Hunk #1:
Try to add Video4Linux2 support
@@ -12,13 +12,13 @@ Hunk #3:
MacOS X SDK version should be able to configure with
./configure --enable-macos-target=VER
---- build/gyp.mozbuild.orig 2016-06-06 20:14:57.000000000 +0000
+--- build/gyp.mozbuild.orig 2017-04-11 04:15:17.000000000 +0000
+++ build/gyp.mozbuild
-@@ -14,6 +14,7 @@ gyp_vars = {
+@@ -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_use_chrome_plugins': 0,
+ 'clang': 1 if CONFIG['CLANG_CXX'] else 0,
diff --git a/www/firefox/patches/patch-build_moz.configure_old.configure b/www/firefox/patches/patch-build_moz.configure_old.configure
index 46b89686c96..8a59b19a6fd 100644
--- a/www/firefox/patches/patch-build_moz.configure_old.configure
+++ b/www/firefox/patches/patch-build_moz.configure_old.configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-build_moz.configure_old.configure,v 1.5 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-build_moz.configure_old.configure,v 1.6 2017/04/27 01:49:47 ryoon Exp $
---- build/moz.configure/old.configure.orig 2017-01-23 16:13:47.000000000 +0000
+--- build/moz.configure/old.configure.orig 2017-04-11 04:15:17.000000000 +0000
+++ build/moz.configure/old.configure
-@@ -276,6 +276,7 @@ def old_configure_options(*options):
+@@ -275,6 +275,7 @@ def old_configure_options(*options):
'--with-nspr-prefix',
'--with-nss-exec-prefix',
'--with-nss-prefix',
@@ -10,7 +10,7 @@ $NetBSD: patch-build_moz.configure_old.configure,v 1.5 2017/03/07 20:45:43 ryoon
'--with-pthreads',
'--with-qemu-exe',
'--with-sixgill',
-@@ -287,7 +288,12 @@ def old_configure_options(*options):
+@@ -286,7 +287,12 @@ def old_configure_options(*options):
'--with-system-libvpx',
'--with-system-nspr',
'--with-system-nss',
diff --git a/www/firefox/patches/patch-config_Makefile.in b/www/firefox/patches/patch-config_Makefile.in
index 2b02623b952..fa2c91b7463 100644
--- a/www/firefox/patches/patch-config_Makefile.in
+++ b/www/firefox/patches/patch-config_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-config_Makefile.in,v 1.10 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-config_Makefile.in,v 1.11 2017/04/27 01:49:47 ryoon Exp $
* Support system libraries
---- config/Makefile.in.orig 2016-09-19 16:19:29.000000000 +0000
+--- config/Makefile.in.orig 2016-10-31 20:15:27.000000000 +0000
+++ config/Makefile.in
@@ -41,6 +41,8 @@ export:: $(export-preqs)
$(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers
index a4656f1304b..353960d28e8 100644
--- a/www/firefox/patches/patch-config_system-headers
+++ b/www/firefox/patches/patch-config_system-headers
@@ -1,10 +1,10 @@
-$NetBSD: patch-config_system-headers,v 1.22 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.23 2017/04/27 01:49:47 ryoon Exp $
* Try to support Video4Linux2
* Resolve libm undefined error
* Support system libraries
---- config/system-headers.orig 2017-02-23 20:13:58.000000000 +0000
+--- config/system-headers.orig 2017-04-11 04:15:17.000000000 +0000
+++ config/system-headers
@@ -624,6 +624,7 @@ libgnome/libgnome.h
libgnomeui/gnome-icon-lookup.h
@@ -30,7 +30,7 @@ $NetBSD: patch-config_system-headers,v 1.22 2017/03/07 20:45:43 ryoon Exp $
#if MOZ_SYSTEM_HUNSPELL==1
hunspell.hxx
#endif
-@@ -1335,3 +1345,17 @@ unicode/utypes.h
+@@ -1337,3 +1347,17 @@ unicode/utypes.h
libutil.h
unwind.h
fenv.h
diff --git a/www/firefox/patches/patch-dom_media_CubebUtils.cpp b/www/firefox/patches/patch-dom_media_CubebUtils.cpp
new file mode 100644
index 00000000000..571f74fdb96
--- /dev/null
+++ b/www/firefox/patches/patch-dom_media_CubebUtils.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.1 2017/04/27 01:49:47 ryoon Exp $
+
+--- dom/media/CubebUtils.cpp.orig 2017-04-11 04:15:21.000000000 +0000
++++ dom/media/CubebUtils.cpp
+@@ -71,7 +71,8 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[]
+ "sndio",
+ "opensl",
+ "audiotrack",
+- "kai"
++ "kai",
++ "oss",
+ };
+ /* Index for failures to create an audio stream the first time. */
+ const int CUBEB_BACKEND_INIT_FAILURE_FIRST =
diff --git a/www/firefox/patches/patch-dom_media_webrtc_MediaEngine.h b/www/firefox/patches/patch-dom_media_webrtc_MediaEngine.h
new file mode 100644
index 00000000000..21b76699dfe
--- /dev/null
+++ b/www/firefox/patches/patch-dom_media_webrtc_MediaEngine.h
@@ -0,0 +1,31 @@
+$NetBSD: patch-dom_media_webrtc_MediaEngine.h,v 1.1 2017/04/27 01:49:47 ryoon Exp $
+
+--- 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_plugins_ipc_PluginModuleChild.cpp b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
index 952d3428b22..ef80e0c4e48 100644
--- a/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
+++ b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.8 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.9 2017/04/27 01:49:47 ryoon Exp $
* Support Solaris
---- dom/plugins/ipc/PluginModuleChild.cpp.orig 2015-03-27 02:20:27.000000000 +0000
+--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2017-04-11 04:15:22.000000000 +0000
+++ dom/plugins/ipc/PluginModuleChild.cpp
-@@ -320,7 +320,7 @@ PluginModuleChild::InitForChrome(const s
+@@ -289,7 +289,7 @@ PluginModuleChild::InitForChrome(const s
// TODO: use PluginPRLibrary here
@@ -13,16 +13,16 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.8 2016/06/16 12:08:21 r
mShutdownFunc =
(NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
-@@ -1882,7 +1882,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
+@@ -1851,7 +1851,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
AssertPluginThread();
MOZ_ASSERT(mIsChrome);
-#if defined(OS_LINUX) || defined(OS_BSD)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
- return true;
+ return IPC_OK();
#elif defined(OS_WIN) || defined(OS_MACOSX)
*_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1927,7 +1927,7 @@ PluginModuleChild::DoNP_Initialize(const
+@@ -1899,7 +1899,7 @@ PluginModuleChild::DoNP_Initialize(const
#endif
NPError result;
diff --git a/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp b/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
index 4595c843835..a8b14150fc7 100644
--- a/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
+++ b/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.4 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.5 2017/04/27 01:49:47 ryoon Exp $
* Read pkgsrc hunspell dictionaries
---- extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2017-01-23 16:13:57.000000000 +0000
+--- extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2017-04-11 04:15:15.000000000 +0000
+++ extensions/spellcheck/hunspell/glue/mozHunspell.cpp
@@ -381,6 +381,14 @@ mozHunspell::LoadDictionaryList(bool aNo
}
@@ -10,7 +10,7 @@ $NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.4 2017/03
+ // load system hunspell dictionaries
+ nsCOMPtr<nsIFile> hunDir;
-+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"),
++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@PREFIX@/share/hunspell"),
+ true, getter_AddRefs(hunDir));
+ if (hunDir) {
+ LoadDictionariesFromDir(hunDir);
diff --git a/www/firefox/patches/patch-image_Downscaler.h b/www/firefox/patches/patch-image_Downscaler.h
deleted file mode 100644
index d91b109cb8d..00000000000
--- a/www/firefox/patches/patch-image_Downscaler.h
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-image_Downscaler.h,v 1.1 2017/01/25 13:24:51 ryoon Exp $
-
---- image/Downscaler.h.orig 2016-10-31 20:15:32.000000000 +0000
-+++ image/Downscaler.h
-@@ -154,14 +154,14 @@ private:
- class Downscaler
- {
- public:
-- explicit Downscaler(const nsIntSize&)
-+ explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0)
- {
- MOZ_RELEASE_ASSERT(false, "Skia is not enabled");
- }
-
-- const nsIntSize& OriginalSize() const { return nsIntSize(); }
-- const nsIntSize& TargetSize() const { return nsIntSize(); }
-- const gfxSize& Scale() const { return gfxSize(1.0, 1.0); }
-+ const nsIntSize& OriginalSize() const { return mSize; }
-+ const nsIntSize& TargetSize() const { return mSize; }
-+ const gfxSize& Scale() const { return mScale; }
-
- nsresult BeginFrame(const nsIntSize&, const Maybe<nsIntRect>&, uint8_t*, bool, bool = false)
- {
-@@ -177,6 +177,9 @@ public:
- DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); }
- void ResetForNextProgressivePass() { }
- const nsIntSize FrameSize() const { return nsIntSize(0, 0); }
-+private:
-+ nsIntSize mSize;
-+ gfxSize mScale;
- };
-
- #endif // MOZ_ENABLE_SKIA
diff --git a/www/firefox/patches/patch-image_decoders_nsIconDecoder.cpp b/www/firefox/patches/patch-image_decoders_nsIconDecoder.cpp
deleted file mode 100644
index a7550c393ff..00000000000
--- a/www/firefox/patches/patch-image_decoders_nsIconDecoder.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-image_decoders_nsIconDecoder.cpp,v 1.1 2016/12/05 11:54:45 martin Exp $
-
-Bugzilla #1322112
-
---- image/decoders/nsIconDecoder.cpp.orig 2016-10-31 21:15:32.000000000 +0100
-+++ image/decoders/nsIconDecoder.cpp 2016-12-05 11:58:01.896240403 +0100
-@@ -97,7 +97,8 @@ nsIconDecoder::ReadRowOfPixels(const cha
- return AsVariant(WriteState::NEED_MORE_DATA); // Done with this row.
- }
-
-- uint32_t pixel = *reinterpret_cast<const uint32_t*>(aData);
-+ uint32_t pixel;
-+ memcpy(&pixel, aData, 4);
- aData += 4;
- aLength -= 4;
-
diff --git a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index 03225dd0cf9..53e0904620e 100644
--- a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.11 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.12 2017/04/27 01:49:47 ryoon Exp $
* Support Solaris
* Fix NetBSD linking
---- ipc/glue/GeckoChildProcessHost.cpp.orig 2015-01-09 04:38:16.000000000 +0000
+--- ipc/glue/GeckoChildProcessHost.cpp.orig 2017-04-11 04:15:17.000000000 +0000
+++ ipc/glue/GeckoChildProcessHost.cpp
@@ -4,7 +4,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,7 +19,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.11 2016/06/16 12:08:21 ryo
#include "base/command_line.h"
#include "base/string_util.h"
-@@ -533,7 +539,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -730,7 +736,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
// and passing wstrings from one config to the other is unsafe. So
// we split the logic here.
@@ -27,8 +27,8 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.11 2016/06/16 12:08:21 ryo
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
base::environment_map newEnvVars;
ChildPrivileges privs = mPrivileges;
- if (privs == base::PRIVILEGES_DEFAULT) {
-@@ -672,7 +678,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+ if (privs == base::PRIVILEGES_DEFAULT ||
+@@ -865,7 +871,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
childArgv.push_back(pidstring);
#if defined(MOZ_CRASHREPORTER)
@@ -37,9 +37,9 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.11 2016/06/16 12:08:21 ryo
int childCrashFd, childCrashRemapFd;
if (!CrashReporter::CreateNotificationPipeForChild(
&childCrashFd, &childCrashRemapFd))
-@@ -705,7 +711,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
- childArgv.push_back(childProcessType);
-
+@@ -901,7 +907,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+ LaunchAndroidService(childProcessType, childArgv, mFileMap, &process);
+ #else
base::LaunchApp(childArgv, mFileMap,
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
diff --git a/www/firefox/patches/patch-media_libcubeb_gtest_moz.build b/www/firefox/patches/patch-media_libcubeb_gtest_moz.build
new file mode 100644
index 00000000000..7bc06ab911b
--- /dev/null
+++ b/www/firefox/patches/patch-media_libcubeb_gtest_moz.build
@@ -0,0 +1,12 @@
+$NetBSD: patch-media_libcubeb_gtest_moz.build,v 1.1 2017/04/27 01:49:47 ryoon Exp $
+
+--- media/libcubeb/gtest/moz.build.orig 2017-04-11 04:15:21.000000000 +0000
++++ media/libcubeb/gtest/moz.build
+@@ -71,7 +71,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD':
+ 'sndio',
+ ]
+ else:
+- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+ OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS']
+
+ if CONFIG['GNU_CXX']:
diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
index a44fb5b52ca..2acbbc32f7f 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.5 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.6 2017/04/27 01:49:47 ryoon Exp $
* Support OSS audio
---- media/libcubeb/src/cubeb.c.orig 2017-01-23 16:13:54.000000000 +0000
+--- media/libcubeb/src/cubeb.c.orig 2017-04-11 04:15:21.000000000 +0000
+++ media/libcubeb/src/cubeb.c
@@ -54,6 +54,9 @@ int audiotrack_init(cubeb ** context, ch
#if defined(USE_KAI)
@@ -12,9 +12,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.5 2017/03/07 20:45:43 ryoon Exp $
+int oss_init(cubeb ** context, char const * context_name);
+#endif
-
static int
-@@ -141,6 +144,9 @@ cubeb_init(cubeb ** context, char const
+ validate_stream_params(cubeb_stream_params * input_stream_params,
+@@ -138,6 +141,9 @@ cubeb_init(cubeb ** context, char const
#if defined(USE_KAI)
kai_init,
#endif
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 0a016a8c745..5abdc39dde1 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.21 2017/04/27 01:49:47 ryoon Exp $
* Support alsa audio under NetBSD
* Avoid https://github.com/kinetiknz/cubeb/issues/226
---- media/libcubeb/src/cubeb_alsa.c.orig 2016-10-31 20:15:39.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig 2017-04-11 04:15:21.000000000 +0000
+++ media/libcubeb/src/cubeb_alsa.c
@@ -7,11 +7,15 @@
#undef NDEBUG
@@ -21,7 +21,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
#include <poll.h>
#include <unistd.h>
#include <alsa/asoundlib.h>
-@@ -25,6 +29,50 @@
+@@ -25,6 +29,52 @@
#define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
@@ -61,8 +61,10 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
+MAKE_TYPEDEF(snd_pcm_poll_descriptors);
+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count);
+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents);
++MAKE_TYPEDEF(snd_pcm_readi);
+MAKE_TYPEDEF(snd_pcm_recover);
+MAKE_TYPEDEF(snd_pcm_set_params);
++MAKE_TYPEDEF(snd_pcm_start);
+MAKE_TYPEDEF(snd_pcm_state);
+MAKE_TYPEDEF(snd_pcm_writei);
+
@@ -72,7 +74,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 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 +113,8 @@ struct cubeb {
+@@ -65,6 +115,8 @@ struct cubeb {
workaround is not required. */
snd_config_t * local_config;
int is_pa;
@@ -81,53 +83,85 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
};
enum stream_state {
-@@ -260,10 +310,10 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -243,8 +295,8 @@ set_timeout(struct timeval * timeout, un
+ static void
+ stream_buffer_decrement(cubeb_stream * stm, long count)
+ {
+- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
+- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
++ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
++ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
+ stm->bufframes -= count;
+ }
- pthread_mutex_lock(&stm->mutex);
+@@ -276,9 +328,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. */
+- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
- avail = snd_pcm_avail_update(stm->pcm);
+ avail = WRAP(snd_pcm_avail_update)(stm->pcm);
- if (avail < 0) {
-- snd_pcm_recover(stm->pcm, avail, 1);
-- avail = snd_pcm_avail_update(stm->pcm);
-+ WRAP(snd_pcm_recover)(stm->pcm, avail, 1);
-+ avail = WRAP(snd_pcm_avail_update)(stm->pcm);
- }
- /* Failed to recover from an xrun, this stream must be broken. */
-@@ -286,7 +336,7 @@ alsa_refill_stream(cubeb_stream * stm)
- return RUNNING;
- }
-
-- p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail));
-+ p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail));
- assert(p);
+ /* Got null event? Bail and wait for another wakeup. */
+ if (avail == 0) {
+@@ -301,7 +353,7 @@ alsa_process_stream(cubeb_stream * stm)
+ // TODO: should it be marked as DRAINING?
+ }
- pthread_mutex_unlock(&stm->mutex);
-@@ -312,10 +362,10 @@ alsa_refill_stream(cubeb_stream * stm)
- b[i] *= stm->volume;
+- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
++ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
+
+ if (got < 0) {
+ avail = got; // the error handler below will recover us
+@@ -345,7 +397,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;
+- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
++ 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)
+ long drain_frames = avail - stm->bufframes;
+ double drain_time = (double) drain_frames / stm->params.rate;
+
+- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
++ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
++ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
+ stm->bufframes = avail;
+
+ /* Mark as draining, unless we're waiting for capture */
+@@ -400,7 +452,7 @@ alsa_process_stream(cubeb_stream * stm)
}
}
-- wrote = snd_pcm_writei(stm->pcm, p, got);
-+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got);
- if (wrote < 0) {
-- snd_pcm_recover(stm->pcm, wrote, 1);
-- wrote = snd_pcm_writei(stm->pcm, p, got);
-+ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1);
-+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got);
- }
- assert(wrote >= 0 && wrote == got);
- stm->write_position += wrote;
-@@ -327,7 +377,7 @@ alsa_refill_stream(cubeb_stream * stm)
- /* Fill the remaining buffer with silence to guarantee one full period
- has been written. */
-- snd_pcm_writei(stm->pcm, (char *) p + got, avail - got);
-+ WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got);
+- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
++ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
+ if (wrote < 0) {
+ avail = wrote; // the error handler below will recover us
+ } else {
+@@ -413,13 +465,13 @@ alsa_process_stream(cubeb_stream * stm)
- set_timeout(&stm->drain_timeout, buffer_time * 1000);
+ /* Got some error? Let's try to recover the stream. */
+ if (avail < 0) {
+- avail = snd_pcm_recover(stm->pcm, avail, 0);
++ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
+
+ /* Capture pcm must be started after initial setup/recover */
+ if (avail >= 0 &&
+ stm->stream_type == SND_PCM_STREAM_CAPTURE &&
+- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+- avail = snd_pcm_start(stm->pcm);
++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++ avail = WRAP(snd_pcm_start)(stm->pcm);
+ }
+ }
-@@ -440,26 +490,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -535,26 +587,26 @@ get_slave_pcm_node(snd_config_t * lconf,
slave_def = NULL;
@@ -159,7 +193,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
if (r < 0) {
break;
}
-@@ -468,7 +518,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -563,7 +615,7 @@ get_slave_pcm_node(snd_config_t * lconf,
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
@@ -168,7 +202,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
if (r < 0) {
break;
}
-@@ -477,7 +527,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -572,7 +624,7 @@ get_slave_pcm_node(snd_config_t * lconf,
} while (0);
if (slave_def) {
@@ -177,7 +211,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
}
return NULL;
-@@ -500,22 +550,22 @@ init_local_config_with_workaround(char c
+@@ -595,22 +647,22 @@ init_local_config_with_workaround(char c
lconf = NULL;
@@ -204,7 +238,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
if (r < 0) {
break;
}
-@@ -524,7 +574,7 @@ init_local_config_with_workaround(char c
+@@ -619,7 +671,7 @@ init_local_config_with_workaround(char c
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
@@ -213,7 +247,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
if (r < 0) {
break;
}
-@@ -535,12 +585,12 @@ init_local_config_with_workaround(char c
+@@ -630,12 +682,12 @@ init_local_config_with_workaround(char c
}
/* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -228,7 +262,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
if (r < 0) {
break;
}
-@@ -551,18 +601,18 @@ init_local_config_with_workaround(char c
+@@ -646,18 +698,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. */
@@ -250,7 +284,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
if (r < 0) {
break;
}
-@@ -570,7 +620,7 @@ init_local_config_with_workaround(char c
+@@ -665,7 +717,7 @@ init_local_config_with_workaround(char c
return lconf;
} while (0);
@@ -259,19 +293,19 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
return NULL;
}
-@@ -582,9 +632,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
+@@ -677,9 +729,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c
pthread_mutex_lock(&cubeb_alsa_mutex);
if (local_config) {
-- r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
-+ r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
+- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
++ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
} else {
-- r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
-+ r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
+- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
++ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -597,7 +647,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -692,7 +744,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
int r;
pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -280,7 +314,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
return r;
-@@ -654,12 +704,65 @@ alsa_init(cubeb ** context, char const *
+@@ -755,12 +807,65 @@ alsa_init(cubeb ** context, char const *
pthread_attr_t attr;
snd_pcm_t * dummy;
@@ -347,7 +381,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
cubeb_alsa_error_handler_set = 1;
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -667,6 +770,8 @@ alsa_init(cubeb ** context, char const *
+@@ -768,6 +873,8 @@ alsa_init(cubeb ** context, char const *
ctx = calloc(1, sizeof(*ctx));
assert(ctx);
@@ -356,7 +390,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
ctx->ops = &alsa_ops;
r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -716,7 +821,7 @@ alsa_init(cubeb ** context, char const *
+@@ -817,7 +924,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);
@@ -365,7 +399,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
ctx->local_config = NULL;
} else if (r >= 0) {
-@@ -755,9 +860,13 @@ alsa_destroy(cubeb * ctx)
+@@ -857,9 +964,13 @@ alsa_destroy(cubeb * ctx)
pthread_mutex_destroy(&ctx->mutex);
free(ctx->fds);
@@ -380,16 +414,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
}
-@@ -836,13 +945,16 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
- r = pthread_mutex_init(&stm->mutex, NULL);
- assert(r == 0);
-
-+ r = pthread_cond_init(&stm->cond, NULL);
-+ assert(r == 0);
-+
- r = alsa_locked_pcm_open(&stm->pcm, SND_PCM_STREAM_PLAYBACK, ctx->local_config);
- if (r < 0) {
- alsa_stream_destroy(stm);
+@@ -939,7 +1050,7 @@ alsa_stream_init_single(cubeb * ctx, cub
return CUBEB_ERROR;
}
@@ -398,7 +423,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
assert(r == 0);
latency_us = latency_frames * 1e6 / stm->params.rate;
-@@ -855,7 +967,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -952,7 +1063,7 @@ alsa_stream_init_single(cubeb * ctx, cub
latency_us = latency_us < min_latency ? min_latency: latency_us;
}
@@ -407,7 +432,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
stm->params.channels, stm->params.rate, 1,
latency_us);
if (r < 0) {
-@@ -863,20 +975,17 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -960,20 +1071,20 @@ alsa_stream_init_single(cubeb * ctx, cub
return CUBEB_ERROR_INVALID_FORMAT;
}
@@ -415,6 +440,12 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
assert(r == 0);
+ /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
+ stm->buffer_size *= 2;
+- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
++ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
+ assert(stm->buffer);
+
- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
assert(stm->nfds > 0);
@@ -425,13 +456,8 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 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);
-- assert(r == 0);
--
- if (alsa_register_stream(ctx, stm) != 0) {
- alsa_stream_destroy(stm);
- return CUBEB_ERROR;
-@@ -902,7 +1011,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+ r = pthread_cond_init(&stm->cond, NULL);
+@@ -1048,7 +1159,7 @@ alsa_stream_destroy(cubeb_stream * stm)
pthread_mutex_lock(&stm->mutex);
if (stm->pcm) {
if (stm->state == DRAINING) {
@@ -440,9 +466,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
}
alsa_locked_pcm_close(stm->pcm);
stm->pcm = NULL;
-@@ -944,12 +1053,12 @@ alsa_get_max_channel_count(cubeb * ctx,
- return CUBEB_ERROR;
- }
+@@ -1094,12 +1205,12 @@ alsa_get_max_channel_count(cubeb * ctx,
+
+ assert(stm);
- r = snd_pcm_hw_params_any(stm->pcm, hw_params);
+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
@@ -455,7 +481,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
if (r < 0) {
return CUBEB_ERROR;
}
-@@ -969,34 +1078,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -1120,34 +1231,34 @@ alsa_get_preferred_sample_rate(cubeb * c
/* get a pcm, disabling resampling, so we get a rate the
* hardware/dmix/pulse/etc. supports. */
@@ -498,16 +524,21 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
return CUBEB_OK;
}
-@@ -1020,7 +1129,7 @@ alsa_stream_start(cubeb_stream * stm)
- ctx = stm->context;
-
+@@ -1180,10 +1291,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 &&
+- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
+- snd_pcm_start(stm->pcm);
++ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
++ WRAP(snd_pcm_start)(stm->pcm);
+ }
- snd_pcm_pause(stm->pcm, 0);
+ WRAP(snd_pcm_pause)(stm->pcm, 0);
gettimeofday(&stm->last_activity, NULL);
pthread_mutex_unlock(&stm->mutex);
-@@ -1054,7 +1163,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1223,7 +1334,7 @@ alsa_stream_stop(cubeb_stream * stm)
pthread_mutex_unlock(&ctx->mutex);
pthread_mutex_lock(&stm->mutex);
@@ -516,7 +547,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
pthread_mutex_unlock(&stm->mutex);
return CUBEB_OK;
-@@ -1070,14 +1179,15 @@ alsa_stream_get_position(cubeb_stream *
+@@ -1239,8 +1350,8 @@ alsa_stream_get_position(cubeb_stream *
pthread_mutex_lock(&stm->mutex);
delay = -1;
@@ -527,15 +558,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon
*position = stm->last_position;
pthread_mutex_unlock(&stm->mutex);
return CUBEB_OK;
- }
-
-- assert(delay >= 0);
-+ // Comment out to enable alsa-plugins-oss audio playback
-+ // assert(delay >= 0);
-
- *position = 0;
- if (stm->write_position >= (snd_pcm_uframes_t) delay) {
-@@ -1096,7 +1206,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1265,7 +1376,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_libcubeb_src_cubeb__oss.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c
index 260df4ca422..a12d451dd5f 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.8 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.9 2017/04/27 01:49:47 ryoon Exp $
* Restore OSS audio support code
---- media/libcubeb/src/cubeb_oss.c.orig 2016-11-29 13:25:18.814351604 +0000
+--- media/libcubeb/src/cubeb_oss.c.orig 2017-04-23 13:26:11.608534944 +0000
+++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,442 @@
+@@ -0,0 +1,445 @@
+/*
+ * Copyright © 2014 Mozilla Foundation
+ *
@@ -96,10 +96,11 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.8 2016/12/03 09:58:26 ryoon E
+}
+
+static int oss_get_min_latency(cubeb * context, cubeb_stream_params params,
-+ uint32_t * latency_ms)
++ uint32_t * latency_frames)
+{
++ (void)context;
+ /* 40ms is a big enough number to work ok */
-+ *latency_ms = 40;
++ *latency_frames = 40 * params.rate / 1000;
+ return CUBEB_OK;
+}
+
@@ -242,8 +243,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.8 2016/12/03 09:58:26 ryoon E
+ unsigned int latency_bytes, n_frag;
+ int frag;
+ /* fragment size of 1024 is a good choice with good chances to be accepted */
-+ unsigned int frag_size=1024;
-+ unsigned int frag_log=10; /* 2^frag_log = frag_size */
++ unsigned int frag_log=10; /* 2^frag_log = fragment size */
+ latency_bytes =
+ latency*stream->params.rate*stream->params.channels*sizeof(uint16_t)/1000;
+ n_frag = latency_bytes>>frag_log;
@@ -434,7 +434,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.8 2016/12/03 09:58:26 ryoon E
+ .get_max_channel_count = oss_get_max_channel_count,
+ .get_min_latency = oss_get_min_latency,
+ .get_preferred_sample_rate = oss_get_preferred_sample_rate,
++ .get_preferred_channel_layout = NULL,
+ .destroy = oss_destroy,
++ .enumerate_devices = NULL,
+ .stream_init = oss_stream_init,
+ .stream_destroy = oss_stream_destroy,
+ .stream_start = oss_stream_start,
@@ -445,5 +447,6 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.8 2016/12/03 09:58:26 ryoon E
+ .stream_set_panning = oss_stream_set_panning,
+ .stream_get_current_device = NULL,
+ .stream_device_destroy = NULL,
-+ .stream_register_device_changed_callback = NULL
++ .stream_register_device_changed_callback = NULL,
++ .register_device_collection_changed = NULL
+};
diff --git a/www/firefox/patches/patch-media_libcubeb_src_moz.build b/www/firefox/patches/patch-media_libcubeb_src_moz.build
index bb4736df7af..5f03cae504f 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_moz.build
+++ b/www/firefox/patches/patch-media_libcubeb_src_moz.build
@@ -1,13 +1,13 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.10 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.11 2017/04/27 01:49:47 ryoon Exp $
* Add OSS audio support
* Support system library
---- media/libcubeb/src/moz.build.orig 2016-10-31 20:15:39.000000000 +0000
+--- media/libcubeb/src/moz.build.orig 2017-04-11 04:15:21.000000000 +0000
+++ media/libcubeb/src/moz.build
-@@ -24,6 +24,12 @@ if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['M
- 'cubeb_resampler.cpp',
+@@ -20,6 +20,12 @@ if CONFIG['MOZ_ALSA']:
]
+ DEFINES['USE_ALSA'] = True
+if CONFIG['MOZ_OSS']:
+ SOURCES += [
@@ -15,14 +15,14 @@ $NetBSD: patch-media_libcubeb_src_moz.build,v 1.10 2016/12/03 09:58:26 ryoon Exp
+ ]
+ DEFINES['USE_OSS'] = True
+
- if CONFIG['MOZ_PULSEAUDIO']:
+ if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']:
SOURCES += [
- 'cubeb_pulse.c',
-@@ -81,6 +87,7 @@ if CONFIG['OS_TARGET'] == 'Android':
-
- FINAL_LIBRARY = 'gkmedias'
+ 'cubeb_resampler.cpp',
+@@ -92,6 +98,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
+ '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'],
+ ]
+CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
- if CONFIG['ANDROID_VERSION'] >= '17':
- LOCAL_INCLUDES += [
+ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
+ CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+
diff --git a/www/firefox/patches/patch-media_libcubeb_tests_moz.build b/www/firefox/patches/patch-media_libcubeb_tests_moz.build
deleted file mode 100644
index 614b06ed64e..00000000000
--- a/www/firefox/patches/patch-media_libcubeb_tests_moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-media_libcubeb_tests_moz.build,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-
---- media/libcubeb/tests/moz.build.orig 2016-10-31 20:15:39.000000000 +0000
-+++ media/libcubeb/tests/moz.build
-@@ -73,7 +73,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD':
- 'sndio',
- ]
- else:
-- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
- OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS']
-
- if CONFIG['GNU_CXX']:
diff --git a/www/firefox/patches/patch-media_libcubeb_update.sh b/www/firefox/patches/patch-media_libcubeb_update.sh
index 478188b9c74..80e81e69b60 100644
--- a/www/firefox/patches/patch-media_libcubeb_update.sh
+++ b/www/firefox/patches/patch-media_libcubeb_update.sh
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_libcubeb_update.sh,v 1.1 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-media_libcubeb_update.sh,v 1.2 2017/04/27 01:49:47 ryoon Exp $
---- media/libcubeb/update.sh.orig 2016-10-31 20:15:39.000000000 +0000
+--- media/libcubeb/update.sh.orig 2017-04-11 04:15:21.000000000 +0000
+++ media/libcubeb/update.sh
-@@ -16,6 +16,7 @@ cp $1/src/cubeb_audiounit.cpp src
+@@ -17,6 +17,7 @@ cp $1/src/cubeb_audiounit.cpp src
cp $1/src/cubeb_osx_run_loop.h src
cp $1/src/cubeb_jack.cpp src
cp $1/src/cubeb_opensl.c src
+cp $1/src/cubeb_oss.c src
+ cp $1/src/cubeb_array_queue.h src
cp $1/src/cubeb_panner.cpp src
cp $1/src/cubeb_panner.h src
- cp $1/src/cubeb_pulse.c src
diff --git a/www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c b/www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c
index 70c7f5088d2..edba30d0895 100644
--- a/www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c
+++ b/www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c
@@ -1,8 +1,6 @@
-$NetBSD: patch-media_libtheora_lib_arm_armcpu.c,v 1.1 2014/11/26 14:56:28 ryoon Exp $
+$NetBSD: patch-media_libtheora_lib_arm_armcpu.c,v 1.2 2017/04/27 01:49:47 ryoon Exp $
-* NetBSD/evbearmv7hf-el's /proc/cpuinfo return empty, use hardcoded flags.
-
---- media/libtheora/lib/arm/armcpu.c.orig 2014-11-13 22:50:10.000000000 +0000
+--- media/libtheora/lib/arm/armcpu.c.orig 2016-05-12 17:13:17.000000000 +0000
+++ media/libtheora/lib/arm/armcpu.c
@@ -107,6 +107,18 @@ ogg_uint32_t oc_cpu_flags_get(void){
return flags;
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 40d87a7c7a5..dfebce359d7 100644
--- a/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
+++ b/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.5 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.6 2017/04/27 01:49:47 ryoon Exp $
---- media/webrtc/signaling/test/common.build.orig 2016-09-19 16:19:28.000000000 +0000
+--- 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']:
diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
index f2fd81263e3..3dd2de8e17d 100644
--- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
+++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.11 2017/03/07 20:45:43 ryoon Exp $
+$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-01-23 16:13:55.000000000 +0000
+--- 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
@@ -10,8 +10,8 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__in
+#include <libv4l2.h>
+#endif
- #include "webrtc/system_wrappers/interface/ref_count.h"
- #include "webrtc/system_wrappers/interface/trace.h"
+ #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
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
index d310e9f35a7..dab0ad4da0d 100644
--- 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
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.11 2016/12/03 09:58:26 ryoon Exp $
+$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 2016-05-12 17:13:21.000000000 +0000
+--- 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
-@@ -25,6 +25,9 @@
+@@ -24,6 +24,9 @@
#else
#include <linux/videodev2.h>
#endif
@@ -12,9 +12,9 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__cap
#include <new>
-@@ -33,6 +36,15 @@
- #include "webrtc/system_wrappers/interface/ref_count.h"
- #include "webrtc/system_wrappers/interface/trace.h"
+@@ -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
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
index 3d56e70794e..68fbd96dc19 100644
--- 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
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.10 2016/12/03 09:58:26 ryoon Exp $
+$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 2016-09-05 20:12:57.000000000 +0000
+--- 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.
@@ -12,7 +12,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
'targets': [
{
# Note this library is missing an implementation for the video capture.
-@@ -75,6 +78,19 @@
+@@ -76,6 +79,19 @@
'linux/video_capture_linux.cc',
'linux/video_capture_linux.h',
],
@@ -29,6 +29,6 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
+ ],
+ }],
+ ],
- }], # linux
+ }],
['OS=="mac"', {
'sources': [
diff --git a/www/firefox/patches/patch-mobile_android_installer_Makefile.in b/www/firefox/patches/patch-mobile_android_installer_Makefile.in
deleted file mode 100644
index 27f109c09b6..00000000000
--- a/www/firefox/patches/patch-mobile_android_installer_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mobile_android_installer_Makefile.in,v 1.5 2016/12/03 09:58:26 ryoon Exp $
-
---- mobile/android/installer/Makefile.in.orig 2016-07-25 20:22:05.000000000 +0000
-+++ mobile/android/installer/Makefile.in
-@@ -69,6 +69,10 @@ BINPATH = bin
- endif
- DEFINES += -DBINPATH=$(BINPATH)
-
-+ifdef MOZ_DEBUG
-+DEFINES += -DMOZ_DEBUG=1
-+endif
-+
- ifdef ENABLE_MARIONETTE
- DEFINES += -DENABLE_MARIONETTE=1
- endif
diff --git a/www/firefox/patches/patch-mobile_android_installer_package-manifest.in b/www/firefox/patches/patch-mobile_android_installer_package-manifest.in
deleted file mode 100644
index d86d19f997a..00000000000
--- a/www/firefox/patches/patch-mobile_android_installer_package-manifest.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mobile_android_installer_package-manifest.in,v 1.5 2016/12/03 09:58:26 ryoon Exp $
-
---- mobile/android/installer/package-manifest.in.orig 2016-10-31 20:15:25.000000000 +0000
-+++ mobile/android/installer/package-manifest.in
-@@ -396,7 +396,7 @@
- @BINPATH@/components/dom_webspeechsynth.xpt
- #endif
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
- @BINPATH@/components/TestInterfaceJSMaplike.js
diff --git a/www/firefox/patches/patch-modules_woff2_src_store_bytes.h b/www/firefox/patches/patch-modules_woff2_src_store_bytes.h
deleted file mode 100644
index 4309a2d44ca..00000000000
--- a/www/firefox/patches/patch-modules_woff2_src_store_bytes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-modules_woff2_src_store_bytes.h,v 1.1 2016/12/09 11:51:09 martin Exp $
-
-Avoid unaligned access, use memcpy instead of dereferencing
-a casted pointer.
-
-Firefox bug report:
- https://bugzilla.mozilla.org/show_bug.cgi?id=1322660
-
---- modules/woff2/src/store_bytes.h.orig 2016-07-25 22:22:05.000000000 +0200
-+++ modules/woff2/src/store_bytes.h 2016-12-09 12:09:13.632981168 +0100
-@@ -34,10 +34,11 @@
-
- inline size_t Store16(uint8_t* dst, size_t offset, int x) {
- #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-- *reinterpret_cast<uint16_t*>(dst + offset) =
-- ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8);
-+ uint16_t v = ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8);
-+ memcpy(dst + offset, &v, 2);
- #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-- *reinterpret_cast<uint16_t*>(dst + offset) = static_cast<uint16_t>(x);
-+ uint16_t v = static_cast<uint16_t>(x);
-+ memcpy(dst + offset, &v, 2);
- #else
- dst[offset] = x >> 8;
- dst[offset + 1] = x;
-@@ -54,11 +55,13 @@
-
- inline void Store16(int val, size_t* offset, uint8_t* dst) {
- #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-- *reinterpret_cast<uint16_t*>(dst + *offset) =
-+ uint16_t v = ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8);
-+ memcpy(dst + *offset, &v, 2);
- ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8);
- *offset += 2;
- #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-- *reinterpret_cast<uint16_t*>(dst + *offset) = static_cast<uint16_t>(val);
-+ uint16_t v = static_cast<uint16_t>(val);
-+ memcpy(dst + *offset, &v, 2);
- *offset += 2;
- #else
- dst[(*offset)++] = val >> 8;
diff --git a/www/firefox/patches/patch-modules_woff2_src_woff2_common.cc b/www/firefox/patches/patch-modules_woff2_src_woff2_common.cc
deleted file mode 100644
index 448b6430045..00000000000
--- a/www/firefox/patches/patch-modules_woff2_src_woff2_common.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-modules_woff2_src_woff2_common.cc,v 1.1 2016/12/09 11:51:09 martin Exp $
-
-Use memcpy instead of dereferencing a pointer after casting it
-to a type needing greater alignement on some architectures.
-
-Firefox bug report:
- https://bugzilla.mozilla.org/show_bug.cgi?id=1322660
-
---- modules/woff2/src/woff2_common.cc.orig 2016-07-25 22:22:05.000000000 +0200
-+++ modules/woff2/src/woff2_common.cc 2016-12-09 09:33:50.193846136 +0100
-@@ -25,12 +25,13 @@
- uint32_t checksum = 0;
- size_t aligned_size = size & ~3;
- for (size_t i = 0; i < aligned_size; i += 4) {
-+ uint32_t v;
-+ memcpy(&v, buf + i, 4);
- #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-- uint32_t v = *reinterpret_cast<const uint32_t*>(buf + i);
- checksum += (((v & 0xFF) << 24) | ((v & 0xFF00) << 8) |
- ((v & 0xFF0000) >> 8) | ((v & 0xFF000000) >> 24));
- #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-- checksum += *reinterpret_cast<const uint32_t*>(buf + i);
-+ checksum += v;
- #else
- checksum += (buf[i] << 24) | (buf[i + 1] << 16) |
- (buf[i + 2] << 8) | buf[i + 3];
diff --git a/www/firefox/patches/patch-python_futures_concurrent_futures_process.py b/www/firefox/patches/patch-python_futures_concurrent_futures_process.py
new file mode 100644
index 00000000000..2152bd7b5ea
--- /dev/null
+++ b/www/firefox/patches/patch-python_futures_concurrent_futures_process.py
@@ -0,0 +1,17 @@
+$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-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
deleted file mode 100644
index a8eb02d34f5..00000000000
--- a/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h,v 1.2 2016/06/16 12:08:21 ryoon Exp $
-
-* Support Solaris
-
---- toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2015-09-11 00:23:02.000000000 +0000
-+++ toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h
-@@ -67,7 +67,7 @@
- #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
- #elif defined(sparc)
- #define GOOGLE_PROTOBUF_ARCH_SPARC 1
--#ifdef SOLARIS_64BIT_ENABLED
-+#if (defined(sun) && defined(SOLARIS_64BIT_ENABLED)) || __LP64__
- #define GOOGLE_PROTOBUF_ARCH_64_BIT 1
- #else
- #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
diff --git a/www/firefox/patches/patch-toolkit_library_dependentlibs.py b/www/firefox/patches/patch-toolkit_library_dependentlibs.py
deleted file mode 100644
index 75d0fcd3414..00000000000
--- a/www/firefox/patches/patch-toolkit_library_dependentlibs.py
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-toolkit_library_dependentlibs.py,v 1.1 2017/03/07 20:45:43 ryoon Exp $
-
---- toolkit/library/dependentlibs.py.orig 2016-11-14 16:12:26.000000000 +0000
-+++ toolkit/library/dependentlibs.py
-@@ -57,11 +57,15 @@ def dependentlibs_readelf(lib):
- for line in proc.stdout:
- # Each line has the following format:
- # tag (TYPE) value
-+ # or with BSD readelf:
-+ # tag TYPE value
- # Looking for NEEDED type entries
- tmp = line.split(' ', 3)
-- if len(tmp) > 3 and tmp[2] == '(NEEDED)':
-+ if len(tmp) > 3 and 'NEEDED' in tmp[2]:
- # NEEDED lines look like:
- # 0x00000001 (NEEDED) Shared library: [libname]
-+ # or with BSD readelf:
-+ # 0x00000001 NEEDED Shared library: [libname]
- match = re.search('\[(.*)\]', tmp[3])
- if match:
- deps.append(match.group(1))
diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build
index 11a47f2e0d5..81d684bb9dd 100644
--- a/www/firefox/patches/patch-toolkit_library_moz.build
+++ b/www/firefox/patches/patch-toolkit_library_moz.build
@@ -1,11 +1,11 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.11 2017/03/07 20:45:43 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.12 2017/04/27 01:49:47 ryoon Exp $
* Support system libraries
* Restore OSS support
---- toolkit/library/moz.build.orig 2017-02-11 00:39:16.000000000 +0000
+--- toolkit/library/moz.build.orig 2017-04-11 04:15:18.000000000 +0000
+++ toolkit/library/moz.build
-@@ -215,6 +215,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
+@@ -216,6 +216,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
]
OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
@@ -13,7 +13,7 @@ $NetBSD: patch-toolkit_library_moz.build,v 1.11 2017/03/07 20:45:43 ryoon Exp $
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
if CONFIG['SERVO_TARGET_DIR']:
-@@ -229,9 +230,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
+@@ -230,9 +231,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
if CONFIG['MOZ_SYSTEM_PNG']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS']
@@ -44,7 +44,7 @@ $NetBSD: patch-toolkit_library_moz.build,v 1.11 2017/03/07 20:45:43 ryoon Exp $
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
-@@ -241,8 +263,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+@@ -242,8 +264,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_modules_GMPUtils.jsm b/www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm
deleted file mode 100644
index 0d03a8c9286..00000000000
--- a/www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-toolkit_modules_GMPUtils.jsm,v 1.3 2016/09/20 20:01:41 ryoon Exp $
-
-* Enable Google widevine CDM for NetBSD
-
---- toolkit/modules/GMPUtils.jsm.orig 2016-08-10 20:27:55.000000000 +0000
-+++ toolkit/modules/GMPUtils.jsm
-@@ -92,6 +92,7 @@ this.GMPUtils = {
- // Mac OSX, and Linux.
- return AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
- AppConstants.platform == "macosx" ||
-+ AppConstants.platform == "netbsd" ||
- AppConstants.platform == "linux";
- }
-
diff --git a/www/firefox/patches/patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js b/www/firefox/patches/patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js
deleted file mode 100644
index 451695dcfd5..00000000000
--- a/www/firefox/patches/patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js,v 1.1 2016/09/20 20:01:41 ryoon Exp $
-
-* Enable Google widevine CDM for NetBSD
-
---- toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js.orig 2016-08-10 04:19:24.000000000 +0000
-+++ toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
-@@ -390,6 +390,7 @@ add_task(function* testEmeSupport() {
- } else if (addon.id == GMPScope.WIDEVINE_ID) {
- if (AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
- AppConstants.platform == "macosx" ||
-+ AppConstants.platform == "netbsd" ||
- AppConstants.platform == "linux") {
- Assert.ok(item, "Widevine supported, found add-on element.");
- } else {