summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/firefox/Makefile7
-rw-r--r--www/firefox/PLIST301
-rw-r--r--www/firefox/distinfo88
-rw-r--r--www/firefox/mozilla-common.mk16
-rw-r--r--www/firefox/options.mk6
-rw-r--r--www/firefox/patches/patch-aa303
-rw-r--r--www/firefox/patches/patch-browser_app_nsBrowserApp.cpp14
-rw-r--r--www/firefox/patches/patch-browser_components_nsBrowserGlue.js15
-rw-r--r--www/firefox/patches/patch-browser_themes_shared_icon-colors.inc.svg13
-rw-r--r--www/firefox/patches/patch-build_autoconf_toolchain.m419
-rw-r--r--www/firefox/patches/patch-build_buildconfig.py11
-rw-r--r--www/firefox/patches/patch-build_moz.configure_keyfiles.configure21
-rw-r--r--www/firefox/patches/patch-build_moz.configure_old.configure30
-rw-r--r--www/firefox/patches/patch-build_moz.configure_toolchain.configure28
-rw-r--r--www/firefox/patches/patch-config_Makefile.in17
-rw-r--r--www/firefox/patches/patch-config_baseconfig.mk4
-rw-r--r--www/firefox/patches/patch-config_external_moz.build6
-rw-r--r--www/firefox/patches/patch-config_system-headers54
-rw-r--r--www/firefox/patches/patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py13
-rw-r--r--www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp39
-rw-r--r--www/firefox/patches/patch-dom_system_OSFileConstants.cpp26
-rw-r--r--www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp8
-rw-r--r--www/firefox/patches/patch-gfx_2d_BorrowedContext.h41
-rw-r--r--www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.cpp104
-rw-r--r--www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.h39
-rw-r--r--www/firefox/patches/patch-gfx_layers_moz.build26
-rw-r--r--www/firefox/patches/patch-gfx_skia_generate__mozbuild.py6
-rw-r--r--www/firefox/patches/patch-gfx_skia_moz.build8
-rw-r--r--www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp29
-rw-r--r--www/firefox/patches/patch-gfx_thebes_gfxFontUtils.cpp49
-rw-r--r--www/firefox/patches/patch-gfx_thebes_moz.build12
-rw-r--r--www/firefox/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp40
-rw-r--r--www/firefox/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc22
-rw-r--r--www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc15
-rw-r--r--www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp16
-rw-r--r--www/firefox/patches/patch-js_src_jit-LIR.cpp15
-rw-r--r--www/firefox/patches/patch-js_src_jit_MIR.cpp15
-rw-r--r--www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp4
-rw-r--r--www/firefox/patches/patch-js_src_moz.build10
-rw-r--r--www/firefox/patches/patch-layout_style_GenerateCSSPropsGenerated.py13
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_cubeb.c10
-rw-r--r--www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h12
-rw-r--r--www/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp17
-rw-r--r--www/firefox/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c29
-rw-r--r--www/firefox/patches/patch-media_libstagefright_system_core_liblog_logprint.c24
-rw-r--r--www/firefox/patches/patch-media_libtheora_lib_info.c15
-rw-r--r--www/firefox/patches/patch-media_libtremor_Makefile.in14
-rw-r--r--www/firefox/patches/patch-media_libvorbis_Makefile.in14
-rw-r--r--www/firefox/patches/patch-media_libvorbis_lib_vorbis_info.c15
-rw-r--r--www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h19
-rw-r--r--www/firefox/patches/patch-media_webrtc_signaling_test_common.build13
-rw-r--r--www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc14
-rw-r--r--www/firefox/patches/patch-memory_build_mozjemalloc__compat.c53
-rw-r--r--www/firefox/patches/patch-modules_libmar_tests_moz.build29
-rw-r--r--www/firefox/patches/patch-modules_libpref_init_all.js15
-rw-r--r--www/firefox/patches/patch-moz.configure35
-rw-r--r--www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py26
-rw-r--r--www/firefox/patches/patch-toolkit_library_dependentlibs.py21
-rw-r--r--www/firefox/patches/patch-toolkit_library_libxul.mk16
-rw-r--r--www/firefox/patches/patch-toolkit_library_moz.build34
-rw-r--r--www/firefox/patches/patch-toolkit_moz.configure40
-rw-r--r--www/firefox/patches/patch-xpcom_components_Module.h16
-rw-r--r--www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build13
-rw-r--r--www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp13
-rw-r--r--www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp13
65 files changed, 481 insertions, 1542 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 20510c484bd..09ab220ab7f 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.287 2017/02/24 21:54:52 maya Exp $
+# $NetBSD: Makefile,v 1.288 2017/03/07 20:45:43 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 51.0
-MOZ_BRANCH_MINOR= .1
+MOZ_BRANCH= 52.0
+MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION= 5
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 362056e80d1..d6cf89c95df 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.116 2017/02/11 12:12:02 abs Exp $
+@comment $NetBSD: PLIST,v 1.117 2017/03/07 20:45:43 ryoon Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -34,8 +34,6 @@ lib/firefox/browser/chrome/browser/content/browser/aboutSocialError.xhtml
lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.css
lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.js
lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.xhtml
-lib/firefox/browser/chrome/browser/content/browser/aboutTabGroupsMigration.js
-lib/firefox/browser/chrome/browser/content/browser/aboutTabGroupsMigration.xhtml
lib/firefox/browser/chrome/browser/content/browser/aboutWelcomeBack.xhtml
lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.css
lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.js
@@ -79,6 +77,7 @@ lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.js
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-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
@@ -147,12 +146,16 @@ 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-c-contextMenus.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-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-utils.js
lib/firefox/browser/chrome/browser/content/browser/ext-windows.js
@@ -167,6 +170,7 @@ lib/firefox/browser/chrome/browser/content/browser/hiddenWindow.xul
lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul
lib/firefox/browser/chrome/browser/content/browser/license.html
lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png
+lib/firefox/browser/chrome/browser/content/browser/migration/extra-migration-strings.properties
lib/firefox/browser/chrome/browser/content/browser/migration/migration.js
lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul
lib/firefox/browser/chrome/browser/content/browser/newtab/alternativeDefaultSites.json
@@ -209,6 +213,8 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/blocklists.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/colors.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/connection.js
lib/firefox/browser/chrome/browser/content/browser/preferences/connection.xul
+lib/firefox/browser/chrome/browser/content/browser/preferences/containers.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/containers.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/cookies.js
lib/firefox/browser/chrome/browser/content/browser/preferences/cookies.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/donottrack.xul
@@ -218,6 +224,7 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.css
lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.xml
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/advanced.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/applications.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/containers.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/content.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/main.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.js
@@ -251,7 +258,9 @@ lib/firefox/browser/chrome/browser/content/browser/schemas/commands.json
lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus.json
lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus_internal.json
lib/firefox/browser/chrome/browser/content/browser/schemas/history.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/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/windows.json
lib/firefox/browser/chrome/browser/content/browser/search/search.xml
@@ -283,6 +292,7 @@ lib/firefox/browser/chrome/browser/content/browser/tabbrowser.css
lib/firefox/browser/chrome/browser/content/browser/tabbrowser.xml
lib/firefox/browser/chrome/browser/content/browser/translation-infobar.xml
lib/firefox/browser/chrome/browser/content/browser/urlbarBindings.xml
+lib/firefox/browser/chrome/browser/content/browser/usercontext.svg
lib/firefox/browser/chrome/browser/content/browser/usercontext/usercontext.css
lib/firefox/browser/chrome/browser/content/browser/utilityOverlay.js
lib/firefox/browser/chrome/browser/content/browser/viewSourceOverlay.xul
@@ -362,7 +372,6 @@ 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
-lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/buttons.png
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/contentAreaDownloadsView.css
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-blocked.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow-menuPanel.png
@@ -444,6 +453,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/places/unsortedBookmarks
lib/firefox/browser/chrome/browser/skin/classic/browser/places/unstarred48.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/containers.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
@@ -545,16 +556,14 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge-failed.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-star.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-tab.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/usercontext/banking.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/usercontext/personal.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/usercontext/shopping.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/usercontext/work.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
lib/firefox/browser/chrome/chrome.manifest
lib/firefox/browser/chrome/devtools/content/aboutdebugging/aboutdebugging.css
@@ -606,7 +615,6 @@ lib/firefox/browser/chrome/devtools/content/debugger/views/toolbar-view.js
lib/firefox/browser/chrome/devtools/content/debugger/views/variable-bubble-view.js
lib/firefox/browser/chrome/devtools/content/debugger/views/watch-expressions-view.js
lib/firefox/browser/chrome/devtools/content/debugger/views/workers-view.js
-lib/firefox/browser/chrome/devtools/content/dom/content/dom-view.css
lib/firefox/browser/chrome/devtools/content/dom/dom.html
lib/firefox/browser/chrome/devtools/content/dom/main.js
lib/firefox/browser/chrome/devtools/content/framework/connect/connect.css
@@ -617,20 +625,18 @@ lib/firefox/browser/chrome/devtools/content/framework/dev-edition-promo/dev-edit
lib/firefox/browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-promo.xul
lib/firefox/browser/chrome/devtools/content/framework/options-panel.css
lib/firefox/browser/chrome/devtools/content/framework/toolbox-init.js
-lib/firefox/browser/chrome/devtools/content/framework/toolbox-options.js
lib/firefox/browser/chrome/devtools/content/framework/toolbox-options.xhtml
lib/firefox/browser/chrome/devtools/content/framework/toolbox-process-window.js
lib/firefox/browser/chrome/devtools/content/framework/toolbox-process-window.xul
lib/firefox/browser/chrome/devtools/content/framework/toolbox-window.xul
lib/firefox/browser/chrome/devtools/content/framework/toolbox.xul
-lib/firefox/browser/chrome/devtools/content/inspector/fonts/fonts.js
-lib/firefox/browser/chrome/devtools/content/inspector/inspector.xul
+lib/firefox/browser/chrome/devtools/content/inspector/inspector.js
+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.css
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
@@ -650,9 +656,6 @@ lib/firefox/browser/chrome/devtools/content/projecteditor/chrome/content/project
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/promisedebugger/promise-controller.js
-lib/firefox/browser/chrome/devtools/content/promisedebugger/promise-debugger.xhtml
-lib/firefox/browser/chrome/devtools/content/promisedebugger/promise-panel.js
lib/firefox/browser/chrome/devtools/content/responsive.html/index.js
lib/firefox/browser/chrome/devtools/content/responsive.html/index.xhtml
lib/firefox/browser/chrome/devtools/content/scratchpad/scratchpad.js
@@ -689,9 +692,6 @@ lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/properties.js
lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/utils.js
lib/firefox/browser/chrome/devtools/content/webaudioeditor/webaudioeditor.xul
lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.xul
-lib/firefox/browser/chrome/devtools/modules/devtools/acorn/acorn.js
-lib/firefox/browser/chrome/devtools/modules/devtools/acorn/acorn_loose.js
-lib/firefox/browser/chrome/devtools/modules/devtools/acorn/walk.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/aboutdebugging.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/controls.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/install-error.js
@@ -743,9 +743,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/dom-tree.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/main-frame.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/main-toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/search-box.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/search-box.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/search.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/constants.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/dom-decorator.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/dom-view.css
@@ -756,8 +753,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/reducers
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/reducers/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/dom-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/dom.html
-lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/main.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/ToolboxProcess.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/about-devtools-toolbox.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/attach-thread.js
@@ -774,6 +769,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/source-map
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/target-from-url.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/target.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-highlighter-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-host-manager.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-hosts.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox.js
@@ -784,10 +780,29 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-commands.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-search.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/html-editor.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/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/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/store.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/types.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/utils/l10n.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/element-container.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/element-editor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/html-editor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/markup-container.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/read-only-container.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/read-only-editor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/root-container.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/text-container.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/text-editor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/element-style.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/rule.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/text-property.js
@@ -795,8 +810,10 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/rule
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/rule-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/text-property-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/dom-node-preview.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/highlighters-overlay.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/node-types.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-menu.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-overlays.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/tooltips-overlay.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/toolsidebar.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers-panel.js
@@ -809,13 +826,10 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-child.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-observer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-sniffer.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/controls.png
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/controls@2x.png
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/general.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/headers-panel.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/json-panel.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/main.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/read-only-prop.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/search-box.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/search.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/text-panel.css
@@ -859,7 +873,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tr
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/start.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/constants.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/dominator-tree-lazy-children.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/initializer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/models.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers.js
@@ -878,17 +891,46 @@ 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/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/components/filter-buttons.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/search-box.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/toggle-button.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/events.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/filter-predicates.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-automation.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-builder.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-collector.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-exporter.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/toolbox-overlay.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/l10n.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/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/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/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/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/sort-predicates.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/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
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/recording-controls.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/recording-list-item.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/recording-list.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall-header.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall-tree-row.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall-tree.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/events.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/actors.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/compatibility.js
@@ -908,12 +950,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/marker-formatters.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/markers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/waterfall-ticks.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/graphs.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/marker-details.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/marker-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/markers-overview.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/tree-view.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/widgets/waterfall-ticks.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/actions.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/dom-utils.js
@@ -922,6 +963,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/hel
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/panel-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/prefs.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/profiler-mm-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/recording-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/synth-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/tab-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/urls.js
@@ -931,7 +973,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/he
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/file-picker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/l10n.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/prompts.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdir.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/app-manager/app-project-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/core.js
@@ -952,8 +993,10 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/st
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/resource.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/tree.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/devices.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/display-pixel-ratio.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/location.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/network-throttling.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/screenshot.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/touch-simulation.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/viewports.js
@@ -964,7 +1007,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/brow
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/browser.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/device-modal.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/device-selector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/dpr-selector.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/global-toolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/network-throttling-selector.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/resizable-viewport.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport-dimension.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport-toolbar.js
@@ -981,7 +1026,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/inde
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/manager.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/devices.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/display-pixel-ratio.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/location.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/network-throttling.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/screenshot.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/touch-simulation.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/viewports.js
@@ -1012,17 +1059,24 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/no
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/array.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/attribute.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/caption.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/comment-node.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/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/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/long-string.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/nan.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/null.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/number.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object-with-text.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object-with-url.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/object.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/promise.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/prop-rep.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/regexp.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/rep-utils.js
@@ -1030,11 +1084,16 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/re
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/reps.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/string.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/stylesheet.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/symbol.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/text-node.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/undefined.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/window.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/search-box.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/sidebar-toggle.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/sidebar-toggle.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/draggable.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/split-box.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/split-box.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/stack-trace.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/tabbar.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/tabbar.js
@@ -1058,11 +1117,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/devtools-file
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/doorhanger.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-watcher-worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/file-watcher.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/frame-script-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/getjson.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/inplace-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/key-shortcuts.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/keycodes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/network-throttling-profiles.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/node-attribute-parser.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/options-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/output-parser.js
@@ -1081,16 +1140,18 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/shim/Services
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/suggestion-picker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/telemetry.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/theme-switching.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/theme.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/undo.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/immutable.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/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.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
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-virtualized.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/redux.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/reselect.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/seamless-immutable.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/view-source.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/webgl-utils.js
@@ -1105,7 +1166,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/Filte
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/FlameGraph.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/Graphs.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/GraphsWorker.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/HTMLTooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/LineGraphWidget.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/MdnDocsWidget.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/MountainGraphWidget.js
@@ -1113,13 +1173,18 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/SideM
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/SimpleListWidget.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/Spectrum.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/TableWidget.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/Tooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/TreeWidget.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesView.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesViewController.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/CssDocsTooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/EventTooltipHelper.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchBasedEditorTooltip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchCubicBezierTooltip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchFilterTooltip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/Tooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/TooltipToggle.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/VariableContentHelper.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/view-helpers.js
@@ -1146,6 +1211,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleedi
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
+lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/toolbars.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/variables.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/webaudioeditor/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/console-commands.js
@@ -1176,22 +1243,28 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/net-r
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/events.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/json.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/net/utils/net.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/enhancers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/filters.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/messages.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/ui.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/collapse-button.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/console-output.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/console-table.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-bar.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-button.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/grip-message-body.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-container.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-icon.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-indent.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-repeat.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/default-renderer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/variables-view-link.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/constants.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/main.js
@@ -1207,6 +1280,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-conso
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/selectors/ui.js
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/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/id-generator.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/messages.js
@@ -1278,6 +1356,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/pretty-print-
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/process.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/profiler.js
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
@@ -1292,13 +1371,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/TabSour
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/actor-registry-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/audionodes.json
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/automation-timeline.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/css-grid-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/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-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/webapps.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
@@ -1325,6 +1404,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/DevToolsUtils.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/Loader.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/shared/Parser.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/shared/ThreadSafeDevToolsUtils.js
+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
@@ -1371,6 +1453,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance.j
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
@@ -1530,6 +1613,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/preference.js
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
@@ -1566,7 +1650,6 @@ lib/firefox/browser/chrome/devtools/skin/animationinspector.css
lib/firefox/browser/chrome/devtools/skin/boxmodel.css
lib/firefox/browser/chrome/devtools/skin/canvasdebugger.css
lib/firefox/browser/chrome/devtools/skin/commandline.css
-lib/firefox/browser/chrome/devtools/skin/common.css
lib/firefox/browser/chrome/devtools/skin/components-frame.css
lib/firefox/browser/chrome/devtools/skin/components-h-split-box.css
lib/firefox/browser/chrome/devtools/skin/computed.css
@@ -1585,7 +1668,6 @@ lib/firefox/browser/chrome/devtools/skin/images/angle-swatch.svg
lib/firefox/browser/chrome/devtools/skin/images/animation-fast-track.svg
lib/firefox/browser/chrome/devtools/skin/images/arrow-e.png
lib/firefox/browser/chrome/devtools/skin/images/arrow-e@2x.png
-lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-divider@2x.png
lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.png
lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton@2x.png
lib/firefox/browser/chrome/devtools/skin/images/breakpoint.svg
@@ -1600,15 +1682,12 @@ lib/firefox/browser/chrome/devtools/skin/images/command-paintflashing.svg
lib/firefox/browser/chrome/devtools/skin/images/command-pick.svg
lib/firefox/browser/chrome/devtools/skin/images/command-responsivemode.svg
lib/firefox/browser/chrome/devtools/skin/images/command-rulers.svg
-lib/firefox/browser/chrome/devtools/skin/images/command-scratchpad.svg
lib/firefox/browser/chrome/devtools/skin/images/command-screenshot.svg
lib/firefox/browser/chrome/devtools/skin/images/commandline-icon.svg
lib/firefox/browser/chrome/devtools/skin/images/controls.png
lib/firefox/browser/chrome/devtools/skin/images/controls@2x.png
lib/firefox/browser/chrome/devtools/skin/images/cubic-bezier-swatch.png
lib/firefox/browser/chrome/devtools/skin/images/cubic-bezier-swatch@2x.png
-lib/firefox/browser/chrome/devtools/skin/images/debugger-blackbox.svg
-lib/firefox/browser/chrome/devtools/skin/images/debugger-prettyprint.svg
lib/firefox/browser/chrome/devtools/skin/images/debugger-step-in.svg
lib/firefox/browser/chrome/devtools/skin/images/debugger-step-out.svg
lib/firefox/browser/chrome/devtools/skin/images/debugger-step-over.svg
@@ -1641,7 +1720,6 @@ 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
lib/firefox/browser/chrome/devtools/skin/images/filetypes/globe.svg
-lib/firefox/browser/chrome/devtools/skin/images/filetypes/store.svg
lib/firefox/browser/chrome/devtools/skin/images/filter-swatch.svg
lib/firefox/browser/chrome/devtools/skin/images/filter.svg
lib/firefox/browser/chrome/devtools/skin/images/filters.svg
@@ -1684,12 +1762,14 @@ lib/firefox/browser/chrome/devtools/skin/images/firebug/tool-options.svg
lib/firefox/browser/chrome/devtools/skin/images/firebug/twisty-closed-firebug.svg
lib/firefox/browser/chrome/devtools/skin/images/firebug/twisty-open-firebug.svg
lib/firefox/browser/chrome/devtools/skin/images/geometry-editor.svg
+lib/firefox/browser/chrome/devtools/skin/images/globe.svg
+lib/firefox/browser/chrome/devtools/skin/images/grid.svg
lib/firefox/browser/chrome/devtools/skin/images/import.svg
-lib/firefox/browser/chrome/devtools/skin/images/itemArrow-dark-ltr.svg
-lib/firefox/browser/chrome/devtools/skin/images/itemArrow-dark-rtl.svg
-lib/firefox/browser/chrome/devtools/skin/images/itemArrow-ltr.svg
-lib/firefox/browser/chrome/devtools/skin/images/itemArrow-rtl.svg
-lib/firefox/browser/chrome/devtools/skin/images/itemToggle.svg
+lib/firefox/browser/chrome/devtools/skin/images/item-arrow-dark-ltr.svg
+lib/firefox/browser/chrome/devtools/skin/images/item-arrow-dark-rtl.svg
+lib/firefox/browser/chrome/devtools/skin/images/item-arrow-ltr.svg
+lib/firefox/browser/chrome/devtools/skin/images/item-arrow-rtl.svg
+lib/firefox/browser/chrome/devtools/skin/images/item-toggle.svg
lib/firefox/browser/chrome/devtools/skin/images/noise.png
lib/firefox/browser/chrome/devtools/skin/images/pane-collapse.svg
lib/firefox/browser/chrome/devtools/skin/images/pane-expand.svg
@@ -1720,11 +1800,9 @@ lib/firefox/browser/chrome/devtools/skin/images/search-clear-light.svg
lib/firefox/browser/chrome/devtools/skin/images/search.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-broken.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-insecure.svg
-lib/firefox/browser/chrome/devtools/skin/images/security-state-local.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-secure.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-weak.svg
lib/firefox/browser/chrome/devtools/skin/images/sort-arrows.svg
-lib/firefox/browser/chrome/devtools/skin/images/tabs-icon.svg
lib/firefox/browser/chrome/devtools/skin/images/toggle-tools.png
lib/firefox/browser/chrome/devtools/skin/images/toggle-tools@2x.png
lib/firefox/browser/chrome/devtools/skin/images/tool-canvas.svg
@@ -1757,17 +1835,16 @@ lib/firefox/browser/chrome/devtools/skin/images/vview-open-inspector@2x.png
lib/firefox/browser/chrome/devtools/skin/images/webconsole.svg
lib/firefox/browser/chrome/devtools/skin/inspector.css
lib/firefox/browser/chrome/devtools/skin/jit-optimizations.css
+lib/firefox/browser/chrome/devtools/skin/layout.css
lib/firefox/browser/chrome/devtools/skin/light-theme.css
lib/firefox/browser/chrome/devtools/skin/markup.css
lib/firefox/browser/chrome/devtools/skin/memory.css
lib/firefox/browser/chrome/devtools/skin/netmonitor.css
lib/firefox/browser/chrome/devtools/skin/performance.css
lib/firefox/browser/chrome/devtools/skin/projecteditor/projecteditor.css
-lib/firefox/browser/chrome/devtools/skin/promisedebugger.css
lib/firefox/browser/chrome/devtools/skin/rules.css
lib/firefox/browser/chrome/devtools/skin/scratchpad.css
lib/firefox/browser/chrome/devtools/skin/shadereditor.css
-lib/firefox/browser/chrome/devtools/skin/splitters.css
lib/firefox/browser/chrome/devtools/skin/splitview.css
lib/firefox/browser/chrome/devtools/skin/storage.css
lib/firefox/browser/chrome/devtools/skin/styleeditor.css
@@ -1782,7 +1859,6 @@ lib/firefox/browser/chrome/devtools/skin/tooltip/arrow-vertical-dark@2x.png
lib/firefox/browser/chrome/devtools/skin/tooltip/arrow-vertical-light.png
lib/firefox/browser/chrome/devtools/skin/tooltip/arrow-vertical-light@2x.png
lib/firefox/browser/chrome/devtools/skin/tooltips.css
-lib/firefox/browser/chrome/devtools/skin/variables.css
lib/firefox/browser/chrome/devtools/skin/webaudioeditor.css
lib/firefox/browser/chrome/devtools/skin/webconsole.css
lib/firefox/browser/chrome/devtools/skin/widgets.css
@@ -1834,6 +1910,8 @@ lib/firefox/browser/chrome/en-US/locale/browser/preferences/applications.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/blocklists.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/colors.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/connection.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences/containers.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences/containers.properties
lib/firefox/browser/chrome/en-US/locale/browser/preferences/content.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/cookies.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/donottrack.dtd
@@ -1862,11 +1940,13 @@ lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/bing.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ddg.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google-nocodes.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google.xml
-lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/list.txt
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-en.ico
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/list.json
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/twitter.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/wikipedia.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/yahoo-en-CA.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/yahoo.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/yandex-en.xml
lib/firefox/browser/chrome/en-US/locale/browser/setDesktopBackground.dtd
lib/firefox/browser/chrome/en-US/locale/browser/shellservice.properties
lib/firefox/browser/chrome/en-US/locale/browser/sitePermissions.properties
@@ -1889,6 +1969,7 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/aboutdebugging.pro
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/animationinspector.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/app-manager.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/appcacheutils.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/boxmodel.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/canvasdebugger.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/canvasdebugger.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/components.properties
@@ -1900,23 +1981,20 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/device.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/dom.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/eyedropper.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/filterwidget.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/font-inspector.dtd
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/font-inspector.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/graphs.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/har.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/inspector.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/inspector.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/jit-optimizations.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/jsonview.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/layoutview.dtd
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/layout.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/markers.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/memory.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/menus.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/netmonitor.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/netmonitor.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/performance.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/performance.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/projecteditor.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/promisedebugger.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/responsive.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/responsiveUI.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/scratchpad.dtd
@@ -1931,7 +2009,6 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/storage.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/storage.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/styleinspector.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/toolbox.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/toolbox.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/webConsole.dtd
@@ -1953,6 +2030,7 @@ lib/firefox/browser/chrome/icons/default/default16.png
lib/firefox/browser/chrome/icons/default/default32.png
lib/firefox/browser/chrome/icons/default/default48.png
lib/firefox/browser/chrome/pdfjs/content/PdfJs.jsm
+lib/firefox/browser/chrome/pdfjs/content/PdfJsNetwork.jsm
lib/firefox/browser/chrome/pdfjs/content/PdfJsTelemetry.jsm
lib/firefox/browser/chrome/pdfjs/content/PdfStreamConverter.jsm
lib/firefox/browser/chrome/pdfjs/content/PdfjsChromeUtils.jsm
@@ -2281,7 +2359,6 @@ lib/firefox/browser/components/aboutNewTabService.js
lib/firefox/browser/components/components.manifest
lib/firefox/browser/components/devtools-startup.js
lib/firefox/browser/components/interfaces.xpt
-lib/firefox/browser/components/libbrowsercomps.so
lib/firefox/browser/components/nsBrowserContentHandler.js
lib/firefox/browser/components/nsBrowserGlue.js
lib/firefox/browser/components/nsSessionStartup.js
@@ -2398,7 +2475,6 @@ lib/firefox/browser/modules/AttributionCode.jsm
lib/firefox/browser/modules/AutoMigrate.jsm
lib/firefox/browser/modules/BrowserUITelemetry.jsm
lib/firefox/browser/modules/BrowserUsageTelemetry.jsm
-lib/firefox/browser/modules/CaptivePortalWatcher.jsm
lib/firefox/browser/modules/CastingApps.jsm
lib/firefox/browser/modules/ContentClick.jsm
lib/firefox/browser/modules/ContentCrashHandlers.jsm
@@ -2429,6 +2505,7 @@ lib/firefox/browser/modules/NewTabSearchProvider.jsm
lib/firefox/browser/modules/NewTabURL.jsm
lib/firefox/browser/modules/NewTabWebChannel.jsm
lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
+lib/firefox/browser/modules/PermissionUI.jsm
lib/firefox/browser/modules/PlacesProvider.jsm
lib/firefox/browser/modules/PlacesUIUtils.jsm
lib/firefox/browser/modules/PluginContent.jsm
@@ -2444,7 +2521,6 @@ lib/firefox/browser/modules/ShellService.jsm
lib/firefox/browser/modules/SitePermissions.jsm
lib/firefox/browser/modules/Social.jsm
lib/firefox/browser/modules/SocialService.jsm
-lib/firefox/browser/modules/TabGroupsMigrator.jsm
lib/firefox/browser/modules/TransientPrefs.jsm
lib/firefox/browser/modules/UITour.jsm
lib/firefox/browser/modules/URLBarZoom.jsm
@@ -2476,7 +2552,6 @@ lib/firefox/browser/modules/sessionstore/TabAttributes.jsm
lib/firefox/browser/modules/sessionstore/TabState.jsm
lib/firefox/browser/modules/sessionstore/TabStateCache.jsm
lib/firefox/browser/modules/sessionstore/TabStateFlusher.jsm
-lib/firefox/browser/modules/sessionstore/Utils.jsm
lib/firefox/browser/modules/syncedtabs/EventEmitter.jsm
lib/firefox/browser/modules/syncedtabs/SyncedTabsDeckComponent.js
lib/firefox/browser/modules/syncedtabs/SyncedTabsDeckStore.js
@@ -2648,9 +2723,12 @@ lib/firefox/chrome/en-US/locale/en-US/services/errors.properties
lib/firefox/chrome/en-US/locale/en-US/services/sync.properties
lib/firefox/chrome/marionette/content/accessibility.js
lib/firefox/chrome/marionette/content/action.js
+lib/firefox/chrome/marionette/content/addon.js
+lib/firefox/chrome/marionette/content/assert.js
lib/firefox/chrome/marionette/content/atom.js
lib/firefox/chrome/marionette/content/browser.js
lib/firefox/chrome/marionette/content/capture.js
+lib/firefox/chrome/marionette/content/cert.js
lib/firefox/chrome/marionette/content/cookies.js
lib/firefox/chrome/marionette/content/dispatcher.js
lib/firefox/chrome/marionette/content/driver.js
@@ -2660,6 +2738,7 @@ lib/firefox/chrome/marionette/content/evaluate.js
lib/firefox/chrome/marionette/content/event.js
lib/firefox/chrome/marionette/content/frame.js
lib/firefox/chrome/marionette/content/interaction.js
+lib/firefox/chrome/marionette/content/l10n.js
lib/firefox/chrome/marionette/content/legacyaction.js
lib/firefox/chrome/marionette/content/listener.js
lib/firefox/chrome/marionette/content/logging.js
@@ -2668,6 +2747,7 @@ lib/firefox/chrome/marionette/content/modal.js
lib/firefox/chrome/marionette/content/navigate.js
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/pippki/content/pippki/CAOverlay.xul
lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul
@@ -2677,9 +2757,9 @@ lib/firefox/chrome/pippki/content/pippki/WebSitesOverlay.xul
lib/firefox/chrome/pippki/content/pippki/certDump.xul
lib/firefox/chrome/pippki/content/pippki/certManager.js
lib/firefox/chrome/pippki/content/pippki/certManager.xul
+lib/firefox/chrome/pippki/content/pippki/certViewer.js
lib/firefox/chrome/pippki/content/pippki/certViewer.xul
-lib/firefox/chrome/pippki/content/pippki/certpicker.js
-lib/firefox/chrome/pippki/content/pippki/certpicker.xul
+lib/firefox/chrome/pippki/content/pippki/changepassword.js
lib/firefox/chrome/pippki/content/pippki/changepassword.xul
lib/firefox/chrome/pippki/content/pippki/choosetoken.js
lib/firefox/chrome/pippki/content/pippki/choosetoken.xul
@@ -2693,19 +2773,18 @@ lib/firefox/chrome/pippki/content/pippki/device_manager.js
lib/firefox/chrome/pippki/content/pippki/device_manager.xul
lib/firefox/chrome/pippki/content/pippki/downloadcert.js
lib/firefox/chrome/pippki/content/pippki/downloadcert.xul
+lib/firefox/chrome/pippki/content/pippki/editcacert.js
lib/firefox/chrome/pippki/content/pippki/editcacert.xul
-lib/firefox/chrome/pippki/content/pippki/editcerts.js
lib/firefox/chrome/pippki/content/pippki/exceptionDialog.js
lib/firefox/chrome/pippki/content/pippki/exceptionDialog.xul
lib/firefox/chrome/pippki/content/pippki/load_device.xul
-lib/firefox/chrome/pippki/content/pippki/password.js
lib/firefox/chrome/pippki/content/pippki/pippki.js
lib/firefox/chrome/pippki/content/pippki/protectedAuth.js
lib/firefox/chrome/pippki/content/pippki/protectedAuth.xul
lib/firefox/chrome/pippki/content/pippki/resetpassword.js
lib/firefox/chrome/pippki/content/pippki/resetpassword.xul
+lib/firefox/chrome/pippki/content/pippki/setp12password.js
lib/firefox/chrome/pippki/content/pippki/setp12password.xul
-lib/firefox/chrome/pippki/content/pippki/viewCertDetails.js
lib/firefox/chrome/pippki/content/pippki/viewCertDetails.xul
lib/firefox/chrome/recording/content/recording.js
lib/firefox/chrome/recording/content/recording.xul
@@ -2713,8 +2792,12 @@ 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-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-cookies.js
lib/firefox/chrome/toolkit/content/extensions/ext-downloads.js
lib/firefox/chrome/toolkit/content/extensions/ext-extension.js
@@ -2724,7 +2807,7 @@ lib/firefox/chrome/toolkit/content/extensions/ext-management.js
lib/firefox/chrome/toolkit/content/extensions/ext-notifications.js
lib/firefox/chrome/toolkit/content/extensions/ext-runtime.js
lib/firefox/chrome/toolkit/content/extensions/ext-storage.js
-lib/firefox/chrome/toolkit/content/extensions/ext-test.js
+lib/firefox/chrome/toolkit/content/extensions/ext-topSites.js
lib/firefox/chrome/toolkit/content/extensions/ext-webNavigation.js
lib/firefox/chrome/toolkit/content/extensions/ext-webRequest.js
lib/firefox/chrome/toolkit/content/extensions/schemas/alarms.json
@@ -2743,6 +2826,7 @@ lib/firefox/chrome/toolkit/content/extensions/schemas/notifications.json
lib/firefox/chrome/toolkit/content/extensions/schemas/runtime.json
lib/firefox/chrome/toolkit/content/extensions/schemas/storage.json
lib/firefox/chrome/toolkit/content/extensions/schemas/test.json
+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
@@ -2754,8 +2838,6 @@ lib/firefox/chrome/toolkit/content/gfxsanity/videotest.mp4
lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js
lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js
lib/firefox/chrome/toolkit/content/global/BrowserElementCopyPaste.js
-lib/firefox/chrome/toolkit/content/global/BrowserElementPanning.js
-lib/firefox/chrome/toolkit/content/global/BrowserElementPanningAPZDisabled.js
lib/firefox/chrome/toolkit/content/global/TopLevelVideoDocument.js
lib/firefox/chrome/toolkit/content/global/XPCNativeWrapper.js
lib/firefox/chrome/toolkit/content/global/about.js
@@ -2803,7 +2885,10 @@ 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/checkbox.xml
lib/firefox/chrome/toolkit/content/global/bindings/colorpicker.xml
+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
+lib/firefox/chrome/toolkit/content/global/bindings/datetimepopup.xml
lib/firefox/chrome/toolkit/content/global/bindings/dialog.xml
lib/firefox/chrome/toolkit/content/global/bindings/editor.xml
lib/firefox/chrome/toolkit/content/global/bindings/expander.xml
@@ -2827,11 +2912,14 @@ lib/firefox/chrome/toolkit/content/global/bindings/scale.xml
lib/firefox/chrome/toolkit/content/global/bindings/scrollbar.xml
lib/firefox/chrome/toolkit/content/global/bindings/scrollbox.xml
lib/firefox/chrome/toolkit/content/global/bindings/spinbuttons.xml
+lib/firefox/chrome/toolkit/content/global/bindings/spinner.js
lib/firefox/chrome/toolkit/content/global/bindings/splitter.xml
lib/firefox/chrome/toolkit/content/global/bindings/stringbundle.xml
lib/firefox/chrome/toolkit/content/global/bindings/tabbox.xml
lib/firefox/chrome/toolkit/content/global/bindings/text.xml
lib/firefox/chrome/toolkit/content/global/bindings/textbox.xml
+lib/firefox/chrome/toolkit/content/global/bindings/timekeeper.js
+lib/firefox/chrome/toolkit/content/global/bindings/timepicker.js
lib/firefox/chrome/toolkit/content/global/bindings/toolbar.xml
lib/firefox/chrome/toolkit/content/global/bindings/toolbarbutton.xml
lib/firefox/chrome/toolkit/content/global/bindings/tree.xml
@@ -2851,8 +2939,6 @@ 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/dialogOverlay.js
-lib/firefox/chrome/toolkit/content/global/dialogOverlay.xul
lib/firefox/chrome/toolkit/content/global/directionDetector.html
lib/firefox/chrome/toolkit/content/global/editMenuOverlay.js
lib/firefox/chrome/toolkit/content/global/editMenuOverlay.xul
@@ -2865,8 +2951,9 @@ 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/globalOverlay.xul
-lib/firefox/chrome/toolkit/content/global/inlineSpellCheckUI.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
lib/firefox/chrome/toolkit/content/global/manifestMessages.js
lib/firefox/chrome/toolkit/content/global/menulist.css
@@ -2874,8 +2961,6 @@ lib/firefox/chrome/toolkit/content/global/minimal-xul.css
lib/firefox/chrome/toolkit/content/global/mozilla.xhtml
lib/firefox/chrome/toolkit/content/global/netError.xhtml
lib/firefox/chrome/toolkit/content/global/notfound.wav
-lib/firefox/chrome/toolkit/content/global/nsClipboard.js
-lib/firefox/chrome/toolkit/content/global/nsUserSettings.js
lib/firefox/chrome/toolkit/content/global/platformHTMLBindings.xml
lib/firefox/chrome/toolkit/content/global/plugins.css
lib/firefox/chrome/toolkit/content/global/plugins.html
@@ -2904,12 +2989,12 @@ 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/strres.js
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
lib/firefox/chrome/toolkit/content/global/textbox.css
+lib/firefox/chrome/toolkit/content/global/timepicker.xhtml
lib/firefox/chrome/toolkit/content/global/treeUtils.js
lib/firefox/chrome/toolkit/content/global/viewPartialSource.js
lib/firefox/chrome/toolkit/content/global/viewPartialSource.xul
@@ -2929,7 +3014,6 @@ 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/helperApps.js
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
@@ -2977,10 +3061,10 @@ lib/firefox/chrome/toolkit/content/passwordmgr/recipes.json
lib/firefox/chrome/toolkit/content/satchel/formSubmitListener.js
lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.css
lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.xml
-lib/firefox/chrome/toolkit/pluginproblem/pluginFinderBinding.css
lib/firefox/chrome/toolkit/pluginproblem/pluginProblem.xml
lib/firefox/chrome/toolkit/pluginproblem/pluginProblemBinding.css
lib/firefox/chrome/toolkit/pluginproblem/pluginProblemContent.css
+lib/firefox/chrome/toolkit/pluginproblem/pluginReplaceBinding.css
lib/firefox/chrome/toolkit/res/accessiblecaret-normal@1.5x.png
lib/firefox/chrome/toolkit/res/accessiblecaret-normal@1x.png
lib/firefox/chrome/toolkit/res/accessiblecaret-normal@2.25x.png
@@ -3103,6 +3187,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/info.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/information-16.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/information-24.png
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/question-16.png
@@ -3197,6 +3282,8 @@ lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-Arrow.svg
lib/firefox/chrome/toolkit/skin/classic/global/resizer.css
lib/firefox/chrome/toolkit/skin/classic/global/richlistbox.css
lib/firefox/chrome/toolkit/skin/classic/global/scale.css
+lib/firefox/chrome/toolkit/skin/classic/global/scale/scale-tray-horiz.gif
+lib/firefox/chrome/toolkit/skin/classic/global/scale/scale-tray-vert.gif
lib/firefox/chrome/toolkit/skin/classic/global/scrollbar/slider.gif
lib/firefox/chrome/toolkit/skin/classic/global/scrollbars.css
lib/firefox/chrome/toolkit/skin/classic/global/scrollbox.css
@@ -3209,6 +3296,7 @@ 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
@@ -3271,9 +3359,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginActivate.pn
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClose.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDownload.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginMissing.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginStripe.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked-64.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.png
@@ -3291,10 +3376,8 @@ lib/firefox/components/AppsService.js
lib/firefox/components/BrowserElementParent.js
lib/firefox/components/BrowserElementProxy.js
lib/firefox/components/CSSUnprefixingService.js
-lib/firefox/components/ChromeNotifications.js
lib/firefox/components/ColorAnalyzer.js
lib/firefox/components/ConsoleAPIStorage.js
-lib/firefox/components/ContactManager.js
lib/firefox/components/ContentProcessSingleton.js
lib/firefox/components/DownloadLegacy.js
lib/firefox/components/EditorUtils.js
@@ -3303,17 +3386,13 @@ lib/firefox/components/FormAutofillContentService.js
lib/firefox/components/FormAutofillStartup.js
lib/firefox/components/FormHistoryStartup.js
lib/firefox/components/FxAccountsPush.js
-lib/firefox/components/InstallPackagedWebapp.js
lib/firefox/components/MainProcessSingleton.js
lib/firefox/components/MozKeyboard.js
lib/firefox/components/NetworkGeolocationProvider.js
lib/firefox/components/NotificationStorage.js
-lib/firefox/components/PACGenerator.js
-lib/firefox/components/PackagedAppUtils.js
lib/firefox/components/PageIconProtocolHandler.js
lib/firefox/components/PageThumbsProtocol.js
lib/firefox/components/PermissionSettings.js
-lib/firefox/components/PhoneNumberService.js
lib/firefox/components/PlacesCategoriesStarter.js
lib/firefox/components/PresentationControlService.js
lib/firefox/components/PresentationDataChannelSessionTransport.js
@@ -3326,13 +3405,11 @@ lib/firefox/components/SecurityReporter.js
lib/firefox/components/SettingsManager.js
lib/firefox/components/SiteSpecificUserAgent.js
lib/firefox/components/SlowScriptDebug.js
-lib/firefox/components/TVSimulatorService.js
lib/firefox/components/TelemetryStartup.js
lib/firefox/components/TooltipTextProvider.js
lib/firefox/components/UnifiedComplete.js
lib/firefox/components/Weave.js
lib/firefox/components/WebVTTParserWrapper.js
-lib/firefox/components/Webapps.js
lib/firefox/components/WellKnownOpportunisticUtils.js
lib/firefox/components/XULStore.js
lib/firefox/components/addonManager.js
@@ -3349,6 +3426,7 @@ lib/firefox/components/htmlMenuBuilder.js
lib/firefox/components/interfaces.xpt
lib/firefox/components/marionette.js
lib/firefox/components/messageWakeupService.js
+lib/firefox/components/mozProtocolHandler.js
lib/firefox/components/multiprocessShims.js
lib/firefox/components/nsAsyncShutdown.js
lib/firefox/components/nsBlocklistService.js
@@ -3444,7 +3522,6 @@ lib/firefox/modules/AboutReader.jsm
lib/firefox/modules/AddonManager.jsm
lib/firefox/modules/AddonWatcher.jsm
lib/firefox/modules/AppConstants.jsm
-lib/firefox/modules/AppDownloadManager.jsm
lib/firefox/modules/AppsServiceChild.jsm
lib/firefox/modules/AppsUtils.jsm
lib/firefox/modules/AsyncPrefs.jsm
@@ -3479,8 +3556,6 @@ lib/firefox/modules/ColorConversion.js
lib/firefox/modules/CommonDialog.jsm
lib/firefox/modules/CompatWarning.jsm
lib/firefox/modules/Console.jsm
-lib/firefox/modules/ContactDB.jsm
-lib/firefox/modules/ContactService.jsm
lib/firefox/modules/ContentPrefInstance.jsm
lib/firefox/modules/ContentPrefService2.jsm
lib/firefox/modules/ContentPrefServiceChild.jsm
@@ -3497,6 +3572,7 @@ lib/firefox/modules/DNSTypes.jsm
lib/firefox/modules/DOMRequestHelper.jsm
lib/firefox/modules/DataReader.jsm
lib/firefox/modules/DataWriter.jsm
+lib/firefox/modules/DateTimePickerHelper.jsm
lib/firefox/modules/DeferredSave.jsm
lib/firefox/modules/DeferredTask.jsm
lib/firefox/modules/Deprecated.jsm
@@ -3513,9 +3589,14 @@ lib/firefox/modules/DownloadUtils.jsm
lib/firefox/modules/Downloads.jsm
lib/firefox/modules/Extension.jsm
lib/firefox/modules/ExtensionAPI.jsm
+lib/firefox/modules/ExtensionChild.jsm
+lib/firefox/modules/ExtensionCommon.jsm
lib/firefox/modules/ExtensionContent.jsm
lib/firefox/modules/ExtensionManagement.jsm
+lib/firefox/modules/ExtensionParent.jsm
+lib/firefox/modules/ExtensionSearchHandler.jsm
lib/firefox/modules/ExtensionStorage.jsm
+lib/firefox/modules/ExtensionStorageSync.jsm
lib/firefox/modules/ExtensionUtils.jsm
lib/firefox/modules/FileUtils.jsm
lib/firefox/modules/Finder.jsm
@@ -3526,10 +3607,11 @@ lib/firefox/modules/FormAutofill.jsm
lib/firefox/modules/FormAutofillIntegration.jsm
lib/firefox/modules/FormData.jsm
lib/firefox/modules/FormHistory.jsm
-lib/firefox/modules/FreeSpaceWatcher.jsm
+lib/firefox/modules/FormLikeFactory.jsm
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
@@ -3537,6 +3619,7 @@ 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
lib/firefox/modules/GMPInstallManager.jsm
lib/firefox/modules/GMPUtils.jsm
lib/firefox/modules/Geometry.jsm
@@ -3544,14 +3627,13 @@ lib/firefox/modules/History.jsm
lib/firefox/modules/Http.jsm
lib/firefox/modules/ISO8601DateUtils.jsm
lib/firefox/modules/ImageObjectProcessor.jsm
-lib/firefox/modules/ImportExport.jsm
lib/firefox/modules/IndexedDBHelper.jsm
lib/firefox/modules/InlineSpellChecker.jsm
lib/firefox/modules/InlineSpellCheckerContent.jsm
lib/firefox/modules/InsecurePasswordUtils.jsm
lib/firefox/modules/Integration.jsm
+lib/firefox/modules/JSONFile.jsm
lib/firefox/modules/Keyboard.jsm
-lib/firefox/modules/Langpacks.jsm
lib/firefox/modules/LegacyExtensionsUtils.jsm
lib/firefox/modules/LightweightThemeConsumer.jsm
lib/firefox/modules/LightweightThemeManager.jsm
@@ -3570,7 +3652,6 @@ lib/firefox/modules/ManifestObtainer.jsm
lib/firefox/modules/ManifestProcessor.jsm
lib/firefox/modules/MatchPattern.jsm
lib/firefox/modules/Memory.jsm
-lib/firefox/modules/MessageBroadcaster.jsm
lib/firefox/modules/MessageChannel.jsm
lib/firefox/modules/MulticastDNS.jsm
lib/firefox/modules/NLP.jsm
@@ -3580,8 +3661,6 @@ lib/firefox/modules/NewTabUtils.jsm
lib/firefox/modules/NotificationDB.jsm
lib/firefox/modules/OSCrypto.jsm
lib/firefox/modules/ObjectUtils.jsm
-lib/firefox/modules/OfflineCacheInstaller.jsm
-lib/firefox/modules/OperatorApps.jsm
lib/firefox/modules/PageMenu.jsm
lib/firefox/modules/PageMetadata.jsm
lib/firefox/modules/PageThumbUtils.jsm
@@ -3596,10 +3675,6 @@ lib/firefox/modules/PermissionSettings.jsm
lib/firefox/modules/PermissionsInstaller.jsm
lib/firefox/modules/PermissionsTable.jsm
lib/firefox/modules/PermissionsUtils.jsm
-lib/firefox/modules/PhoneNumber.jsm
-lib/firefox/modules/PhoneNumberMetaData.jsm
-lib/firefox/modules/PhoneNumberNormalizer.jsm
-lib/firefox/modules/PhoneNumberUtils.jsm
lib/firefox/modules/PlacesBackups.jsm
lib/firefox/modules/PlacesDBUtils.jsm
lib/firefox/modules/PlacesRemoteTabsAutocompleteProvider.jsm
@@ -3637,12 +3712,10 @@ lib/firefox/modules/RemoteSecurityUI.jsm
lib/firefox/modules/RemoteWebProgress.jsm
lib/firefox/modules/RequestAutocompleteUI.jsm
lib/firefox/modules/ResetProfile.jsm
-lib/firefox/modules/ResourceStatsDB.jsm
-lib/firefox/modules/ResourceStatsService.jsm
+lib/firefox/modules/ResponsivenessMonitor.jsm
lib/firefox/modules/RokuApp.jsm
lib/firefox/modules/SafeBrowsing.jsm
lib/firefox/modules/Schemas.jsm
-lib/firefox/modules/ScriptPreloader.jsm
lib/firefox/modules/ScrollPosition.jsm
lib/firefox/modules/SearchStaticData.jsm
lib/firefox/modules/SearchSuggestionController.jsm
@@ -3660,7 +3733,6 @@ lib/firefox/modules/SimpleServiceDiscovery.jsm
lib/firefox/modules/Sntp.jsm
lib/firefox/modules/SpatialNavigation.jsm
lib/firefox/modules/Sqlite.jsm
-lib/firefox/modules/StoreTrustAnchor.jsm
lib/firefox/modules/Subprocess.jsm
lib/firefox/modules/SystemUpdateService.jsm
lib/firefox/modules/Task.jsm
@@ -3682,7 +3754,6 @@ lib/firefox/modules/UITelemetry.jsm
lib/firefox/modules/UpdateUtils.jsm
lib/firefox/modules/UserAgentOverrides.jsm
lib/firefox/modules/UserAgentUpdates.jsm
-lib/firefox/modules/UserCustomizations.jsm
lib/firefox/modules/ValueExtractor.jsm
lib/firefox/modules/ViewSourceBrowser.jsm
lib/firefox/modules/WebChannel.jsm
@@ -3693,7 +3764,6 @@ lib/firefox/modules/WebRequest.jsm
lib/firefox/modules/WebRequestCommon.jsm
lib/firefox/modules/WebRequestContent.js
lib/firefox/modules/WebRequestUpload.jsm
-lib/firefox/modules/Webapps.jsm
lib/firefox/modules/WindowDraggingUtils.jsm
lib/firefox/modules/XPCOMUtils.jsm
lib/firefox/modules/XPathGenerator.jsm
@@ -3999,7 +4069,6 @@ lib/firefox/modules/identity/jwcrypto.jsm
lib/firefox/modules/jsdebugger.jsm
lib/firefox/modules/lz4.js
lib/firefox/modules/lz4_internal.js
-lib/firefox/modules/mcc_iso3166_table.jsm
lib/firefox/modules/media/IdpSandbox.jsm
lib/firefox/modules/media/PeerConnectionIdp.jsm
lib/firefox/modules/media/RTCStatsReport.jsm
@@ -4027,6 +4096,7 @@ lib/firefox/modules/presentation/ControllerStateMachine.jsm
lib/firefox/modules/presentation/ReceiverStateMachine.jsm
lib/firefox/modules/presentation/StateMachineHelper.jsm
lib/firefox/modules/psm/DER.jsm
+lib/firefox/modules/psm/X509.jsm
lib/firefox/modules/reader/JSDOMParser.js
lib/firefox/modules/reader/Readability.js
lib/firefox/modules/reader/ReaderWorker.js
@@ -4053,7 +4123,6 @@ lib/firefox/modules/services-sync/FxaMigrator.jsm
lib/firefox/modules/services-sync/SyncedTabs.jsm
lib/firefox/modules/services-sync/addonsreconciler.js
lib/firefox/modules/services-sync/addonutils.js
-lib/firefox/modules/services-sync/bookmark_utils.js
lib/firefox/modules/services-sync/bookmark_validator.js
lib/firefox/modules/services-sync/browserid_identity.js
lib/firefox/modules/services-sync/collection_validator.js
@@ -4062,6 +4131,7 @@ lib/firefox/modules/services-sync/engines.js
lib/firefox/modules/services-sync/engines/addons.js
lib/firefox/modules/services-sync/engines/bookmarks.js
lib/firefox/modules/services-sync/engines/clients.js
+lib/firefox/modules/services-sync/engines/extension-storage.js
lib/firefox/modules/services-sync/engines/forms.js
lib/firefox/modules/services-sync/engines/history.js
lib/firefox/modules/services-sync/engines/passwords.js
@@ -4083,6 +4153,7 @@ lib/firefox/modules/services-sync/status.js
lib/firefox/modules/services-sync/telemetry.js
lib/firefox/modules/services-sync/userapi.js
lib/firefox/modules/services-sync/util.js
+lib/firefox/modules/sessionstore/Utils.jsm
lib/firefox/modules/sqlite/sqlite_internal.js
lib/firefox/modules/subprocess/subprocess_common.jsm
lib/firefox/modules/subprocess/subprocess_shared.js
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index c8904a51143..6a2d20df02f 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,83 +1,67 @@
-$NetBSD: distinfo,v 1.273 2017/02/16 02:25:16 maya Exp $
+$NetBSD: distinfo,v 1.274 2017/03/07 20:45:43 ryoon Exp $
-SHA1 (firefox-51.0.1.source.tar.xz) = b73255fd4f90fd0c1b107b566679da2df3f31cf1
-RMD160 (firefox-51.0.1.source.tar.xz) = 6acc6fc8e3e317842d75b0233a24b0f19c9d3f34
-SHA512 (firefox-51.0.1.source.tar.xz) = 556e31b717c0640ef5e181e00b9d2a6ea0ace7c16ae04333d0f2e9e120d0ab9efe82a4ca314ef43594c080523edf37953e65dbf694c7428be0a024f3719d8312
-Size (firefox-51.0.1.source.tar.xz) = 202142716 bytes
-SHA1 (patch-aa) = 42dbb30745fc0e40cf582376c8fbfcd0715fcf5e
+SHA1 (firefox-52.0.source.tar.xz) = 991aea082084438e08f2da59bbebf47b8e9b1741
+RMD160 (firefox-52.0.source.tar.xz) = cd65f848fd82f94b4050281e2f75930b99eb1aed
+SHA512 (firefox-52.0.source.tar.xz) = bffe5fd9eee240f252bf8a882c46f04551d21f6f58b8da68779cd106ed012ea77ee16bc287c847f8a7b959203c79f1b1d3f50151111f9610e1ca7a57c7b811f7
+Size (firefox-52.0.source.tar.xz) = 212356732 bytes
+SHA1 (patch-aa) = c1084caa275e57b716c3499301f7fc3f99ef5026
SHA1 (patch-ao) = 1564bc503670dc07ec8b9b43927f0c5879f3a44d
SHA1 (patch-as) = 632ebd35287f8f97d18721d39a0514d4cdbb12cc
-SHA1 (patch-browser_app_nsBrowserApp.cpp) = f109f5430e1b9fd11f8263d756bea0572b8ffa20
-SHA1 (patch-browser_components_nsBrowserGlue.js) = 01eef808fadc361215e60e44d79cfc8a4336107f
SHA1 (patch-browser_installer_package-manifest.in) = d1f003f9ac65e12eb04b1d19a4d9a780bded9fd9
-SHA1 (patch-browser_themes_shared_icon-colors.inc.svg) = 222924b45ceb00d712cbc5b0a9cb064e3ee44fa5
-SHA1 (patch-build_autoconf_toolchain.m4) = f7f5ad59a7cefbc7989e99f10b48520f1bd4bad1
+SHA1 (patch-build_buildconfig.py) = 9ed9af92d8fd1015d15c658b649a6c9d9a6b5c1b
SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
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) = 143e1d0b416b33ae92950f347898cf6ed22d0f6f
-SHA1 (patch-build_moz.configure_toolchain.configure) = f02501a573b65f3e9c793c6146f26dd1d3e19222
+SHA1 (patch-build_moz.configure_old.configure) = d57f718ff0c1d2901ec9f4c958f5a7323ee7c700
SHA1 (patch-build_pgo_profileserver.py) = 48ad50f716eda2157cbc225298f6672f164b4207
-SHA1 (patch-config_Makefile.in) = e2c3b3d142a3c0d0e9b1800e9000e5fe5548e2d0
-SHA1 (patch-config_baseconfig.mk) = 480269a28836351dfd204f6f7694bdcfe129e282
-SHA1 (patch-config_external_moz.build) = 4912a9ef13c7793e2734e5f49ca7fd56be09fe48
+SHA1 (patch-config_Makefile.in) = fc6d4de55f4d9ab8598d5b89e6630e4685af1795
+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) = dbfa6dec0f046be9e390175bf754747fee28f8b7
+SHA1 (patch-config_system-headers) = fd0cb4d2061af1eaa34313370a57720ed693607f
SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c
-SHA1 (patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py) = 91a4de9ab68fc2a0304ab29c0ada756362a7f037
SHA1 (patch-dom_media_AudioStream.cpp) = 3d2e3d92849a355c05d7ec0ded61d551ffe0c581
SHA1 (patch-dom_media_AudioStream.h) = 26f70000cc4810834204d15b45e1469dd5f23617
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_plugins_ipc_PluginModuleChild.h) = 15c01df2fa7f989b533ef769ce77438b5e9bfdb9
-SHA1 (patch-dom_system_OSFileConstants.cpp) = 6e5a347c317947c869415d740f25813332ee9597
-SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 5678e4a44927326de55f1f0fd2907102b314ca10
-SHA1 (patch-gfx_2d_BorrowedContext.h) = 5efa43c865ccd95ffe82fc23db3bde7ef8bf8441
+SHA1 (patch-dom_system_OSFileConstants.cpp) = e932ca46cbc78eb8486b9ff704434a962645c6b2
+SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 2aaf5f82a57dbb375558442718c239e2e7da1406
SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6
SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = 09eb2fa66109d38a3aedc940fcaaee5f91e216ae
SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 9b357196b795f7698f0763cb6cfcd39b4aea6420
-SHA1 (patch-gfx_layers_composite_LayerManagerComposite.cpp) = b3ef914b5fa735b4740d45d01478f67018532a3a
-SHA1 (patch-gfx_layers_composite_LayerManagerComposite.h) = f4d61ffaecaec7e77909d1d08b5b10837e999741
-SHA1 (patch-gfx_layers_moz.build) = e43f1b234357b0af7f58aaceb275d9d0e3468097
SHA1 (patch-gfx_moz.build) = 0d669ac6dc1af17ea8ed7e84e4915947c2a6b1ca
-SHA1 (patch-gfx_skia_generate__mozbuild.py) = 0c1faddbda7d819a82a4f1bd97a753c835f0c81d
-SHA1 (patch-gfx_skia_moz.build) = 1def6cf3bce77e9294c0f05f62a33b7baed12b12
-SHA1 (patch-gfx_skia_skia_src_core_SkUtilsArm.cpp) = 94a5a88f1177e09ef7b8dbdb6439153933004356
-SHA1 (patch-gfx_thebes_gfxFontUtils.cpp) = 639c610a3a1441d5c7e2e9fa0f42b8df1c8e4319
-SHA1 (patch-gfx_thebes_moz.build) = 9c20c1e804ffeb739d37631ef9766ae3fe0b8e85
+SHA1 (patch-gfx_skia_generate__mozbuild.py) = fba2f212f84e6cc20a4269e21ed654c348ae8fee
+SHA1 (patch-gfx_skia_moz.build) = 7363e76ac75e27cffe5ee1194741d444a625b871
+SHA1 (patch-gfx_thebes_moz.build) = 0435f36d573fee1bb300612e4b7dc6fcda2d5456
SHA1 (patch-gfx_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_lwbrk_nsJISx4051LineBreaker.cpp) = 7169c1f7eccea9ea3b14d46aa972d0d6b8159eec
SHA1 (patch-intl_unicharutil_util_moz.build) = 2e604c8695b490657ee14cae01ca84d7bd51236c
SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a
-SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 2c5ce6290760e0435365dac788d283f9bb78acd9
SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = c81930280bd76a00fbad37aad02fb8451d80b1ee
SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 45409f2152d5ffc376c18c0c9bc696e08e3910ce
SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d
-SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = df7216659ec3d09249a4a75312a8dd0347d90e6e
SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = aa6dee9678eeb0eb3d50e74f6e629ee0f4bc9d4b
SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 5313c4097c278640573c7e1cb089f6f76b48c1a8
SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba4e0872490f870e7d2f468e1fe87c33cf9a3500
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-js__src__vm__SPSProfiler.cpp) = cff6658f08267b3529605a40682a748e99006dbb
-SHA1 (patch-js_src_jit-LIR.cpp) = 84bf136ba96653d8a3aa283c8e4e9f1722a6901f
-SHA1 (patch-js_src_jit_MIR.cpp) = 71676b2510b2cc5bd97c2e872645780fdb680ff3
-SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = 25cf7d202fc56968225e6f20fb4b292002ccaa4a
+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) = 42d9aba521881cb08065d37889ca29a0071eb632
+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-layout_style_GenerateCSSPropsGenerated.py) = 6e2267d2ffda97923e6e39ed2517f86fb7316b86
-SHA1 (patch-media_libcubeb_src_cubeb.c) = 91eb24595c423b7e086670bb67e73cfd0bfb5559
+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
@@ -85,67 +69,49 @@ SHA1 (patch-media_libcubeb_tests_moz.build) = 63d8b749a6ebbe8fd662ce1e2bde6aa9cb
SHA1 (patch-media_libcubeb_update.sh) = 333e1e2898f1703a298ba2a3f731ffc63f09a184
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
SHA1 (patch-media_libsoundtouch_src_soundtouch__perms.h) = 2d08a3b4176c155c57b458cb78043318b68d8fe2
-SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = b280f691dbe67b6de592dcd04baf33c6cf480cc8
-SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = d79a49a983209e6b673956561f2001c6ef4bcc20
-SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = f53c6751dfa63c9ea7a08d39f7be34efb94faef9
-SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 74e92dd838f106e0e050d223d42ad85d1d2e0753
SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
-SHA1 (patch-media_libtheora_lib_info.c) = 4826eb95ee675b213116e8e9149f81be504a2131
SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81
-SHA1 (patch-media_libtremor_Makefile.in) = 90f0890f02a3d9791fd02cbcfbf85a9b4bee2cce
SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf
-SHA1 (patch-media_libvorbis_Makefile.in) = b1cc7dc1caab94366db6f2a51b72f02ac420bc71
-SHA1 (patch-media_libvorbis_lib_vorbis_info.c) = 6e8d162c83fd7e350bfe8997adc3a9790d159675
SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf0
SHA1 (patch-media_libyuv_source_mjpeg__decoder.cc) = d3b301dcec965b8f3efdd202db07fd75b503bc20
-SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e
SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7
-SHA1 (patch-media_webrtc_signaling_test_common.build) = 7c3e9b1009d486a50c0498b44330ee3e6b239597
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 4d85eefde7dafa195d10587e5dfaf59d8cee18d3
+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-memory_build_mozjemalloc__compat.c) = c27c745fd6e0bbb120ef34d8a984937d5f2e1319
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_libmar_tests_moz.build) = 88620bb6be30f8b1168e1000784070f4cbbc7d79
-SHA1 (patch-modules_libpref_init_all.js) = 3bc5962fdabb5aecb72ffc7e73bb56392d1ea717
SHA1 (patch-modules_woff2_src_store_bytes.h) = f7081a6ffadc79e19f30137ca805b962e60821e8
SHA1 (patch-modules_woff2_src_woff2_common.cc) = 77dec15dad41d47a3f85e578587c3a137a8dc7f3
-SHA1 (patch-moz.configure) = cd4d3851e9dc2c1adb6a92b6f3cd1966adcd5beb
SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249
SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
-SHA1 (patch-python_mozbuild_mozbuild_configure_options.py) = f862ee425ae016df6fe12b55050a8dc075ecce89
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_libxul.mk) = 98d79e7ae52d4b54111512a98a03810e2bbe454d
-SHA1 (patch-toolkit_library_moz.build) = b807002797d8ea803be9446ebd179cf17b16f3ed
+SHA1 (patch-toolkit_library_dependentlibs.py) = d7ee2ca0a47cd3fba6bb249c5b2e83b619640dde
+SHA1 (patch-toolkit_library_moz.build) = d4136a5d3c42f2a44155f029a3201959273c5e94
SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 29ae1476560623bf1871c927d3728761112529e9
-SHA1 (patch-toolkit_moz.configure) = 851a9ed80072de0215863cf81cdbf674bf31271d
+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
SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54
-SHA1 (patch-xpcom_components_Module.h) = 892f8d6a9cb868e5cdc3c6f6be233055dd1ca529
SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 950874fbc255c93a828bddd84ffe8478094214cc
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 85046b0893b68f95b55a9d3b5aea1d7a60cf0ade
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cb72e1bc9a38e3f123539d7bb2aca6793f2b574
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 71a33723a557a6153405f6baec8404b25f841608
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = 3a902eb9a23b3b5737f3c8cb5f96a5ad9a98a189
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp) = d246f0695eb43d43bfd5571297945a4b7a88f72c
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 75db49c9cb6bf2993afba82b731d80389d866212
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index d7a67072c89..25783224813 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.88 2017/02/20 12:22:53 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.89 2017/03/07 20:45:43 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -89,11 +89,7 @@ CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
-PYTHON_VERSIONS_ACCEPTED= 27
-PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-sqlite2
-.include "../../lang/python/application.mk"
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
+CONFIGURE_ENV+= CPP=${CPP}
SUBST_CLASSES+= python
SUBST_STAGE.python= pre-configure
@@ -153,14 +149,6 @@ CONFIGURE_ARGS+= --enable-macos-target=10.4
CONFIGURE_ARGS+= --enable-macos-target=10.5
.endif
-#
-# pysqlite2 is used by xulrunner's Python virtualenv. If pysqlite2 isn't
-# installed at build time it will attempt to download it instead, so the
-# problem is stealthy in a networked environment, and obvious in an
-# offline environment.
-#
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
-
# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
.PHONY: create-rm-wrapper
pre-configure: create-rm-wrapper
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index 484972cafd6..3201973632a 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.37 2017/02/12 07:36:27 ryoon Exp $
+# $NetBSD: options.mk,v 1.38 2017/03/07 20:45:43 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
PKG_OPTIONS_REQUIRED_GROUPS= gtk
PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
-PKG_SUGGESTED_OPTIONS= gtk2
+PKG_SUGGESTED_OPTIONS= gtk3
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
@@ -52,8 +52,6 @@ CONFIGURE_ARGS+= --disable-alsa
.if !empty(PKG_OPTIONS:Moss)
CONFIGURE_ARGS+= --with-oss
.include "../../mk/oss.buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-oss
.endif
.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 1f0a8b02970..3c1285d03f0 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-aa,v 1.50 2017/03/07 20:45:43 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-01-23 04:07:13.206599109 +0000
+--- old-configure.in.orig 2017-03-04 10:47:32.150192599 +0000
+++ old-configure.in
-@@ -2195,11 +2195,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
+@@ -2159,11 +2159,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
MOZ_SYSTEM_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -2938,6 +2934,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -2894,6 +2890,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_RAW=1
MOZ_VPX_ERROR_CONCEALMENT=1
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -2980,7 +2979,7 @@ dnl Use integers over floats for audio o
+@@ -2936,7 +2935,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,163 +39,7 @@ $NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
MOZ_SAMPLE_TYPE_S16=1
AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
AC_SUBST(MOZ_SAMPLE_TYPE_S16)
-@@ -3005,6 +3004,155 @@ fi
- AC_SUBST(MOZ_RAW)
-
- dnl ========================================================
-+dnl Check for libogg
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-ogg,
-+[ --with-system-ogg Use system libogg (located with pkgconfig)],
-+MOZ_SYSTEM_OGG=1,
-+MOZ_SYSTEM_OGG=)
-+
-+if test -n "$MOZ_SYSTEM_OGG"; then
-+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
-+
-+ _SAVE_LIBS=$LIBS
-+ LIBS="$LIBS $MOZ_OGG_LIBS"
-+ AC_CHECK_FUNC(ogg_set_mem_functions, [],
-+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
-+ LIBS=$_SAVE_LIBS
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_OGG)
-+
-+dnl ========================================================
-+dnl Check for libvorbis
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-vorbis,
-+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)],
-+MOZ_SYSTEM_VORBIS=1,
-+MOZ_SYSTEM_VORBIS=)
-+
-+if test -n "$MOZ_SYSTEM_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_VORBIS)
-+
-+dnl ========================================================
-+dnl Check for integer-only libvorbis aka tremor
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-tremor,
-+[ --with-system-tremor Use system libtremor (located with pkgconfig)],
-+MOZ_SYSTEM_TREMOR=1,
-+MOZ_SYSTEM_TREMOR=)
-+
-+if test -n "$MOZ_SYSTEM_TREMOR"; then
-+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_TREMOR)
-+
-+dnl ========================================================
-+dnl Check for libcelt
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-celt,
-+[ --with-system-celt Use system libcelt (located with pkgconfig)],
-+MOZ_SYSTEM_CELT=1,
-+MOZ_SYSTEM_CELT=)
-+
-+if test -n "$MOZ_SYSTEM_CELT"; then
-+ PKG_CHECK_MODULES(MOZ_CELT, celt)
-+else
-+ MOZ_CELT_CFLAGS='-I$(topsrcdir)/media/libopus'
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_CELT)
-+
-+dnl ========================================================
-+dnl Check for libopus
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-opus,
-+[ --with-system-opus Use system libopus (located with pkgconfig)],
-+MOZ_SYSTEM_OPUS=1,
-+MOZ_SYSTEM_OPUS=)
-+
-+if test -n "$MOZ_SYSTEM_OPUS"; then
-+ PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
-+else
-+ MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_OPUS)
-+
-+dnl ========================================================
-+dnl Check for libtheora
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-theora,
-+[ --with-system-theora Use system libtheora (located with pkgconfig)],
-+MOZ_SYSTEM_THEORA=1,
-+MOZ_SYSTEM_THEORA=)
-+
-+if test -n "$MOZ_SYSTEM_THEORA"; then
-+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_THEORA)
-+
-+dnl ========================================================
-+dnl Check for libsoundtouch
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-soundtouch,
-+[ --with-system-soundtouch Use system libsoundtouch (located with pkgconfig)],
-+MOZ_SYSTEM_SOUNDTOUCH=1,
-+MOZ_SYSTEM_SOUNDTOUCH=)
-+
-+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
-+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.8.0)
-+
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ _SAVE_CXXFLAGS=$CXXFLAGS
-+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
-+ AC_CACHE_CHECK(for soundtouch sample type,
-+ ac_cv_soundtouch_sample_type,
-+ [AC_TRY_COMPILE([#include <SoundTouch.h>
-+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
-+ #error soundtouch expects float samples
-+ #endif],
-+ [],
-+ [ac_cv_soundtouch_sample_type=short],
-+ [ac_cv_soundtouch_sample_type=float])])
-+ CXXFLAGS=$_SAVE_CXXFLAGS
-+ AC_LANG_RESTORE
-+
-+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
-+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
-+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
-+ fi
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
-+
-+dnl ========================================================
-+dnl = Disable VP8 decoder support
-+dnl ========================================================
-+MOZ_ARG_DISABLE_BOOL(webm,
-+[ --disable-webm Disable support for WebM media (VP8 video and Vorbis audio)],
-+ MOZ_WEBM=,
-+ MOZ_WEBM=1)
-+
-+if test -n "$MOZ_WEBM"; then
-+ AC_DEFINE(MOZ_WEBM)
-+ MOZ_VPX=1
-+fi;
-+
-+dnl ========================================================
- dnl = Apple platform decoder support
- dnl ========================================================
- if test "$COMPILE_ENVIRONMENT"; then
-@@ -3088,6 +3236,216 @@ if test -n "$MOZ_OMX_PLUGIN"; then
+@@ -3044,6 +3043,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
fi
fi
@@ -209,112 +53,7 @@ $NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
+MOZ_SYSTEM_OGG=)
+
+if test -n "$MOZ_SYSTEM_OGG"; then
-+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
-+
-+ _SAVE_LIBS=$LIBS
-+ LIBS="$LIBS $MOZ_OGG_LIBS"
-+ AC_CHECK_FUNC(ogg_set_mem_functions, [],
-+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
-+ LIBS=$_SAVE_LIBS
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_OGG)
-+
-+dnl ========================================================
-+dnl Check for libvorbis
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-vorbis,
-+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)],
-+MOZ_SYSTEM_VORBIS=1,
-+MOZ_SYSTEM_VORBIS=)
-+
-+if test -n "$MOZ_SYSTEM_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_VORBIS)
-+
-+dnl ========================================================
-+dnl Check for integer-only libvorbis aka tremor
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-tremor,
-+[ --with-system-tremor Use system libtremor (located with pkgconfig)],
-+MOZ_SYSTEM_TREMOR=1,
-+MOZ_SYSTEM_TREMOR=)
-+
-+if test -n "$MOZ_SYSTEM_TREMOR"; then
-+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_TREMOR)
-+
-+dnl ========================================================
-+dnl Check for libtheora
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-theora,
-+[ --with-system-theora Use system libtheora (located with pkgconfig)],
-+MOZ_SYSTEM_THEORA=1,
-+MOZ_SYSTEM_THEORA=)
-+
-+if test -n "$MOZ_SYSTEM_THEORA"; then
-+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_THEORA)
-+
-+dnl ========================================================
-+dnl Check for libSoundTouch
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-soundtouch,
-+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)],
-+MOZ_SYSTEM_SOUNDTOUCH=1,
-+MOZ_SYSTEM_SOUNDTOUCH=)
-+
-+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
-+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)
-+
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ _SAVE_CXXFLAGS=$CXXFLAGS
-+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
-+ AC_CACHE_CHECK(for soundtouch sample type,
-+ ac_cv_soundtouch_sample_type,
-+ [AC_TRY_COMPILE([#include <SoundTouch.h>
-+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
-+ #error soundtouch expects float samples
-+ #endif],
-+ [],
-+ [ac_cv_soundtouch_sample_type=short],
-+ [ac_cv_soundtouch_sample_type=float])])
-+ CXXFLAGS=$_SAVE_CXXFLAGS
-+ AC_LANG_RESTORE
-+
-+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
-+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
-+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
-+ fi
-+fi
-+
-+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
-+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH)
-+fi
-+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
-+
-+dnl ========================================================
-+dnl Check for libogg
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-ogg,
-+[ --with-system-ogg Use system libogg (located with pkgconfig)],
-+MOZ_SYSTEM_OGG=1,
-+MOZ_SYSTEM_OGG=)
-+
-+if test -n "$MOZ_SYSTEM_OGG"; then
-+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
++ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.0)
+
+ _SAVE_LIBS=$LIBS
+ LIBS="$LIBS $MOZ_OGG_LIBS"
@@ -412,7 +151,7 @@ $NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
dnl system libvpx Support
dnl ========================================================
MOZ_ARG_WITH_BOOL(system-libvpx,
-@@ -3252,6 +3610,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
+@@ -3208,6 +3312,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
AC_SUBST(MOZ_WEBM_ENCODER)
dnl ==================================
@@ -480,31 +219,7 @@ $NetBSD: patch-aa,v 1.49 2017/01/25 13:24:51 ryoon Exp $
dnl = Check alsa availability on Linux
dnl ==================================
-@@ -3265,12 +3684,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
- MOZ_ALSA=1,
- MOZ_ALSA=)
-
-+MOZ_ARG_DISABLE_BOOL(alsa-dlopen,
-+[ --disable-alsa-dlopen Disable runtime linking of libasound.so],
-+ DISABLE_LIBASOUND_DLOPEN=1,
-+ DISABLE_LIBASOUND_DLOPEN=)
-+
- if test -n "$MOZ_ALSA"; then
- PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
- [echo "$MOZ_ALSA_PKG_ERRORS"
- AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])])
- fi
-
-+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
-+ AC_DEFINE(DISABLE_LIBASOUND_DLOPEN)
-+else
-+ MOZ_ALSA_LIBS=
-+fi
-+
- AC_SUBST(MOZ_ALSA)
-
- dnl ========================================================
-@@ -5220,6 +5650,27 @@ if test "$USE_FC_FREETYPE"; then
+@@ -5023,6 +5188,27 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
deleted file mode 100644
index e09240732c8..00000000000
--- a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.10 2017/01/25 13:24:51 ryoon Exp $
-
---- browser/app/nsBrowserApp.cpp.orig 2017-01-16 16:16:49.000000000 +0000
-+++ browser/app/nsBrowserApp.cpp
-@@ -358,6 +358,9 @@ int main(int argc, char* argv[], char* e
- {
- mozilla::TimeStamp start = mozilla::TimeStamp::Now();
-
-+ setenv("MOZ_GMP_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
-+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0);
-+
- #ifdef HAS_DLL_BLOCKLIST
- DllBlocklist_Initialize();
-
diff --git a/www/firefox/patches/patch-browser_components_nsBrowserGlue.js b/www/firefox/patches/patch-browser_components_nsBrowserGlue.js
deleted file mode 100644
index 7505d2b30bb..00000000000
--- a/www/firefox/patches/patch-browser_components_nsBrowserGlue.js
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-browser_components_nsBrowserGlue.js,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-
---- browser/components/nsBrowserGlue.js.orig 2016-10-31 20:15:25.000000000 +0000
-+++ browser/components/nsBrowserGlue.js
-@@ -1054,7 +1054,9 @@ BrowserGlue.prototype = {
- }
- if (SCALING_PROBE_NAME) {
- let scaling = aWindow.devicePixelRatio * 100;
-- Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling);
-+ try {
-+ Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling);
-+ } catch (ex) {}
- }
- },
-
diff --git a/www/firefox/patches/patch-browser_themes_shared_icon-colors.inc.svg b/www/firefox/patches/patch-browser_themes_shared_icon-colors.inc.svg
deleted file mode 100644
index 94eab78367a..00000000000
--- a/www/firefox/patches/patch-browser_themes_shared_icon-colors.inc.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-browser_themes_shared_icon-colors.inc.svg,v 1.1 2017/01/25 13:24:51 ryoon Exp $
-
---- browser/themes/shared/icon-colors.inc.svg.orig 2017-01-16 16:16:51.000000000 +0000
-+++ browser/themes/shared/icon-colors.inc.svg
-@@ -2,7 +2,7 @@
-
- .fieldtext {
- fill: -moz-fieldtext;
--#ifdef XP_LINUX
-+#ifdef MOZ_WIDGET_GTK
- /* The fill-opacity needs to be sufficient for high-contrast settings, and
- pathological Gtk themes where -moz-fieldtext provides low contrast by
- default. */
diff --git a/www/firefox/patches/patch-build_autoconf_toolchain.m4 b/www/firefox/patches/patch-build_autoconf_toolchain.m4
deleted file mode 100644
index e31376dc1d7..00000000000
--- a/www/firefox/patches/patch-build_autoconf_toolchain.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-build_autoconf_toolchain.m4,v 1.1 2017/01/25 13:24:51 ryoon Exp $
-
---- build/autoconf/toolchain.m4.orig 2017-01-16 16:16:51.000000000 +0000
-+++ build/autoconf/toolchain.m4
-@@ -2,14 +2,6 @@ dnl This Source Code Form is subject to
- dnl License, v. 2.0. If a copy of the MPL was not distributed with this
- dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--dnl Several autoconf functions AC_REQUIRE AC_PROG_CPP/AC_PROG_CXXCPP,
--dnl meaning they are called even when we don't call them explicitly.
--dnl However, theses checks are not necessary and python configure sets
--dnl the corresponding variables already, so just skip those tests
--dnl entirely.
--define([AC_PROG_CPP],[])
--define([AC_PROG_CXXCPP],[])
--
- AC_DEFUN([MOZ_TOOL_VARIABLES],
- [
- GNU_AS=
diff --git a/www/firefox/patches/patch-build_buildconfig.py b/www/firefox/patches/patch-build_buildconfig.py
new file mode 100644
index 00000000000..4df517df24d
--- /dev/null
+++ b/www/firefox/patches/patch-build_buildconfig.py
@@ -0,0 +1,11 @@
+$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_moz.configure_keyfiles.configure b/www/firefox/patches/patch-build_moz.configure_keyfiles.configure
new file mode 100644
index 00000000000..3c740d59fca
--- /dev/null
+++ b/www/firefox/patches/patch-build_moz.configure_keyfiles.configure
@@ -0,0 +1,21 @@
+$NetBSD: patch-build_moz.configure_keyfiles.configure,v 1.1 2017/03/07 20:45:43 ryoon Exp $
+
+--- build/moz.configure/keyfiles.configure.orig 2017-01-26 04:20:09.000000000 +0000
++++ build/moz.configure/keyfiles.configure
+@@ -18,6 +18,7 @@ def keyfile(desc, help=None, callback=la
+ @checking('for the %s key' % desc, lambda x: x and x is not no_key)
+ @imports(_from='__builtin__', _import='open')
+ @imports(_from='__builtin__', _import='IOError')
++ @imports(_from='os', _import='environ')
+ def keyfile(value):
+ if value:
+ try:
+@@ -28,7 +29,7 @@ def keyfile(desc, help=None, callback=la
+ raise FatalCheckError("'%s' is empty." % value[0])
+ except IOError as e:
+ raise FatalCheckError("'%s': %s." % (value[0], e.strerror))
+- return no_key
++ return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key
+
+ return keyfile
+
diff --git a/www/firefox/patches/patch-build_moz.configure_old.configure b/www/firefox/patches/patch-build_moz.configure_old.configure
index c7ca4096286..46b89686c96 100644
--- a/www/firefox/patches/patch-build_moz.configure_old.configure
+++ b/www/firefox/patches/patch-build_moz.configure_old.configure
@@ -1,24 +1,8 @@
-$NetBSD: patch-build_moz.configure_old.configure,v 1.4 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-build_moz.configure_old.configure,v 1.5 2017/03/07 20:45:43 ryoon Exp $
---- build/moz.configure/old.configure.orig 2017-01-16 16:16:51.000000000 +0000
+--- build/moz.configure/old.configure.orig 2017-01-23 16:13:47.000000000 +0000
+++ build/moz.configure/old.configure
-@@ -159,6 +159,7 @@ def old_configure_options(*options):
- '--enable-accessibility',
- '--enable-address-sanitizer',
- '--enable-alsa',
-+ '--enable-alsa-dlopen',
- '--enable-android-omx',
- '--enable-b2g-bt',
- '--enable-b2g-camera',
-@@ -241,6 +242,7 @@ def old_configure_options(*options):
- '--enable-url-classifier',
- '--enable-valgrind',
- '--enable-verify-mar',
-+ '--enable-webm',
- '--enable-webrtc',
- '--enable-xul',
- '--enable-zipwriter',
-@@ -279,18 +281,26 @@ def old_configure_options(*options):
+@@ -276,6 +276,7 @@ def old_configure_options(*options):
'--with-nspr-prefix',
'--with-nss-exec-prefix',
'--with-nss-prefix',
@@ -26,17 +10,11 @@ $NetBSD: patch-build_moz.configure_old.configure,v 1.4 2017/01/25 13:24:51 ryoon
'--with-pthreads',
'--with-qemu-exe',
'--with-sixgill',
- '--with-soft-float',
- '--with-system-bz2',
-+ '--with-system-celt',
- '--with-system-icu',
- '--with-system-jpeg',
- '--with-system-libevent',
+@@ -287,7 +288,12 @@ def old_configure_options(*options):
'--with-system-libvpx',
'--with-system-nspr',
'--with-system-nss',
+ '--with-system-ogg',
-+ '--with-system-opus',
'--with-system-png',
+ '--with-system-soundtouch',
+ '--with-system-theora',
diff --git a/www/firefox/patches/patch-build_moz.configure_toolchain.configure b/www/firefox/patches/patch-build_moz.configure_toolchain.configure
deleted file mode 100644
index 1ba9dd8839b..00000000000
--- a/www/firefox/patches/patch-build_moz.configure_toolchain.configure
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-build_moz.configure_toolchain.configure,v 1.1 2017/01/25 13:24:51 ryoon Exp $
-
---- build/moz.configure/toolchain.configure.orig 2017-01-16 16:16:51.000000000 +0000
-+++ build/moz.configure/toolchain.configure
-@@ -756,23 +756,6 @@ def compiler(language, host_or_target, c
- valid_compiler.try_compile(check_msg='%s works' % what,
- onerror=compiler_error)
-
--
-- # Set CPP/CXXCPP for both the build system and old-configure. We don't
-- # need to check this works for preprocessing, because we already relied
-- # on $CC -E/$CXX -E doing preprocessing work to validate the compiler
-- # in the first place.
-- if host_or_target == target:
-- pp_var = {
-- 'C': 'CPP',
-- 'C++': 'CXXCPP',
-- }[language]
--
-- preprocessor = depends_if(valid_compiler)(
-- lambda x: list(x.wrapper) + [x.compiler, '-E'] + list(x.flags))
--
-- set_config(pp_var, preprocessor)
-- add_old_configure_assignment(pp_var, preprocessor)
--
- return valid_compiler
-
-
diff --git a/www/firefox/patches/patch-config_Makefile.in b/www/firefox/patches/patch-config_Makefile.in
index 46dc03423b5..2b02623b952 100644
--- a/www/firefox/patches/patch-config_Makefile.in
+++ b/www/firefox/patches/patch-config_Makefile.in
@@ -1,15 +1,22 @@
-$NetBSD: patch-config_Makefile.in,v 1.9 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-config_Makefile.in,v 1.10 2017/03/07 20:45:43 ryoon Exp $
* Support system libraries
---- config/Makefile.in.orig 2017-01-22 22:50:48.440016062 +0000
+--- config/Makefile.in.orig 2016-09-19 16:19:29.000000000 +0000
+++ config/Makefile.in
-@@ -49,6 +49,13 @@ export:: $(export-preqs)
+@@ -41,6 +41,8 @@ export:: $(export-preqs)
+ $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
+ -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
+ -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
++ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
++ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
+ -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \
+ -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \
+ -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
+@@ -49,6 +51,11 @@ export:: $(export-preqs)
-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
-+ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
-+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
+ -DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \
+ -DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \
+ -DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
diff --git a/www/firefox/patches/patch-config_baseconfig.mk b/www/firefox/patches/patch-config_baseconfig.mk
index a563cacf566..ed0072199b3 100644
--- a/www/firefox/patches/patch-config_baseconfig.mk
+++ b/www/firefox/patches/patch-config_baseconfig.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-config_baseconfig.mk,v 1.9 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-config_baseconfig.mk,v 1.10 2017/03/07 20:45:43 ryoon Exp $
* Set pkgsrc directory structure
---- config/baseconfig.mk.orig 2016-10-31 20:15:27.000000000 +0000
+--- config/baseconfig.mk.orig 2016-09-19 16:19:29.000000000 +0000
+++ config/baseconfig.mk
@@ -2,10 +2,10 @@
# directly in python/mozbuild/mozbuild/base.py for gmake validation.
diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build
index ae7f0c15949..b2dd0fa2b54 100644
--- a/www/firefox/patches/patch-config_external_moz.build
+++ b/www/firefox/patches/patch-config_external_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-config_external_moz.build,v 1.14 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-config_external_moz.build,v 1.15 2017/03/07 20:45:43 ryoon Exp $
* Support system libraries
---- config/external/moz.build.orig 2016-10-31 20:15:28.000000000 +0000
+--- config/external/moz.build.orig 2017-01-23 16:13:47.000000000 +0000
+++ config/external/moz.build
@@ -21,12 +21,21 @@ if CONFIG['MOZ_UPDATER']:
external_dirs += ['modules/brotli']
@@ -38,6 +38,6 @@ $NetBSD: patch-config_external_moz.build,v 1.14 2016/12/03 09:58:26 ryoon Exp $
'media/libspeex_resampler',
'media/libstagefright',
- 'media/libsoundtouch',
+ 'media/psshparser'
]
- DIRS += ['../../' + i for i in external_dirs]
diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers
index dc43cd1da86..a4656f1304b 100644
--- a/www/firefox/patches/patch-config_system-headers
+++ b/www/firefox/patches/patch-config_system-headers
@@ -1,58 +1,23 @@
-$NetBSD: patch-config_system-headers,v 1.21 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.22 2017/03/07 20:45:43 ryoon Exp $
* Try to support Video4Linux2
* Resolve libm undefined error
* Support system libraries
---- config/system-headers.orig 2016-10-31 20:15:28.000000000 +0000
+--- config/system-headers.orig 2017-02-23 20:13:58.000000000 +0000
+++ config/system-headers
-@@ -624,6 +624,8 @@ libgnome/libgnome.h
+@@ -624,6 +624,7 @@ libgnome/libgnome.h
libgnomeui/gnome-icon-lookup.h
libgnomeui/gnome-icon-theme.h
libgnomeui/gnome-ui-init.h
+libv4l2.h
-+limits
limits.h
link.h
#ifdef ANDROID
-@@ -714,6 +716,7 @@ mapiutil.h
- mapix.h
- Math64.h
- math.h
-+complex
- mbstring.h
- #ifdef ANDROID
- android/native_window.h
-@@ -1301,6 +1304,25 @@ vpx/vp8cx.h
- vpx/vp8dx.h
- vpx_mem/vpx_mem.h
+@@ -1267,6 +1268,15 @@ libsn/sn-launcher.h
+ libsn/sn-monitor.h
+ libsn/sn-util.h
#endif
-+#ifdef GKMEDIAS_SHARED_LIBRARY
-+vpx/vpx_codec.h
-+vpx/vpx_decoder.h
-+vpx/vpx_encoder.h
-+vpx/vp8cx.h
-+vpx/vp8dx.h
-+vpx_mem/vpx_mem.h
-+vorbis/codec.h
-+theora/theoradec.h
-+tremor/ivorbiscodec.h
-+speex/speex_resampler.h
-+soundtouch/SoundTouch.h
-+ogg/ogg.h
-+ogg/os_types.h
-+nestegg/nestegg.h
-+cubeb/cubeb.h
-+speex/speex_resampler.h
-+soundtouch/SoundTouch.h
-+#endif
- gst/gst.h
- gst/app/gstappsink.h
- gst/app/gstappsrc.h
-@@ -1331,3 +1353,26 @@ unicode/utypes.h
- #endif
- libutil.h
- unwind.h
+#if MOZ_SYSTEM_GRAPHITE2==1
+graphite2/Font.h
+graphite2/Segment.h
@@ -62,6 +27,13 @@ $NetBSD: patch-config_system-headers,v 1.21 2016/12/03 09:58:26 ryoon Exp $
+harfbuzz/hb-ot.h
+harfbuzz/hb.h
+#endif
+ #if MOZ_SYSTEM_HUNSPELL==1
+ hunspell.hxx
+ #endif
+@@ -1335,3 +1345,17 @@ unicode/utypes.h
+ libutil.h
+ unwind.h
+ fenv.h
+#if MOZ_SYSTEM_OGG==1
+ogg/ogg.h
+ogg/os_types.h
diff --git a/www/firefox/patches/patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py b/www/firefox/patches/patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py
deleted file mode 100644
index 5a50a5e6e31..00000000000
--- a/www/firefox/patches/patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dom_bindings_GenerateCSS2PropertiesWebIDL.py,v 1.1 2017/01/25 13:24:51 ryoon Exp $
-
---- dom/bindings/GenerateCSS2PropertiesWebIDL.py.orig 2017-01-16 16:16:52.000000000 +0000
-+++ dom/bindings/GenerateCSS2PropertiesWebIDL.py
-@@ -16,7 +16,7 @@ def generateLine(propName, extendedAttrs
- return " [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
- propName)
- def generate(output, idlFilename, preprocessorHeader):
-- cpp = list(buildconfig.substs['CPP'])
-+ cpp = shellutil.split(buildconfig.substs['CPP'])
- cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
- cpp.append(preprocessorHeader)
- preprocessed = subprocess.check_output(cpp)
diff --git a/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp b/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp
new file mode 100644
index 00000000000..a897e4a0a26
--- /dev/null
+++ b/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp
@@ -0,0 +1,39 @@
+$NetBSD: patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp,v 1.1 2017/03/07 20:45:43 ryoon Exp $
+
+--- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp.orig 2016-10-14 08:14:07.000000000 +0000
++++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
+@@ -11,9 +11,13 @@
+ #include "prmem.h"
+ #include "prlink.h"
+
++#ifdef MOZ_SYSTEM_SOUNDTOUCH
++#include "nsXPCOMPrivate.h" // for XUL_DLL
++#else
+ // We use a known symbol located in lgpllibs to determine its location.
+ // soundtouch happens to be always included in lgpllibs
+ #include "soundtouch/SoundTouch.h"
++#endif
+
+ namespace mozilla
+ {
+@@ -51,6 +55,12 @@ FFVPXRuntimeLinker::Init()
+
+ sLinkStatus = LinkStatus_FAILED;
+
++#ifdef MOZ_SYSTEM_SOUNDTOUCH
++ // We retrieve the path of the XUL library as this is where mozavcodec and
++ // mozavutil libs are located.
++ char* path =
++ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init);
++#else
+ // We retrieve the path of the lgpllibs library as this is where mozavcodec
+ // and mozavutil libs are located.
+ char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs");
+@@ -61,6 +71,7 @@ FFVPXRuntimeLinker::Init()
+ PR_GetLibraryFilePathname(lgpllibsname,
+ (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
+ PR_FreeLibraryName(lgpllibsname);
++#endif
+ if (!path) {
+ return false;
+ }
diff --git a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp b/www/firefox/patches/patch-dom_system_OSFileConstants.cpp
index 86bafc9b940..06b8fced197 100644
--- a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp
+++ b/www/firefox/patches/patch-dom_system_OSFileConstants.cpp
@@ -1,8 +1,28 @@
-$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.9 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.10 2017/03/07 20:45:43 ryoon Exp $
---- dom/system/OSFileConstants.cpp.orig 2016-09-05 20:12:56.000000000 +0000
+--- dom/system/OSFileConstants.cpp.orig 2017-01-23 16:13:57.000000000 +0000
+++ dom/system/OSFileConstants.cpp
-@@ -699,7 +699,7 @@ static const dom::ConstantSpec gLibcProp
+@@ -16,14 +16,17 @@
+ #include "dirent.h"
+ #include "poll.h"
+ #include "sys/stat.h"
+-#if defined(ANDROID)
++#if defined(XP_LINUX)
+ #include <sys/vfs.h>
+ #define statvfs statfs
++#define f_frsize f_bsize
+ #else
+ #include "sys/statvfs.h"
++#endif // defined(XP_LINUX)
++#if !defined(ANDROID)
+ #include "sys/wait.h"
+ #include <spawn.h>
+-#endif // defined(ANDROID)
++#endif // !defined(ANDROID)
+ #endif // defined(XP_UNIX)
+
+ #if defined(XP_LINUX)
+@@ -699,7 +702,7 @@ static const dom::ConstantSpec gLibcProp
{ "OSFILE_SIZEOF_STATVFS", JS::Int32Value(sizeof (struct statvfs)) },
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 4098550dbe6..4595c843835 100644
--- a/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
+++ b/www/firefox/patches/patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp
@@ -1,16 +1,16 @@
-$NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.3 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.4 2017/03/07 20:45:43 ryoon Exp $
* Read pkgsrc hunspell dictionaries
---- extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2017-01-16 16:16:49.000000000 +0000
+--- extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2017-01-23 16:13:57.000000000 +0000
+++ extensions/spellcheck/hunspell/glue/mozHunspell.cpp
-@@ -358,6 +358,14 @@ mozHunspell::LoadDictionaryList(bool aNo
+@@ -381,6 +381,14 @@ mozHunspell::LoadDictionaryList(bool aNo
}
}
+ // load system hunspell dictionaries
+ nsCOMPtr<nsIFile> hunDir;
-+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@PREFIX@/share/hunspell"),
++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"),
+ true, getter_AddRefs(hunDir));
+ if (hunDir) {
+ LoadDictionariesFromDir(hunDir);
diff --git a/www/firefox/patches/patch-gfx_2d_BorrowedContext.h b/www/firefox/patches/patch-gfx_2d_BorrowedContext.h
deleted file mode 100644
index bc6d17f6241..00000000000
--- a/www/firefox/patches/patch-gfx_2d_BorrowedContext.h
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-gfx_2d_BorrowedContext.h,v 1.1 2017/02/05 15:41:58 martin Exp $
-
-Backport of upstream commit
- https://hg.mozilla.org/mozilla-central/rev/c1e18cb7926e
-
-diff gfx/2d/BorrowedContext.h.orig gfx/2d/BorrowedContext.h
---- gfx/2d/BorrowedContext.h.orig
-+++ gfx/2d/BorrowedContext.h
-@@ -190,18 +190,28 @@ public:
- }
-
- ~BorrowedCGContext() {
- MOZ_ASSERT(!cg);
- }
-
- CGContextRef cg;
- private:
-+#ifdef USE_SKIA
- static CGContextRef BorrowCGContextFromDrawTarget(DrawTarget *aDT);
- static void ReturnCGContextToDrawTarget(DrawTarget *aDT, CGContextRef cg);
-+#else
-+ static CGContextRef BorrowCGContextFromDrawTarget(DrawTarget *aDT) {
-+ MOZ_CRASH("Not supported without Skia");
-+ }
-+
-+ static void ReturnCGContextToDrawTarget(DrawTarget *aDT, CGContextRef cg) {
-+ MOZ_CRASH("not supported without Skia");
-+ }
-+#endif
- DrawTarget *mDT;
- };
- #endif
-
- } // namespace gfx
- } // namespace mozilla
-
- #endif // _MOZILLA_GFX_BORROWED_CONTEXT_H
-
-
-
-
diff --git a/www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.cpp b/www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.cpp
deleted file mode 100644
index 6e432e056fe..00000000000
--- a/www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-gfx_layers_composite_LayerManagerComposite.cpp,v 1.3 2017/02/05 15:41:58 martin Exp $
-
-Backport of upstream commit
- https://hg.mozilla.org/mozilla-central/rev/c1e18cb7926e
-
-diff gfx/layers/composite/LayerManagerComposite.cpp.orig gfx/layers/composite/LayerManagerComposite.cpp
---- gfx/layers/composite/LayerManagerComposite.cpp.orig 2017-01-16 17:16:50.000000000 +0100
-+++ gfx/layers/composite/LayerManagerComposite.cpp 2017-02-05 10:58:20.873600806 +0100
-@@ -12,7 +12,6 @@
- #include "CompositableHost.h" // for CompositableHost
- #include "ContainerLayerComposite.h" // for ContainerLayerComposite, etc
- #include "FPSCounter.h" // for FPSState, FPSCounter
--#include "PaintCounter.h" // For PaintCounter
- #include "FrameMetrics.h" // for FrameMetrics
- #include "GeckoProfiler.h" // for profiler_set_frame_number, etc
- #include "ImageLayerComposite.h" // for ImageLayerComposite
-@@ -72,6 +71,10 @@
- #include "TextRenderer.h" // for TextRenderer
- #include "mozilla/layers/CompositorBridgeParent.h"
- #include "TreeTraversal.h" // for ForEachNode
-+
-+#ifdef USE_SKIA
-+#include "PaintCounter.h" // For PaintCounter
-+#endif
-
- class gfxContext;
-
-@@ -133,6 +136,10 @@ LayerManagerComposite::LayerManagerCompo
- {
- mTextRenderer = new TextRenderer(aCompositor);
- MOZ_ASSERT(aCompositor);
-+
-+#ifdef USE_SKIA
-+ mPaintCounter = nullptr;
-+#endif
- }
-
- LayerManagerComposite::~LayerManagerComposite()
-@@ -151,8 +158,10 @@ LayerManagerComposite::Destroy()
- }
- mRoot = nullptr;
- mClonedLayerTreeProperties = nullptr;
-- mPaintCounter = nullptr;
- mDestroyed = true;
-+#ifdef USE_SKIA
-+ mPaintCounter = nullptr;
-+#endif
- }
- }
-
-@@ -564,7 +573,6 @@ LayerManagerComposite::InvalidateDebugOv
- bool drawFps = gfxPrefs::LayersDrawFPS();
- bool drawFrameCounter = gfxPrefs::DrawFrameCounter();
- bool drawFrameColorBars = gfxPrefs::CompositorDrawColorBars();
-- bool drawPaintTimes = gfxPrefs::AlwaysPaint();
-
- if (drawFps || drawFrameCounter) {
- aInvalidRegion.Or(aInvalidRegion, nsIntRect(0, 0, 256, 256));
-@@ -572,11 +580,16 @@ LayerManagerComposite::InvalidateDebugOv
- if (drawFrameColorBars) {
- aInvalidRegion.Or(aInvalidRegion, nsIntRect(0, 0, 10, aBounds.height));
- }
-+
-+#ifdef USE_SKIA
-+ bool drawPaintTimes = gfxPrefs::AlwaysPaint();
- if (drawPaintTimes) {
- aInvalidRegion.Or(aInvalidRegion, nsIntRect(PaintCounter::GetPaintRect()));
- }
-+#endif
- }
-
-+#ifdef USE_SKIA
- void
- LayerManagerComposite::DrawPaintTimes(Compositor* aCompositor)
- {
-@@ -587,6 +600,7 @@ LayerManagerComposite::DrawPaintTimes(Co
- TimeDuration compositeTime = TimeStamp::Now() - mRenderStartTime;
- mPaintCounter->Draw(aCompositor, mLastPaintTime, compositeTime);
- }
-+#endif
-
- static uint16_t sFrameCount = 0;
- void
-@@ -595,7 +609,6 @@ LayerManagerComposite::RenderDebugOverla
- bool drawFps = gfxPrefs::LayersDrawFPS();
- bool drawFrameCounter = gfxPrefs::DrawFrameCounter();
- bool drawFrameColorBars = gfxPrefs::CompositorDrawColorBars();
-- bool drawPaintTimes = gfxPrefs::AlwaysPaint();
-
- TimeStamp now = TimeStamp::Now();
-
-@@ -736,9 +749,12 @@ LayerManagerComposite::RenderDebugOverla
- sFrameCount++;
- }
-
-+#ifdef USE_SKIA
-+ bool drawPaintTimes = gfxPrefs::AlwaysPaint();
- if (drawPaintTimes) {
- DrawPaintTimes(mCompositor);
- }
-+#endif
- }
-
- RefPtr<CompositingRenderTarget>
diff --git a/www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.h b/www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.h
deleted file mode 100644
index de28852d9a9..00000000000
--- a/www/firefox/patches/patch-gfx_layers_composite_LayerManagerComposite.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-gfx_layers_composite_LayerManagerComposite.h,v 1.1 2017/02/05 15:41:58 martin Exp $
-
-Backport of upstream commit
- https://hg.mozilla.org/mozilla-central/rev/c1e18cb7926e
-
-diff gfx/layers/composite/LayerManagerComposite.h.orig gfx/layers/composite/LayerManagerComposite.h
---- gfx/layers/composite/LayerManagerComposite.h.orig 2017-01-16 17:16:50.000000000 +0100
-+++ gfx/layers/composite/LayerManagerComposite.h 2017-02-05 11:02:30.218363514 +0100
-@@ -331,11 +331,6 @@ private:
- #endif
-
- /**
-- * Render paint and composite times above the frame.
-- */
-- void DrawPaintTimes(Compositor* aCompositor);
--
-- /**
- * We need to know our invalid region before we're ready to render.
- */
- void InvalidateDebugOverlay(nsIntRegion& aInvalidRegion, const gfx::IntRect& aBounds);
-@@ -391,9 +386,16 @@ private:
- bool mLastFrameMissedHWC;
-
- bool mWindowOverlayChanged;
-- RefPtr<PaintCounter> mPaintCounter;
- TimeDuration mLastPaintTime;
- TimeStamp mRenderStartTime;
-+
-+#ifdef USE_SKIA
-+ /**
-+ * Render paint and composite times above the frame.
-+ */
-+ void DrawPaintTimes(Compositor* aCompositor);
-+ RefPtr<PaintCounter> mPaintCounter;
-+#endif
- };
-
- /**
-
diff --git a/www/firefox/patches/patch-gfx_layers_moz.build b/www/firefox/patches/patch-gfx_layers_moz.build
deleted file mode 100644
index 9146e474f57..00000000000
--- a/www/firefox/patches/patch-gfx_layers_moz.build
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-gfx_layers_moz.build,v 1.1 2017/02/05 15:41:58 martin Exp $
-
-Backport of upstream commit
- https://hg.mozilla.org/mozilla-central/rev/c1e18cb7926e
-
-diff gfx/layers/moz.build.orig gfx/layers/moz.build
---- gfx/layers/moz.build.orig 2017-01-16 17:16:50.000000000 +0100
-+++ gfx/layers/moz.build 2017-02-05 11:06:16.475345819 +0100
-@@ -340,7 +340,6 @@
- 'composite/ImageHost.cpp',
- 'composite/ImageLayerComposite.cpp',
- 'composite/LayerManagerComposite.cpp',
-- 'composite/PaintCounter.cpp',
- 'composite/PaintedLayerComposite.cpp',
- 'composite/TextRenderer.cpp',
- 'composite/TextureHost.cpp',
-@@ -485,3 +484,8 @@
-
- if CONFIG['GNU_CXX']:
- CXXFLAGS += ['-Wno-error=shadow']
-+
-+if CONFIG['MOZ_ENABLE_SKIA']:
-+ UNIFIED_SOURCES += [
-+ 'composite/PaintCounter.cpp',
-+ ]
-
diff --git a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
index 272afd9dc48..8f1c2585c1f 100644
--- a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
+++ b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
@@ -1,6 +1,6 @@
-$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.6 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.7 2017/03/07 20:45:43 ryoon Exp $
---- gfx/skia/generate_mozbuild.py.orig 2016-10-31 20:15:31.000000000 +0000
+--- gfx/skia/generate_mozbuild.py.orig 2017-01-23 16:13:43.000000000 +0000
+++ gfx/skia/generate_mozbuild.py
@@ -140,6 +140,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
'-Wno-unused-private-field',
@@ -9,6 +9,6 @@ $NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.6 2016/12/03 09:58:26 ryoon Ex
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
diff --git a/www/firefox/patches/patch-gfx_skia_moz.build b/www/firefox/patches/patch-gfx_skia_moz.build
index 787bfd0ce8a..de159f63617 100644
--- a/www/firefox/patches/patch-gfx_skia_moz.build
+++ b/www/firefox/patches/patch-gfx_skia_moz.build
@@ -1,14 +1,14 @@
-$NetBSD: patch-gfx_skia_moz.build,v 1.13 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-gfx_skia_moz.build,v 1.14 2017/03/07 20:45:43 ryoon Exp $
---- gfx/skia/moz.build.orig 2016-10-31 20:15:31.000000000 +0000
+--- gfx/skia/moz.build.orig 2017-01-23 16:13:43.000000000 +0000
+++ gfx/skia/moz.build
-@@ -664,6 +664,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
+@@ -750,6 +750,9 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
'-Wno-unused-private-field',
]
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
diff --git a/www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp b/www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
deleted file mode 100644
index 948a38abf95..00000000000
--- a/www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.3 2016/06/16 12:08:21 ryoon Exp $
-
-* Support NetBSD
-
---- gfx/skia/skia/src/core/SkUtilsArm.cpp.orig 2016-04-15 16:57:41.000000000 +0000
-+++ gfx/skia/skia/src/core/SkUtilsArm.cpp
-@@ -16,6 +16,10 @@
- #include <string.h>
- #include <pthread.h>
-
-+#if defined(__NetBSD__)
-+#include <sys/sysctl.h>
-+#endif
-+
- #if defined(SK_BUILD_FOR_ANDROID)
- # ifdef MOZ_SKIA
- # include "mozilla/arm.h"
-@@ -24,6 +28,11 @@
- # endif
- #endif
-
-+#if !defined(TEMP_FAILURE_RETRY)
-+ // TEMP_FAILURE_RETRY is glibc specific
-+# define TEMP_FAILURE_RETRY
-+#endif
-+
- // A function used to determine at runtime if the target CPU supports
- // the ARM NEON instruction set. This implementation is Linux-specific.
- static bool sk_cpu_arm_check_neon(void) {
diff --git a/www/firefox/patches/patch-gfx_thebes_gfxFontUtils.cpp b/www/firefox/patches/patch-gfx_thebes_gfxFontUtils.cpp
deleted file mode 100644
index a99a223717b..00000000000
--- a/www/firefox/patches/patch-gfx_thebes_gfxFontUtils.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-gfx_thebes_gfxFontUtils.cpp,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-
---- gfx/thebes/gfxFontUtils.cpp.orig 2016-10-31 20:15:32.000000000 +0000
-+++ gfx/thebes/gfxFontUtils.cpp
-@@ -918,16 +918,18 @@ IsValidSFNTVersion(uint32_t version)
- version == TRUETYPE_TAG('t','r','u','e');
- }
-
--// copy and swap UTF-16 values, assume no surrogate pairs, can be in place
-+// Copy and swap UTF-16 values, assume no surrogate pairs, can be in place.
-+// aInBuf and aOutBuf are NOT necessarily 16-bit-aligned, so we should avoid
-+// accessing them directly as uint16_t* values.
-+// aLen is count of UTF-16 values, so the byte buffers are twice that.
- static void
--CopySwapUTF16(const uint16_t *aInBuf, uint16_t *aOutBuf, uint32_t aLen)
-+CopySwapUTF16(const char* aInBuf, char* aOutBuf, uint32_t aLen)
- {
-- const uint16_t *end = aInBuf + aLen;
-+ const char* end = aInBuf + aLen * 2;
- while (aInBuf < end) {
-- uint16_t value = *aInBuf;
-- *aOutBuf = (value >> 8) | (value & 0xff) << 8;
-- aOutBuf++;
-- aInBuf++;
-+ uint8_t b0 = *aInBuf++;
-+ *aOutBuf++ = *aInBuf++;
-+ *aOutBuf++ = b0;
- }
- }
-
-@@ -1441,13 +1443,13 @@ gfxFontUtils::DecodeFontName(const char
- if (csName[0] == 0) {
- // empty charset name: data is utf16be, no need to instantiate a converter
- uint32_t strLen = aByteLen / 2;
--#ifdef IS_LITTLE_ENDIAN
- aName.SetLength(strLen);
-- CopySwapUTF16(reinterpret_cast<const uint16_t*>(aNameData),
-- reinterpret_cast<uint16_t*>(aName.BeginWriting()), strLen);
-+#ifdef IS_LITTLE_ENDIAN
-+ CopySwapUTF16(aNameData, reinterpret_cast<char*>(aName.BeginWriting()),
-+ strLen);
- #else
-- aName.Assign(reinterpret_cast<const char16_t*>(aNameData), strLen);
--#endif
-+ memcpy(aName.BeginWriting(), aNameData, strLen * 2);
-+#endif
- return true;
- }
-
diff --git a/www/firefox/patches/patch-gfx_thebes_moz.build b/www/firefox/patches/patch-gfx_thebes_moz.build
index 2864338728c..82da413004b 100644
--- a/www/firefox/patches/patch-gfx_thebes_moz.build
+++ b/www/firefox/patches/patch-gfx_thebes_moz.build
@@ -1,19 +1,19 @@
-$NetBSD: patch-gfx_thebes_moz.build,v 1.6 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-gfx_thebes_moz.build,v 1.7 2017/03/07 20:45:43 ryoon Exp $
---- gfx/thebes/moz.build.orig 2017-01-16 16:16:51.000000000 +0000
+--- gfx/thebes/moz.build.orig 2017-01-23 16:13:47.000000000 +0000
+++ gfx/thebes/moz.build
-@@ -286,7 +286,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
+@@ -266,7 +266,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
LOCAL_INCLUDES += ['/media/libyuv/include']
-DEFINES['GRAPHITE2_STATIC'] = True
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
+else:
+ DEFINES['GRAPHITE2_STATIC'] = True
++
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
if CONFIG['CLANG_CXX']:
# Suppress warnings from Skia header files.
diff --git a/www/firefox/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp b/www/firefox/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp
deleted file mode 100644
index a2eea9d03cb..00000000000
--- a/www/firefox/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-intl_lwbrk_nsJISx4051LineBreaker.cpp,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-
---- intl/lwbrk/nsJISx4051LineBreaker.cpp.orig 2016-09-05 20:12:53.000000000 +0000
-+++ intl/lwbrk/nsJISx4051LineBreaker.cpp
-@@ -12,6 +12,10 @@
- #include "nsTArray.h"
- #include "nsUnicodeProperties.h"
-
-+#if ENABLE_INTL_API
-+#include "unicode/uchar.h" // for U_LB_COUNT until bug 1305700
-+#endif
-+
- /*
-
- Simplification of Pair Table in JIS X 4051
-@@ -547,10 +551,22 @@ GetClass(uint32_t u)
- /* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
- /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
- /* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER,
-- /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER
-+ /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
-+#if U_ICU_VERSION_MAJOR_NUM > 57
-+ /* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
-+ /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
-+ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER,
-+#endif
- };
-
-- return sUnicodeLineBreakToClass[mozilla::unicode::GetLineBreakClass(u)];
-+#if ENABLE_INTL_API
-+ static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
-+ "Gecko vs ICU LineBreak class mismatch");
-+#endif
-+
-+ auto cls = mozilla::unicode::GetLineBreakClass(u);
-+ MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
-+ return sUnicodeLineBreakToClass[cls];
- }
-
- static bool
diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc b/www/firefox/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc
deleted file mode 100644
index c37acc058ba..00000000000
--- a/www/firefox/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.6 2016/01/30 00:43:42 ryoon Exp $
-
-Allow older libevent
-
---- ipc/chromium/src/base/message_pump_libevent.cc.orig 2016-01-23 23:23:38.000000000 +0000
-+++ ipc/chromium/src/base/message_pump_libevent.cc
-@@ -20,6 +20,7 @@
-
- // This macro checks that the _EVENT_SIZEOF_* constants defined in
- // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.
-+#if 0
- #define CHECK_EVENT_SIZEOF(TYPE, type) \
- static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \
- "bad _EVENT_SIZEOF_"#TYPE);
-@@ -30,6 +31,7 @@ CHECK_EVENT_SIZEOF(PTHREAD_T, pthread_t)
- CHECK_EVENT_SIZEOF(SHORT, short);
- CHECK_EVENT_SIZEOF(SIZE_T, size_t);
- CHECK_EVENT_SIZEOF(VOID_P, void*);
-+#endif
-
- // Lifecycle of struct event
- // Libevent uses two main data structures:
diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
deleted file mode 100644
index a36c89956de..00000000000
--- a/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2016/08/06 08:46:59 ryoon Exp $
-
---- ipc/chromium/src/base/process_util_bsd.cc.orig 2016-07-25 20:22:06.000000000 +0000
-+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -10,6 +10,10 @@
- #include <spawn.h>
- #include <sys/wait.h>
-
-+#if defined(OS_BSD)
-+#include <kvm.h>
-+#endif
-+
- #include <string>
-
- #include "nspr.h"
diff --git a/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp b/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp
deleted file mode 100644
index b16f4261531..00000000000
--- a/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.8 2016/06/16 12:08:21 ryoon Exp $
-
-Unclear fallout from our version of bug 840242, attachment v1: some architectures
-fail to link if we do not add the inlines here - might be compiler/arch specific.
-
---- js/src/vm/SPSProfiler.cpp.orig 2014-04-18 02:03:21.000000000 +0000
-+++ js/src/vm/SPSProfiler.cpp
-@@ -4,6 +4,8 @@
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-+#include "jscntxtinlines.h"
-+
- #include "vm/SPSProfiler.h"
-
- #include "mozilla/DebugOnly.h"
diff --git a/www/firefox/patches/patch-js_src_jit-LIR.cpp b/www/firefox/patches/patch-js_src_jit-LIR.cpp
deleted file mode 100644
index 9eaeab96bfc..00000000000
--- a/www/firefox/patches/patch-js_src_jit-LIR.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_jit-LIR.cpp,v 1.4 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD
-
---- js/src/jit/LIR.cpp.orig 2015-08-24 21:53:12.000000000 +0000
-+++ js/src/jit/LIR.cpp
-@@ -323,7 +323,7 @@ LNode::printName(GenericPrinter& out, Op
- const char* name = names[op];
- size_t len = strlen(name);
- for (size_t i = 0; i < len; i++)
-- out.printf("%c", tolower(name[i]));
-+ out.printf("%c", tolower((unsigned char)name[i]));
- }
-
- void
diff --git a/www/firefox/patches/patch-js_src_jit_MIR.cpp b/www/firefox/patches/patch-js_src_jit_MIR.cpp
deleted file mode 100644
index e6084abbcbd..00000000000
--- a/www/firefox/patches/patch-js_src_jit_MIR.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_jit_MIR.cpp,v 1.5 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD
-
---- js/src/jit/MIR.cpp.orig 2016-05-12 17:05:02.000000000 +0000
-+++ js/src/jit/MIR.cpp
-@@ -76,7 +76,7 @@ MDefinition::PrintOpcodeName(GenericPrin
- const char* name = names[op];
- size_t len = strlen(name);
- for (size_t i = 0; i < len; i++)
-- out.printf("%c", tolower(name[i]));
-+ out.printf("%c", tolower((unsigned char)name[i]));
- }
-
- static MConstant*
diff --git a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp
index dad9e700fd9..2e84bd19133 100644
--- a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp
+++ b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.7 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.8 2017/03/07 20:45:43 ryoon Exp $
* Support NetBSD/earm
@@ -9,7 +9,7 @@ $NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.7 2016/06/16 12:08:21 ryo
#include "jit/RegisterSets.h"
-#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM)
-+#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__)
++#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM) || defined(__NetBSD__)
// The Android NDK and B2G do not include the hwcap.h kernel header, and it is not
// defined when building the simulator, so inline the header defines we need.
# define HWCAP_VFP (1 << 6)
diff --git a/www/firefox/patches/patch-js_src_moz.build b/www/firefox/patches/patch-js_src_moz.build
index 73d81fe29a2..bcb546cb0a5 100644
--- a/www/firefox/patches/patch-js_src_moz.build
+++ b/www/firefox/patches/patch-js_src_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-js_src_moz.build,v 1.1 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-js_src_moz.build,v 1.2 2017/03/07 20:45:43 ryoon Exp $
---- js/src/moz.build.orig 2016-10-31 20:15:37.000000000 +0000
+--- js/src/moz.build.orig 2017-02-09 20:24:38.000000000 +0000
+++ js/src/moz.build
-@@ -733,10 +733,6 @@ OS_LIBS += CONFIG['REALTIME_LIBS']
+@@ -735,10 +735,6 @@ OS_LIBS += CONFIG['REALTIME_LIBS']
CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
@@ -11,5 +11,5 @@ $NetBSD: patch-js_src_moz.build,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-DIST_INSTALL = True
-
# Prepare self-hosted JS code for embedding
- GENERATED_FILES += ['selfhosted.out.h']
- selfhosted = GENERATED_FILES['selfhosted.out.h']
+ GENERATED_FILES += [('selfhosted.out.h', 'selfhosted.js')]
+ selfhosted = GENERATED_FILES[('selfhosted.out.h', 'selfhosted.js')]
diff --git a/www/firefox/patches/patch-layout_style_GenerateCSSPropsGenerated.py b/www/firefox/patches/patch-layout_style_GenerateCSSPropsGenerated.py
deleted file mode 100644
index cd4ca344fe0..00000000000
--- a/www/firefox/patches/patch-layout_style_GenerateCSSPropsGenerated.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-layout_style_GenerateCSSPropsGenerated.py,v 1.1 2017/01/25 13:24:51 ryoon Exp $
-
---- layout/style/GenerateCSSPropsGenerated.py.orig 2017-01-16 16:16:54.000000000 +0000
-+++ layout/style/GenerateCSSPropsGenerated.py
-@@ -10,7 +10,7 @@ import buildconfig
- from mozbuild import shellutil
-
- def get_properties(preprocessorHeader):
-- cpp = list(buildconfig.substs['CPP'])
-+ cpp = shellutil.split(buildconfig.substs['CPP'])
- cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
- cpp.append(preprocessorHeader)
- preprocessed = subprocess.check_output(cpp)
diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
index c15fd570104..a44fb5b52ca 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.4 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.5 2017/03/07 20:45:43 ryoon Exp $
* Support OSS audio
---- media/libcubeb/src/cubeb.c.orig 2016-04-15 16:57:46.000000000 +0000
+--- media/libcubeb/src/cubeb.c.orig 2017-01-23 16:13:54.000000000 +0000
+++ media/libcubeb/src/cubeb.c
-@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, ch
+@@ -54,6 +54,9 @@ int audiotrack_init(cubeb ** context, ch
#if defined(USE_KAI)
int kai_init(cubeb ** context, char const * context_name);
#endif
@@ -13,8 +13,8 @@ $NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.4 2016/06/16 12:08:21 ryoon Exp $
+#endif
- int
-@@ -152,6 +155,9 @@ cubeb_init(cubeb ** context, char const
+ static int
+@@ -141,6 +144,9 @@ cubeb_init(cubeb ** context, char const
#if defined(USE_KAI)
kai_init,
#endif
diff --git a/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h b/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h
deleted file mode 100644
index e81184b5e14..00000000000
--- a/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h,v 1.3 2015/12/18 23:51:16 ryoon Exp $
-
---- media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h.orig 2015-12-08 18:06:36.000000000 +0000
-+++ media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h
-@@ -18,6 +18,7 @@
-
- #define A_STRING_H_
-
-+#include <cctype>
- #include <sys/types.h>
-
- namespace stagefright {
diff --git a/www/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp b/www/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp
deleted file mode 100644
index 9133f70160b..00000000000
--- a/www/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.3 2016/06/16 12:08:21 ryoon Exp $
-
-* Fix build under NetBSD
-
---- media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2016-05-12 17:13:17.000000000 +0000
-+++ media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp
-@@ -23,6 +23,10 @@
- #include "ADebug.h"
- #include "AString.h"
-
-+#if defined(__NetBSD__) && defined(tolower)
-+#undef tolower
-+#endif
-+
- namespace stagefright {
-
- // static
diff --git a/www/firefox/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c b/www/firefox/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c
deleted file mode 100644
index 51409b52ed9..00000000000
--- a/www/firefox/patches/patch-media_libstagefright_system_core_liblog_fake__log__device.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-media_libstagefright_system_core_liblog_fake__log__device.c,v 1.2 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD
-
---- media/libstagefright/system/core/liblog/fake_log_device.c.orig 2015-01-23 05:59:59.000000000 +0000
-+++ media/libstagefright/system/core/liblog/fake_log_device.c 2015-02-16 14:09:00.000000000 +0000
-@@ -229,11 +229,11 @@
- char tagName[kMaxTagLen];
- int i, minPrio;
-
-- while (isspace(*tags))
-+ while (isspace((unsigned char)*tags))
- tags++;
-
- i = 0;
-- while (*tags != '\0' && !isspace(*tags) && *tags != ':' &&
-+ while (*tags != '\0' && !isspace((unsigned char)*tags) && *tags != ':' &&
- i < kMaxTagLen)
- {
- tagName[i++] = *tags++;
-@@ -272,7 +272,7 @@
- }
-
- tags++;
-- if (*tags != '\0' && !isspace(*tags)) {
-+ if (*tags != '\0' && !isspace((unsigned char)*tags)) {
- TRACE("ERROR: garbage in tag env; expected whitespace\n");
- TRACE(" env='%s'\n", tags);
- return;
diff --git a/www/firefox/patches/patch-media_libstagefright_system_core_liblog_logprint.c b/www/firefox/patches/patch-media_libstagefright_system_core_liblog_logprint.c
deleted file mode 100644
index d53d63f23c4..00000000000
--- a/www/firefox/patches/patch-media_libstagefright_system_core_liblog_logprint.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-media_libstagefright_system_core_liblog_logprint.c,v 1.2 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD
-
---- media/libstagefright/system/core/liblog/logprint.c.orig 2015-01-23 05:59:59.000000000 +0000
-+++ media/libstagefright/system/core/liblog/logprint.c 2015-02-16 14:12:46.000000000 +0000
-@@ -101,7 +101,7 @@
- {
- android_LogPriority pri;
-
-- c = tolower(c);
-+ c = tolower((unsigned char)c);
-
- if (c >= '0' && c <= '9') {
- if (c >= ('0'+ANDROID_LOG_SILENT)) {
-@@ -370,7 +370,7 @@
- {
- char *end = str + strlen(str) - 1;
-
-- while (end >= str && isspace(*end))
-+ while (end >= str && isspace((unsigned char)*end))
- *end-- = '\0';
- return str;
- }
diff --git a/www/firefox/patches/patch-media_libtheora_lib_info.c b/www/firefox/patches/patch-media_libtheora_lib_info.c
deleted file mode 100644
index eedec569aea..00000000000
--- a/www/firefox/patches/patch-media_libtheora_lib_info.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-media_libtheora_lib_info.c,v 1.2 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD
-
---- media/libtheora/lib/info.c.orig 2015-01-23 05:59:59.000000000 +0000
-+++ media/libtheora/lib/info.c 2015-02-16 14:49:17.000000000 +0000
-@@ -29,7 +29,7 @@
- static int oc_tagcompare(const char *_s1,const char *_s2,int _n){
- int c;
- for(c=0;c<_n;c++){
-- if(toupper(_s1[c])!=toupper(_s2[c]))return !0;
-+ if(toupper((unsigned char)_s1[c])!=toupper((unsigned char)_s2[c]))return !0;
- }
- return _s1[c]!='=';
- }
diff --git a/www/firefox/patches/patch-media_libtremor_Makefile.in b/www/firefox/patches/patch-media_libtremor_Makefile.in
deleted file mode 100644
index c8d6ce83d88..00000000000
--- a/www/firefox/patches/patch-media_libtremor_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-media_libtremor_Makefile.in,v 1.2 2016/08/06 08:46:59 ryoon Exp $
-
---- media/libtremor/Makefile.in.orig 2016-08-04 17:13:18.579788654 +0000
-+++ media/libtremor/Makefile.in
-@@ -0,0 +1,9 @@
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+include $(topsrcdir)/config/rules.mk
-+
-+ifdef MOZ_SYSTEM_OGG
-+CFLAGS += $(MOZ_OGG_CFLAGS)
-+endif
diff --git a/www/firefox/patches/patch-media_libvorbis_Makefile.in b/www/firefox/patches/patch-media_libvorbis_Makefile.in
deleted file mode 100644
index f5848addc25..00000000000
--- a/www/firefox/patches/patch-media_libvorbis_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-media_libvorbis_Makefile.in,v 1.2 2016/08/06 08:46:59 ryoon Exp $
-
---- media/libvorbis/Makefile.in.orig 2016-08-04 17:13:18.580232660 +0000
-+++ media/libvorbis/Makefile.in
-@@ -0,0 +1,9 @@
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+
-+include $(topsrcdir)/config/rules.mk
-+
-+ifdef MOZ_SYSTEM_OGG
-+CFLAGS += $(MOZ_OGG_CFLAGS)
-+endif
diff --git a/www/firefox/patches/patch-media_libvorbis_lib_vorbis_info.c b/www/firefox/patches/patch-media_libvorbis_lib_vorbis_info.c
deleted file mode 100644
index ec1a745e906..00000000000
--- a/www/firefox/patches/patch-media_libvorbis_lib_vorbis_info.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-media_libvorbis_lib_vorbis_info.c,v 1.2 2016/06/16 12:08:21 ryoon Exp $
-
-* For NetBSD
-
---- media/libvorbis/lib/vorbis_info.c.orig 2015-01-23 05:59:59.000000000 +0000
-+++ media/libvorbis/lib/vorbis_info.c 2015-02-16 14:36:05.000000000 +0000
-@@ -87,7 +87,7 @@
- static int tagcompare(const char *s1, const char *s2, int n){
- int c=0;
- while(c < n){
-- if(toupper(s1[c]) != toupper(s2[c]))
-+ if(toupper((unsigned char)s1[c]) != toupper((unsigned char)s2[c]))
- return !0;
- c++;
- }
diff --git a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h b/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
deleted file mode 100644
index dd1c40d6d72..00000000000
--- a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.7 2014/07/24 14:57:12 ryoon Exp $
-
---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2014-07-17 01:45:31.000000000 +0000
-+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -30,7 +30,13 @@
- * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $
- */
-
--#ifndef _SYS_QUEUE_H_
-+#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN)
-+#include_next <sys/queue.h>
-+# if defined(__DragonFly__)
-+#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE
-+#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE
-+# endif
-+#elif !defined(_SYS_QUEUE_H_)
- #define _SYS_QUEUE_H_
-
- #include <stddef.h>
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 1a6ac346935..40d87a7c7a5 100644
--- a/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
+++ b/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.4 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.5 2017/03/07 20:45:43 ryoon Exp $
---- media/webrtc/signaling/test/common.build.orig 2017-01-22 14:52:50.270634552 +0000
+--- media/webrtc/signaling/test/common.build.orig 2016-09-19 16:19:28.000000000 +0000
+++ media/webrtc/signaling/test/common.build
-@@ -96,6 +96,7 @@ if CONFIG['JS_SHARED_LIBRARY']:
+@@ -96,11 +96,12 @@ if CONFIG['JS_SHARED_LIBRARY']:
USE_LIBS += ['mozglue']
@@ -10,3 +10,10 @@ $NetBSD: patch-media_webrtc_signaling_test_common.build,v 1.4 2017/01/25 13:24:5
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
OS_LIBS += CONFIG['REALTIME_LIBS']
+-if CONFIG['MOZ_ALSA']:
+- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
++if CONFIG['MOZ_OSS']:
++ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
+
+ if CONFIG['MOZ_SYSTEM_JPEG']:
+ OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
index cd490574de5..f2fd81263e3 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,8 +1,8 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.10 2016/12/03 09:58:26 ryoon Exp $
+$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 $
---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2016-05-12 17:13:21.000000000 +0000
+--- 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
-@@ -25,10 +25,21 @@
+@@ -25,6 +25,9 @@
#else
#include <linux/videodev2.h>
#endif
@@ -12,6 +12,9 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__in
#include "webrtc/system_wrappers/interface/ref_count.h"
#include "webrtc/system_wrappers/interface/trace.h"
+@@ -34,6 +37,15 @@
+ #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
+ #endif
+#ifdef HAVE_LIBV4L2
+#define open v4l2_open
@@ -21,10 +24,11 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__in
+#define mmap v4l2_mmap
+#define munmap v4l2_munmap
+#endif
-
++
namespace webrtc
{
-@@ -136,6 +147,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
+ namespace videocapturemodule
+@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
memset(deviceNameUTF8, 0, deviceNameLength);
memcpy(cameraName, cap.card, sizeof(cap.card));
diff --git a/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c b/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c
deleted file mode 100644
index af5f3926a80..00000000000
--- a/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-memory_build_mozjemalloc__compat.c,v 1.4 2015/12/16 09:34:56 ryoon Exp $
-
---- memory/build/mozjemalloc_compat.c.orig 2015-12-04 00:37:04.000000000 +0000
-+++ memory/build/mozjemalloc_compat.c
-@@ -140,6 +140,48 @@ compute_bin_unused_and_bookkeeping(jemal
- stats->bin_unused = bin_unused;
- }
-
-+static size_t
-+compute_bin_unused(unsigned int narenas)
-+{
-+ size_t bin_unused = 0;
-+
-+ uint32_t nregs; // number of regions per run in the j-th bin
-+ size_t reg_size; // size of regions served by the j-th bin
-+ size_t curruns; // number of runs belonging to a bin
-+ size_t curregs; // number of allocated regions in a bin
-+
-+ unsigned int nbins; // number of bins per arena
-+ unsigned int i, j;
-+
-+ // curruns and curregs are not defined for uninitialized arenas,
-+ // so we skip them when computing bin_unused. However, initialized
-+ // arenas are not guaranteed to be sequential, so we must test each
-+ // one when iterating below.
-+ bool initialized[100]; // should be narenas, but MSVC doesn't have VLAs
-+ size_t isz = sizeof(initialized) / sizeof(initialized[0]);
-+
-+ je_(mallctl)("arenas.initialized", initialized, &isz, NULL, 0);
-+ CTL_GET("arenas.nbins", nbins);
-+
-+ for (j = 0; j < nbins; j++) {
-+ CTL_I_GET("arenas.bin.0.nregs", nregs, j);
-+ CTL_I_GET("arenas.bin.0.size", reg_size, j);
-+
-+ for (i = 0; i < narenas; i++) {
-+ if (!initialized[i]) {
-+ continue;
-+ }
-+
-+ CTL_IJ_GET("stats.arenas.0.bins.0.curruns", curruns, i, j);
-+ CTL_IJ_GET("stats.arenas.0.bins.0.curregs", curregs, i, j);
-+
-+ bin_unused += (nregs * curruns - curregs) * reg_size;
-+ }
-+ }
-+
-+ return bin_unused;
-+}
-+
- MOZ_JEMALLOC_API void
- jemalloc_stats_impl(jemalloc_stats_t *stats)
- {
diff --git a/www/firefox/patches/patch-modules_libmar_tests_moz.build b/www/firefox/patches/patch-modules_libmar_tests_moz.build
deleted file mode 100644
index 43acd98ad2f..00000000000
--- a/www/firefox/patches/patch-modules_libmar_tests_moz.build
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-modules_libmar_tests_moz.build,v 1.1 2017/01/25 13:24:51 ryoon Exp $
-
---- modules/libmar/tests/moz.build.orig 2016-10-31 20:15:26.000000000 +0000
-+++ modules/libmar/tests/moz.build
-@@ -6,24 +6,7 @@
-
- XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
--DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX']
--
- if CONFIG['OS_TARGET'] != 'Android':
-- nss_files = ['nss3']
-- if not CONFIG['MOZ_FOLD_LIBS']:
-- nss_files.extend([
-- 'nssutil3',
-- 'plc4',
-- 'nspr4',
-- 'plds4',
-- ])
-- TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted(
-- ['!/dist/bin/%s%s%s' % (
-- CONFIG['DLL_PREFIX'],
-- name,
-- CONFIG['DLL_SUFFIX'],
-- ) for name in nss_files]
-- )
- TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [
- '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'],
- ]
diff --git a/www/firefox/patches/patch-modules_libpref_init_all.js b/www/firefox/patches/patch-modules_libpref_init_all.js
deleted file mode 100644
index 042a33051ce..00000000000
--- a/www/firefox/patches/patch-modules_libpref_init_all.js
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_libpref_init_all.js,v 1.5 2016/08/06 08:46:59 ryoon Exp $
-
-* Improve stability under NetBSD.
-
---- modules/libpref/init/all.js.orig 2016-07-25 20:22:05.000000000 +0000
-+++ modules/libpref/init/all.js
-@@ -4540,7 +4540,7 @@ pref("device.sensors.enabled", true);
- pref("device.storage.enabled", false);
-
- // Toggle which thread the HTML5 parser uses for stream parsing
--pref("html5.offmainthread", true);
-+pref("html5.offmainthread", false);
- // Time in milliseconds between the time a network buffer is seen and the
- // timer firing when the timer hasn't fired previously in this parse in the
- // off-the-main-thread HTML5 parser.
diff --git a/www/firefox/patches/patch-moz.configure b/www/firefox/patches/patch-moz.configure
deleted file mode 100644
index 366b4a663d1..00000000000
--- a/www/firefox/patches/patch-moz.configure
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-moz.configure,v 1.1 2016/12/03 09:58:26 ryoon Exp $
-
---- moz.configure.orig 2016-10-31 20:15:26.000000000 +0000
-+++ moz.configure
-@@ -216,6 +216,30 @@ check_prog('GENISOIMAGE', delayed_getatt
- check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'),
- allow_missing=True)
-
-+option('--with-system-graphite2',
-+ help="Use system graphite2 (located with pkgconfig)")
-+
-+@depends('--with-system-graphite2', compile_environment)
-+def check_for_graphite2(value, compile_env):
-+ return value and compile_env
-+
-+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
-+ check_for_graphite2)
-+
-+set_config('MOZ_SYSTEM_GRAPHITE2', system_graphite2)
-+
-+option('--with-system-harfbuzz',
-+ help="Use system harfbuzz (located with pkgconfig)")
-+
-+@depends('--with-system-harfbuzz', compile_environment)
-+def check_for_harfbuzz(value, compile_env):
-+ return value and compile_env
-+
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.2.6',
-+ check_for_harfbuzz)
-+
-+set_config('MOZ_SYSTEM_HARFBUZZ', system_harfbuzz)
-+
- option('--enable-system-hunspell',
- help="Use system hunspell (located with pkgconfig)")
-
diff --git a/www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py b/www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py
deleted file mode 100644
index 2ac802a045c..00000000000
--- a/www/firefox/patches/patch-python_mozbuild_mozbuild_configure_options.py
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-python_mozbuild_mozbuild_configure_options.py,v 1.1 2016/08/06 08:46:59 ryoon Exp $
-
-* Allow lowercase environmental variables
-
---- python/mozbuild/mozbuild/configure/options.py.orig 2016-07-25 20:22:07.000000000 +0000
-+++ python/mozbuild/mozbuild/configure/options.py
-@@ -141,9 +141,6 @@ class Option(object):
- if not isinstance(env, types.StringTypes):
- raise InvalidOptionError(
- 'Environment variable name must be a string')
-- if not env.isupper():
-- raise InvalidOptionError(
-- 'Environment variable name must be all uppercase')
- if nargs not in (None, '?', '*', '+') and not (
- isinstance(nargs, int) and nargs >= 0):
- raise InvalidOptionError(
-@@ -250,9 +247,6 @@ class Option(object):
- if name.startswith('-'):
- raise InvalidOptionError(
- 'Option must start with two dashes instead of one')
-- if name.islower():
-- raise InvalidOptionError(
-- 'Environment variable name must be all uppercase')
- return '', name, values
-
- @staticmethod
diff --git a/www/firefox/patches/patch-toolkit_library_dependentlibs.py b/www/firefox/patches/patch-toolkit_library_dependentlibs.py
new file mode 100644
index 00000000000..75d0fcd3414
--- /dev/null
+++ b/www/firefox/patches/patch-toolkit_library_dependentlibs.py
@@ -0,0 +1,21 @@
+$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_libxul.mk b/www/firefox/patches/patch-toolkit_library_libxul.mk
deleted file mode 100644
index 91de9d61f3c..00000000000
--- a/www/firefox/patches/patch-toolkit_library_libxul.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-toolkit_library_libxul.mk,v 1.4 2016/08/16 09:34:12 tnn Exp $
-
-Can't do relocation against extern protected symbol (pkg/50767)
-usr/bin/ld: ../../xpcom/components/nsComponentManager.o: relocation R_X86_64_PC32 against protected symbol `start_kPStaticModules_NSModule' can not be used when making a shared object
-
---- toolkit/library/libxul.mk.orig 2016-06-18 12:32:59.901404958 +0000
-+++ toolkit/library/libxul.mk
-@@ -55,7 +55,7 @@ endif
- ifdef _MSC_VER
- get_first_and_last = dumpbin -exports $1 | grep _NSModule@@ | sort -k 3 | sed -n 's/^.*?\([^@]*\)@@.*$$/\1/;1p;$$p'
- else
--get_first_and_last = $(TOOLCHAIN_PREFIX)nm -g $1 | grep _NSModule$$ | grep -vw refptr | sort | sed -n 's/^.* _*\([^ ]*\)$$/\1/;1p;$$p'
-+get_first_and_last = $(TOOLCHAIN_PREFIX)nm $1 | grep _NSModule$$ | grep -vw refptr | sort | sed -n 's/^.* _*\([^ ]*\)$$/\1/;1p;$$p'
- endif
-
- LOCAL_CHECKS = test "$$($(get_first_and_last) | xargs echo)" != "start_kPStaticModules_NSModule end_kPStaticModules_NSModule" && echo "NSModules are not ordered appropriately" && exit 1 || exit 0
diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build
index 665c200caa9..11a47f2e0d5 100644
--- a/www/firefox/patches/patch-toolkit_library_moz.build
+++ b/www/firefox/patches/patch-toolkit_library_moz.build
@@ -1,11 +1,28 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.10 2017/01/27 01:36:21 maya Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.11 2017/03/07 20:45:43 ryoon Exp $
* Support system libraries
* Restore OSS support
---- toolkit/library/moz.build.orig 2017-01-16 16:16:52.000000000 +0000
+--- toolkit/library/moz.build.orig 2017-02-11 00:39:16.000000000 +0000
+++ toolkit/library/moz.build
-@@ -234,6 +234,21 @@ if CONFIG['MOZ_SYSTEM_PNG']:
+@@ -215,6 +215,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
+ ]
+
+ OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
++OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+
+ if CONFIG['SERVO_TARGET_DIR']:
+@@ -229,9 +230,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
+ if CONFIG['MOZ_SYSTEM_PNG']:
+ OS_LIBS += CONFIG['MOZ_PNG_LIBS']
+
++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
++
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
++
if CONFIG['MOZ_SYSTEM_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
@@ -27,13 +44,14 @@ $NetBSD: patch-toolkit_library_moz.build,v 1.10 2017/01/27 01:36:21 maya Exp $
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
-@@ -246,6 +261,9 @@ if not CONFIG['MOZ_TREE_PIXMAN']:
- if CONFIG['MOZ_ALSA']:
- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+@@ -241,8 +263,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+ if not CONFIG['MOZ_TREE_PIXMAN']:
+ OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
+-if CONFIG['MOZ_ALSA']:
+- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+if CONFIG['MOZ_OSS']:
+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
-+
+
if CONFIG['HAVE_CLOCK_MONOTONIC']:
OS_LIBS += CONFIG['REALTIME_LIBS']
-
diff --git a/www/firefox/patches/patch-toolkit_moz.configure b/www/firefox/patches/patch-toolkit_moz.configure
index 04051363bbb..39d77675617 100644
--- a/www/firefox/patches/patch-toolkit_moz.configure
+++ b/www/firefox/patches/patch-toolkit_moz.configure
@@ -1,15 +1,33 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.1 2016/09/20 20:01:41 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.2 2017/03/07 20:45:43 ryoon Exp $
* Enable widevide CDM for NetBSD
---- toolkit/moz.configure.orig 2016-08-29 20:32:20.000000000 +0000
+--- toolkit/moz.configure.orig 2017-01-23 16:13:54.000000000 +0000
+++ toolkit/moz.configure
-@@ -348,7 +348,7 @@ option('--enable-eme',
- def enable_eme(value, target):
- # Widevine EME by default enabled on desktop Windows, MacOS and Linux,
- # x86 and x64 builds.
-- if (target.kernel in ('Darwin', 'WINNT', 'Linux') and
-+ if (target.kernel in ('Darwin', 'WINNT', 'Linux', 'NetBSD') and
- target.os not in ('Android', 'iOS') and
- target.cpu in ('x86', 'x86_64')):
- return value
+@@ -338,6 +338,26 @@ add_old_configure_assignment('FT2_LIBS',
+ add_old_configure_assignment('FT2_CFLAGS',
+ delayed_getattr(ft2_info, 'cflags'))
+
++# Graphite2
++# ==============================================================
++option('--with-system-graphite2',
++ help="Use system graphite2 (located with pkgconfig)")
++
++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
++ when='--with-system-graphite2')
++
++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True))
++
++# HarfBuzz
++# ==============================================================
++option('--with-system-harfbuzz',
++ help="Use system harfbuzz (located with pkgconfig)")
++
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.1',
++ when='--with-system-harfbuzz')
++
++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
++
+ # Apple platform decoder support
+ # ==============================================================
+ @depends(toolkit)
diff --git a/www/firefox/patches/patch-xpcom_components_Module.h b/www/firefox/patches/patch-xpcom_components_Module.h
deleted file mode 100644
index 8d5a487c923..00000000000
--- a/www/firefox/patches/patch-xpcom_components_Module.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-xpcom_components_Module.h,v 1.3 2016/08/16 09:34:12 tnn Exp $
-
-Can't do relocation against extern protected symbol (pkg/50767)
-usr/bin/ld: ../../xpcom/components/nsComponentManager.o: relocation R_X86_64_PC32 against protected symbol `start_kPStaticModules_NSModule' can not be used when making a shared object
-
---- xpcom/components/Module.h.orig 2016-06-01 04:11:44.000000000 +0000
-+++ xpcom/components/Module.h
-@@ -125,7 +125,7 @@ struct Module
- # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport)
- # elif defined(__GNUC__)
- # if defined(__ELF__)
--# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected")))
-+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("hidden")))
- # elif defined(__MACH__)
- # define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default")))
- # elif defined (_WIN32)
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
deleted file mode 100644
index 363412184db..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.6 2017/01/25 13:24:51 ryoon Exp $
-
---- xpcom/reflect/xptcall/md/unix/moz.build.orig 2017-01-16 16:16:53.000000000 +0000
-+++ xpcom/reflect/xptcall/md/unix/moz.build
-@@ -145,7 +145,7 @@ if CONFIG['OS_ARCH'] == 'NetBSD':
- 'xptcstubs_netbsd_m68k.cpp'
- ]
-
--if CONFIG['OS_ARCH'] == 'Linux':
-+if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'):
- if CONFIG['OS_TEST'] == 'aarch64':
- SOURCES += [
- 'xptcinvoke_aarch64.cpp',
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp
deleted file mode 100644
index 86c3beed0ad..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.1 2014/10/15 13:43:32 ryoon Exp $
-
---- xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp.orig 2014-10-11 09:06:50.000000000 +0000
-+++ xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp
-@@ -9,7 +9,7 @@
- #include "xptc_gcc_x86_unix.h"
-
- extern "C" {
--static void ATTRIBUTE_USED __attribute__ ((regparm(3)))
-+void ATTRIBUTE_USED __attribute__ ((regparm(3)))
- invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d)
- {
- for(uint32_t i = paramCount; i >0; i--, d++, s++)
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp
deleted file mode 100644
index 98b041c7dba..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.1 2014/10/15 13:43:32 ryoon Exp $
-
---- xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp.orig 2014-10-11 09:06:50.000000000 +0000
-+++ xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp
-@@ -10,7 +10,7 @@
- #include "xptc_gcc_x86_unix.h"
-
- extern "C" {
--static nsresult ATTRIBUTE_USED
-+nsresult ATTRIBUTE_USED
- __attribute__ ((regparm (3)))
- PrepareAndDispatch(uint32_t methodIndex, nsXPTCStubBase* self, uint32_t* args)
- {