summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/firefox/Makefile6
-rw-r--r--www/firefox/PLIST351
-rw-r--r--www/firefox/distinfo43
-rw-r--r--www/firefox/mozilla-common.mk10
-rw-r--r--www/firefox/patches/patch-aa47
-rw-r--r--www/firefox/patches/patch-config_external_moz.build12
-rw-r--r--www/firefox/patches/patch-config_system-headers14
-rw-r--r--www/firefox/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp12
-rw-r--r--www/firefox/patches/patch-dom_media_moz.build10
-rw-r--r--www/firefox/patches/patch-gfx_skia_generate__mozbuild.py10
-rw-r--r--www/firefox/patches/patch-gfx_skia_moz.build10
-rw-r--r--www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp30
-rw-r--r--www/firefox/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp28
-rw-r--r--www/firefox/patches/patch-gfx_skia_skia_src_opts_memset.arm.S49
-rw-r--r--www/firefox/patches/patch-gfx_thebes_moz.build13
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_cubeb.c8
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c66
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_moz.build7
-rw-r--r--www/firefox/patches/patch-media_libtheora_moz.build8
-rw-r--r--www/firefox/patches/patch-pb11
-rw-r--r--www/firefox/patches/patch-pc12
-rw-r--r--www/firefox/patches/patch-toolkit_library_moz.build26
-rw-r--r--www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build13
23 files changed, 371 insertions, 425 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2108f2b463c..6f8fa998bc5 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.249 2016/04/13 20:37:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.250 2016/04/27 16:22:39 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 45.0
-MOZ_BRANCH_MINOR= .2
+MOZ_BRANCH= 46.0
+MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 3c06ee6666f..38f1dfdd359 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.105 2016/04/13 20:37:33 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.106 2016/04/27 16:22:39 ryoon Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -91,6 +91,7 @@ lib/firefox/browser/chrome/browser/content/browser/browser-fxaccounts.js
lib/firefox/browser/chrome/browser/content/browser/browser-gestureSupport.js
lib/firefox/browser/chrome/browser/content/browser/browser-places.js
lib/firefox/browser/chrome/browser/content/browser/browser-plugins.js
+lib/firefox/browser/chrome/browser/content/browser/browser-refreshblocker.js
lib/firefox/browser/chrome/browser/content/browser/browser-safebrowsing.js
lib/firefox/browser/chrome/browser/content/browser/browser-sidebar.js
lib/firefox/browser/chrome/browser/content/browser/browser-social.js
@@ -201,49 +202,6 @@ lib/firefox/browser/chrome/browser/content/browser/places/places.xul
lib/firefox/browser/chrome/browser/content/browser/places/placesOverlay.xul
lib/firefox/browser/chrome/browser/content/browser/places/tree.xml
lib/firefox/browser/chrome/browser/content/browser/places/treeView.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/main.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/css/firasans.css
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/css/normalize.css
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/css/saved.css
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/css/signup.css
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/fonts/FiraSans-Regular.woff
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketerror@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketerror@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogo@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogo@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogosolo@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketlogosolo@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketmenuitem16.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketmenuitem16@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_button@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_button@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_devices@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_devices@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_hero@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/pocketsignup_hero@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/signup_firefoxlogo@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/signup_firefoxlogo@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/signup_help@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/signup_help@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_close@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_close@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive@1x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/messages.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/saved.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/signup.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/tmpl.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/vendor/handlebars.runtime.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/vendor/jquery-2.1.1.min.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/vendor/jquery.tokeninput.min.js
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/saved.html
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/signup.html
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/tmpl/saved_premiumextras.handlebars
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/tmpl/saved_premiumshell.handlebars
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/tmpl/saved_shell.handlebars
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/tmpl/signup_shell.handlebars
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/tmpl/signupstoryboard_shell.handlebars
-lib/firefox/browser/chrome/browser/content/browser/pocket/pktApi.js
lib/firefox/browser/chrome/browser/content/browser/preferences/applicationManager.js
lib/firefox/browser/chrome/browser/content/browser/preferences/applicationManager.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/blocklists.js
@@ -253,6 +211,7 @@ 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/cookies.js
lib/firefox/browser/chrome/browser/content/browser/preferences/cookies.xul
+lib/firefox/browser/chrome/browser/content/browser/preferences/donottrack.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/fonts.js
lib/firefox/browser/chrome/browser/content/browser/preferences/fonts.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.css
@@ -279,9 +238,6 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/selectBookmark.js
lib/firefox/browser/chrome/browser/content/browser/preferences/selectBookmark.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/translation.js
lib/firefox/browser/chrome/browser/content/browser/preferences/translation.xul
-lib/firefox/browser/chrome/browser/content/browser/remote-newtab/newTab.css
-lib/firefox/browser/chrome/browser/content/browser/remote-newtab/newTab.js
-lib/firefox/browser/chrome/browser/content/browser/remote-newtab/newTab.xhtml
lib/firefox/browser/chrome/browser/content/browser/report-phishing-overlay.xul
lib/firefox/browser/chrome/browser/content/browser/safeMode.css
lib/firefox/browser/chrome/browser/content/browser/safeMode.js
@@ -290,6 +246,11 @@ lib/firefox/browser/chrome/browser/content/browser/sanitize.js
lib/firefox/browser/chrome/browser/content/browser/sanitize.xul
lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.css
lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.js
+lib/firefox/browser/chrome/browser/content/browser/schemas/bookmarks.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/browser_action.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus_internal.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/page_action.json
lib/firefox/browser/chrome/browser/content/browser/schemas/tabs.json
lib/firefox/browser/chrome/browser/content/browser/schemas/windows.json
lib/firefox/browser/chrome/browser/content/browser/search/search.xml
@@ -645,9 +606,6 @@ lib/firefox/browser/chrome/devtools/content/debugger/views/workers-view.js
lib/firefox/browser/chrome/devtools/content/eyedropper/crosshairs.css
lib/firefox/browser/chrome/devtools/content/eyedropper/eyedropper.xul
lib/firefox/browser/chrome/devtools/content/eyedropper/nocursor.css
-lib/firefox/browser/chrome/devtools/content/fontinspector/font-inspector.css
-lib/firefox/browser/chrome/devtools/content/fontinspector/font-inspector.js
-lib/firefox/browser/chrome/devtools/content/fontinspector/font-inspector.xhtml
lib/firefox/browser/chrome/devtools/content/framework/connect/connect.css
lib/firefox/browser/chrome/devtools/content/framework/connect/connect.js
lib/firefox/browser/chrome/devtools/content/framework/connect/connect.xhtml
@@ -661,12 +619,16 @@ 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/computed/computed.xhtml
+lib/firefox/browser/chrome/devtools/content/inspector/fonts/fonts.js
+lib/firefox/browser/chrome/devtools/content/inspector/fonts/fonts.xhtml
lib/firefox/browser/chrome/devtools/content/inspector/inspector.css
lib/firefox/browser/chrome/devtools/content/inspector/inspector.xul
-lib/firefox/browser/chrome/devtools/content/layoutview/view.js
-lib/firefox/browser/chrome/devtools/content/layoutview/view.xhtml
-lib/firefox/browser/chrome/devtools/content/markupview/markup-view.css
-lib/firefox/browser/chrome/devtools/content/markupview/markup-view.xhtml
+lib/firefox/browser/chrome/devtools/content/inspector/layout/layout.js
+lib/firefox/browser/chrome/devtools/content/inspector/layout/layout.xhtml
+lib/firefox/browser/chrome/devtools/content/inspector/markup/markup.css
+lib/firefox/browser/chrome/devtools/content/inspector/markup/markup.xhtml
+lib/firefox/browser/chrome/devtools/content/inspector/rules/rules.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
@@ -715,39 +677,36 @@ lib/firefox/browser/chrome/devtools/content/shared/widgets/mdn-docs.css
lib/firefox/browser/chrome/devtools/content/shared/widgets/spectrum-frame.xhtml
lib/firefox/browser/chrome/devtools/content/shared/widgets/spectrum.css
lib/firefox/browser/chrome/devtools/content/shared/widgets/widgets.css
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/codemirror.css
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/codemirror.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/comment/comment.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/dialog/dialog.css
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/dialog/dialog.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/edit/closebrackets.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/edit/matchbrackets.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/edit/trailingspace.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/fold/brace-fold.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/fold/comment-fold.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/fold/foldcode.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/fold/foldgutter.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/fold/xml-fold.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/hint/show-hint.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/comment/comment.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/dialog/dialog.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/edit/closebrackets.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/edit/matchbrackets.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/edit/trailingspace.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/brace-fold.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/comment-fold.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/foldcode.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/foldgutter.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/fold/xml-fold.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/hint/show-hint.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/search/search.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/search/searchcursor.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/selection/active-line.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/tern/tern.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/emacs.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/sublime.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/keymap/vim.js
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/lib/codemirror.css
+lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/lib/codemirror.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/clike.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/css.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/htmlmixed.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/javascript.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mode/xml.js
lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/mozilla.css
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/search/search.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/search/searchcursor.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/selection/active-line.js
-lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/tern/tern.js
lib/firefox/browser/chrome/devtools/content/storage/storage.xul
lib/firefox/browser/chrome/devtools/content/styleeditor/styleeditor.css
lib/firefox/browser/chrome/devtools/content/styleeditor/styleeditor.xul
-lib/firefox/browser/chrome/devtools/content/styleinspector/computedview.xhtml
-lib/firefox/browser/chrome/devtools/content/styleinspector/cssruleview.xhtml
-lib/firefox/browser/chrome/devtools/content/styleinspector/ruleview.css
lib/firefox/browser/chrome/devtools/content/webaudioeditor/controller.js
lib/firefox/browser/chrome/devtools/content/webaudioeditor/includes.js
lib/firefox/browser/chrome/devtools/content/webaudioeditor/models.js
@@ -765,7 +724,12 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/compo
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target-list.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-details.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-target-node.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-time-block.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-timeline.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/keyframes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/rate-selector.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/canvasdebugger/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/actions/breakpoints.js
@@ -789,6 +753,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/eyedropper/commands.
lib/firefox/browser/chrome/devtools/modules/devtools/client/eyedropper/eyedropper-child.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/eyedropper/eyedropper.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/ToolboxProcess.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/attach-thread.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/gDevTools.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/selection.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/sidebar.js
@@ -798,9 +763,24 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-ho
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/breadcrumbs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/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/layout/layout.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/html-editor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.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
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/rules.js
+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/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/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers-panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/json-panel.js
@@ -824,6 +804,8 @@ 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/dom-tree.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/general.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/headers-panel.css
@@ -844,24 +826,29 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/main.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/viewer-config.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/main.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/markupview/html-editor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/markupview/markup-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/allocations.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/breakdown.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/diffing.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/dominatorTreeBreakdown.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/filter.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/inverted.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/io.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/refresh.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/snapshot.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/app.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/frame.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/census-header.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/census-tree-item.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/census.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree-header.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree-item.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/heap.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/list.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/snapshot-list-item.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-item.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
@@ -869,10 +856,12 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/allocations.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/breakdown.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/diffing.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/dominatorTreeBreakdown.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/errors.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/filter.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/inverted.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/snapshots.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-automation.js
@@ -891,6 +880,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/io.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/frame-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/jit.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/marker-formatters.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/marker-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/telemetry.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/logic/tree-model.js
@@ -943,15 +933,16 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/Jsbeautify.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/SplitView.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/autocomplete-popup.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/browser-loader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/frame.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-parsing-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/demangle.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/devices.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/doorhanger.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/node-attribute-parser.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/observable-object.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/options-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/output-parser.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/poller.js
@@ -973,6 +964,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-
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/seamless-immutable.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/view-source.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/AbstractTreeItem.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/BarGraphWidget.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/BreadcrumbsWidget.jsm
@@ -1016,12 +1008,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleShe
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-commands.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/styleinspector/computed-view.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/styleinspector/rule-view.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector-menu.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector-overlays.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/styleinspector/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/variables.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/tilt/TiltWorkerCrafter.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/tilt/TiltWorkerPicker.js
@@ -1054,6 +1040,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/utils
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/actor-registry.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/addon.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/animation.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/breakpoint.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/call-watcher.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/canvas.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/child-process.js
@@ -1065,6 +1052,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/device.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-manager.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-registry.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/eventlooplag.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/frame.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/framerate.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/gcli.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/heap-snapshot-file.js
@@ -1127,11 +1115,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/memory.j
lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/profiler.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/recorder.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/timeline.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/primitive.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/protocol.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/worker.js
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/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
@@ -1241,6 +1231,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/HeapAna
lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/census-tree-node.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/indentation.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/inspector/css-logic.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/beautify.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/sanitytest.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/urlencode_unpacker.js
@@ -1262,7 +1253,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/cert.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/prompt.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/security/socket.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/sourcemap/source-map.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/styleinspector/css-logic.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/system.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator-content.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator.js
@@ -1284,13 +1274,14 @@ lib/firefox/browser/chrome/devtools/skin/animationinspector.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/computedview.css
+lib/firefox/browser/chrome/devtools/skin/computed.css
lib/firefox/browser/chrome/devtools/skin/dark-theme.css
lib/firefox/browser/chrome/devtools/skin/debugger.css
+lib/firefox/browser/chrome/devtools/skin/devtools-browser.css
lib/firefox/browser/chrome/devtools/skin/eyedropper.css
lib/firefox/browser/chrome/devtools/skin/floating-scrollbars-light.css
lib/firefox/browser/chrome/devtools/skin/floating-scrollbars.css
-lib/firefox/browser/chrome/devtools/skin/font-inspector.css
+lib/firefox/browser/chrome/devtools/skin/fonts.css
lib/firefox/browser/chrome/devtools/skin/images/add.svg
lib/firefox/browser/chrome/devtools/skin/images/alerticon-warning.png
lib/firefox/browser/chrome/devtools/skin/images/alerticon-warning@2x.png
@@ -1363,6 +1354,19 @@ lib/firefox/browser/chrome/devtools/skin/images/editor-breakpoint@2x.png
lib/firefox/browser/chrome/devtools/skin/images/editor-debug-location.png
lib/firefox/browser/chrome/devtools/skin/images/editor-debug-location@2x.png
lib/firefox/browser/chrome/devtools/skin/images/editor-error.png
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-command-pick.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-canvas.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-debugger.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-inspector.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-memory.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-network.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-profiler.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-scratchpad.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-shadereditor.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-storage.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-styleeditor.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-webaudio.svg
+lib/firefox/browser/chrome/devtools/skin/images/emojis/emoji-tool-webconsole.svg
lib/firefox/browser/chrome/devtools/skin/images/fast-forward.png
lib/firefox/browser/chrome/devtools/skin/images/fast-forward@2x.png
lib/firefox/browser/chrome/devtools/skin/images/filetypes/dir-close.svg
@@ -1443,17 +1447,18 @@ lib/firefox/browser/chrome/devtools/skin/images/vview-open-inspector.png
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/layoutview.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-view.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/ruleview.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
@@ -1488,7 +1493,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/aboutTabCrashed.dtd
lib/firefox/browser/chrome/en-US/locale/browser/accounts.properties
lib/firefox/browser/chrome/en-US/locale/browser/appstrings.properties
lib/firefox/browser/chrome/en-US/locale/browser/baseMenuOverlay.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/browser-pocket.properties
+lib/firefox/browser/chrome/en-US/locale/browser/bookmarks.html
lib/firefox/browser/chrome/en-US/locale/browser/browser.dtd
lib/firefox/browser/chrome/en-US/locale/browser/browser.properties
lib/firefox/browser/chrome/en-US/locale/browser/customizableui/customizableWidgets.properties
@@ -1521,6 +1526,7 @@ 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/content.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/cookies.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences/donottrack.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/fonts.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/languages.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/main.dtd
@@ -1545,6 +1551,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/amazondotcom.xml
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/eBay.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/twitter.xml
@@ -1576,6 +1583,7 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/app-manager.proper
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/appcacheutils.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
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/connection-screen.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/connection-screen.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/debugger.dtd
@@ -1957,6 +1965,7 @@ lib/firefox/browser/components/FirefoxProfileMigrator.js
lib/firefox/browser/components/ProfileMigrator.js
lib/firefox/browser/components/SelfSupportService.js
lib/firefox/browser/components/WebContentConverter.js
+lib/firefox/browser/components/aboutNewTabService.js
lib/firefox/browser/components/components.manifest
lib/firefox/browser/components/devtools-clhandler.js
lib/firefox/browser/components/fuelApplication.js
@@ -1974,18 +1983,99 @@ lib/firefox/browser/defaults/preferences/firefox-branding.js
lib/firefox/browser/defaults/preferences/firefox-l10n.js
lib/firefox/browser/defaults/preferences/firefox.js
lib/firefox/browser/defaults/preferences/webide-prefs.js
-lib/firefox/browser/defaults/profile/bookmarks.html
-lib/firefox/browser/defaults/profile/chrome/userChrome-example.css
-lib/firefox/browser/defaults/profile/chrome/userContent-example.css
-lib/firefox/browser/defaults/profile/localstore.rdf
-lib/firefox/browser/defaults/profile/mimeTypes.rdf
-lib/firefox/browser/defaults/profile/prefs.js
lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/firefox/browser/features/e10srollout@mozilla.org/bootstrap.js
+lib/firefox/browser/features/e10srollout@mozilla.org/install.rdf
+lib/firefox/browser/features/firefox@getpocket.com/bootstrap.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome.manifest
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/Pocket.jsm
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/main.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/css/firasans.css
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/css/normalize.css
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/css/saved.css
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/css/signup.css
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/fonts/FiraSans-Regular.woff
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocket.svg
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketerror@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketerror@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketlogo@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketlogo@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketlogosolo@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketlogosolo@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketmenuitem16.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketmenuitem16@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_button@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_button@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_devices@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_devices@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_hero@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_hero@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_firefoxlogo@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_firefoxlogo@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_help@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_help@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_or@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/signup_or@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/tag_close@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/tag_close@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/tag_closeactive@1x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/tag_closeactive@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/js/messages.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/js/saved.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/js/signup.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/js/tmpl.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/js/vendor/handlebars.runtime.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/js/vendor/jquery-2.1.1.min.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/js/vendor/jquery.tokeninput.min.js
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/license.txt
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/saved.html
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/signup.html
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/saved_premiumextras.handlebars
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/saved_premiumshell.handlebars
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/saved_shell.handlebars
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/signup_shell.handlebars
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/signupstoryboard_shell.handlebars
+lib/firefox/browser/features/firefox@getpocket.com/chrome/content/pktApi.jsm
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/Toolbar-inverted.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/Toolbar.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/menuPanel.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/menuPanel@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/pocket.css
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/Toolbar-inverted.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/Toolbar-inverted@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/Toolbar-yosemite.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/Toolbar-yosemite@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/Toolbar.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/Toolbar@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/menuPanel-yosemite.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/menuPanel-yosemite@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/menuPanel.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/menuPanel@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/osx/pocket.css
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/shared/pocket.css
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-XP.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-aero.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-aero@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-inverted.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-inverted@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-lunaSilver.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-win8.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar-win8@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/Toolbar@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/menuPanel-aero.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/menuPanel-aero@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/menuPanel.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/menuPanel@2x.png
+lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/windows/pocket.css
+lib/firefox/browser/features/firefox@getpocket.com/en-US/locale/en-US/pocket.properties
+lib/firefox/browser/features/firefox@getpocket.com/install.rdf
lib/firefox/browser/features/loop@mozilla.org/bootstrap.js
lib/firefox/browser/features/loop@mozilla.org/chrome.manifest
lib/firefox/browser/features/loop@mozilla.org/chrome/content/locale-fallback/en-US/loop.properties
+lib/firefox/browser/features/loop@mozilla.org/chrome/content/modules/DomainWhitelist.jsm
lib/firefox/browser/features/loop@mozilla.org/chrome/content/modules/LoopRooms.jsm
lib/firefox/browser/features/loop@mozilla.org/chrome/content/modules/LoopRoomsCache.jsm
lib/firefox/browser/features/loop@mozilla.org/chrome/content/modules/MozLoopAPI.jsm
@@ -1993,10 +2083,12 @@ lib/firefox/browser/features/loop@mozilla.org/chrome/content/modules/MozLoopPush
lib/firefox/browser/features/loop@mozilla.org/chrome/content/modules/MozLoopService.jsm
lib/firefox/browser/features/loop@mozilla.org/chrome/content/modules/MozLoopWorker.js
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/conversation.html
+lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/css/desktop.css
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/css/panel.css
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/css/slideshow.css
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/js/conversation.js
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/js/conversationAppStore.js
+lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/js/desktopViews.js
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/js/feedbackViews.js
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/js/otconfig.js
lib/firefox/browser/features/loop@mozilla.org/chrome/content/panels/js/panel.js
@@ -2050,6 +2142,7 @@ lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/glyph-em
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/glyph-facebook-16x16.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/glyph-help-16x16.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/glyph-help-no-circle-16x16.svg
+lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/glyph-help-no-circle-blue-16x16.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/glyph-link-16x16.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/glyph-user-16x16.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/hangup-inverse-14x14.png
@@ -2064,6 +2157,7 @@ lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/icons-10
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/icons-14x14.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/icons-16x16.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/leave.svg
+lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/leave_notification.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/media-group-left-hover.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/media-group-right-hover.svg
lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/img/media-group.svg
@@ -2202,25 +2296,30 @@ lib/firefox/browser/modules/Feeds.jsm
lib/firefox/browser/modules/FormSubmitObserver.jsm
lib/firefox/browser/modules/FormValidationHandler.jsm
lib/firefox/browser/modules/HiddenFrame.jsm
+lib/firefox/browser/modules/LaterRun.jsm
lib/firefox/browser/modules/MigrationUtils.jsm
lib/firefox/browser/modules/NetworkPrioritizer.jsm
+lib/firefox/browser/modules/NewTabPrefsProvider.jsm
lib/firefox/browser/modules/NewTabURL.jsm
lib/firefox/browser/modules/PanelFrame.jsm
lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
+lib/firefox/browser/modules/PlacesProvider.jsm
lib/firefox/browser/modules/PlacesUIUtils.jsm
lib/firefox/browser/modules/PluginContent.jsm
-lib/firefox/browser/modules/Pocket.jsm
lib/firefox/browser/modules/ProcessHangMonitor.jsm
lib/firefox/browser/modules/ReaderParent.jsm
lib/firefox/browser/modules/RecentWindow.jsm
lib/firefox/browser/modules/RemotePrompt.jsm
+lib/firefox/browser/modules/Sanitizer.jsm
lib/firefox/browser/modules/ScrollbarSampler.jsm
lib/firefox/browser/modules/SelfSupportBackend.jsm
+lib/firefox/browser/modules/ShellService.jsm
lib/firefox/browser/modules/SitePermissions.jsm
lib/firefox/browser/modules/Social.jsm
lib/firefox/browser/modules/TabGroupsMigrator.jsm
lib/firefox/browser/modules/TransientPrefs.jsm
lib/firefox/browser/modules/UITour.jsm
+lib/firefox/browser/modules/UserContextUI.jsm
lib/firefox/browser/modules/WebappManager.jsm
lib/firefox/browser/modules/devtools/client/framework/gDevTools.jsm
lib/firefox/browser/modules/devtools/gDevTools.jsm
@@ -2282,6 +2381,8 @@ lib/firefox/chrome/en-US/locale/en-US/global/AccessFu.properties
lib/firefox/chrome/en-US/locale/en-US/global/about.dtd
lib/firefox/chrome/en-US/locale/en-US/global/aboutAbout.dtd
lib/firefox/chrome/en-US/locale/en-US/global/aboutNetworking.dtd
+lib/firefox/chrome/en-US/locale/en-US/global/aboutProfiles.dtd
+lib/firefox/chrome/en-US/locale/en-US/global/aboutProfiles.properties
lib/firefox/chrome/en-US/locale/en-US/global/aboutReader.properties
lib/firefox/chrome/en-US/locale/en-US/global/aboutRights.dtd
lib/firefox/chrome/en-US/locale/en-US/global/aboutServiceWorkers.dtd
@@ -2425,6 +2526,7 @@ lib/firefox/chrome/marionette/content/MockPermissionPrompt.jsm
lib/firefox/chrome/marionette/content/MozillaLogger.js
lib/firefox/chrome/marionette/content/SpecialPowersObserver.jsm
lib/firefox/chrome/marionette/content/SpecialPowersObserverAPI.js
+lib/firefox/chrome/marionette/content/accessibility.js
lib/firefox/chrome/marionette/content/actions.js
lib/firefox/chrome/marionette/content/atoms.js
lib/firefox/chrome/marionette/content/capture.js
@@ -2436,6 +2538,7 @@ lib/firefox/chrome/marionette/content/elements.js
lib/firefox/chrome/marionette/content/emulator.js
lib/firefox/chrome/marionette/content/error.js
lib/firefox/chrome/marionette/content/frame-manager.js
+lib/firefox/chrome/marionette/content/interactions.js
lib/firefox/chrome/marionette/content/listener.js
lib/firefox/chrome/marionette/content/message.js
lib/firefox/chrome/marionette/content/modal.js
@@ -2500,7 +2603,11 @@ lib/firefox/chrome/toolkit/content/extensions/ext-test.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/cookies.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/extension.json
lib/firefox/chrome/toolkit/content/extensions/schemas/extension_types.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/i18n.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/idle.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/runtime.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
@@ -2521,11 +2628,16 @@ lib/firefox/chrome/toolkit/content/global/about.xhtml
lib/firefox/chrome/toolkit/content/global/aboutAbout.js
lib/firefox/chrome/toolkit/content/global/aboutAbout.xhtml
lib/firefox/chrome/toolkit/content/global/aboutCache.js
+lib/firefox/chrome/toolkit/content/global/aboutCheckerboard.css
+lib/firefox/chrome/toolkit/content/global/aboutCheckerboard.js
+lib/firefox/chrome/toolkit/content/global/aboutCheckerboard.xhtml
lib/firefox/chrome/toolkit/content/global/aboutMemory.css
lib/firefox/chrome/toolkit/content/global/aboutMemory.js
lib/firefox/chrome/toolkit/content/global/aboutMemory.xhtml
lib/firefox/chrome/toolkit/content/global/aboutNetworking.js
lib/firefox/chrome/toolkit/content/global/aboutNetworking.xhtml
+lib/firefox/chrome/toolkit/content/global/aboutProfiles.js
+lib/firefox/chrome/toolkit/content/global/aboutProfiles.xhtml
lib/firefox/chrome/toolkit/content/global/aboutRights.xhtml
lib/firefox/chrome/toolkit/content/global/aboutServiceWorkers.js
lib/firefox/chrome/toolkit/content/global/aboutServiceWorkers.xhtml
@@ -2705,10 +2817,6 @@ lib/firefox/chrome/toolkit/content/mozapps/extensions/list.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/newaddon.js
lib/firefox/chrome/toolkit/content/mozapps/extensions/newaddon.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
-lib/firefox/chrome/toolkit/content/mozapps/extensions/selectAddons.css
-lib/firefox/chrome/toolkit/content/mozapps/extensions/selectAddons.js
-lib/firefox/chrome/toolkit/content/mozapps/extensions/selectAddons.xml
-lib/firefox/chrome/toolkit/content/mozapps/extensions/selectAddons.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/setting.xml
lib/firefox/chrome/toolkit/content/mozapps/extensions/update.js
lib/firefox/chrome/toolkit/content/mozapps/extensions/update.xul
@@ -2937,7 +3045,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Plus-24x24.svg
lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Reading-List-24x24.svg
lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-24x24.svg
lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-Arrow.svg
-lib/firefox/chrome/toolkit/skin/classic/global/reader/pocket.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
@@ -2973,6 +3080,7 @@ lib/firefox/chrome/toolkit/skin/classic/help/Weblink-rtl.png
lib/firefox/chrome/toolkit/skin/classic/help/Weblink.png
lib/firefox/chrome/toolkit/skin/classic/help/helpFileLayout.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutNetworking.css
+lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutProfiles.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutServiceWorkers.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloadIcon.png
@@ -3005,7 +3113,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/navigation.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/newaddon.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/selectAddons.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric-16.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/update.css
@@ -3050,7 +3157,6 @@ lib/firefox/components/ColorAnalyzer.js
lib/firefox/components/ConsoleAPIStorage.js
lib/firefox/components/ContactManager.js
lib/firefox/components/ContentProcessSingleton.js
-lib/firefox/components/DataReportingService.js
lib/firefox/components/DataStoreImpl.js
lib/firefox/components/DownloadLegacy.js
lib/firefox/components/FeedProcessor.js
@@ -3073,8 +3179,7 @@ lib/firefox/components/PlacesCategoriesStarter.js
lib/firefox/components/PresentationDeviceInfoManager.js
lib/firefox/components/PrivateBrowsingTrackingProtectionWhitelist.js
lib/firefox/components/Push.js
-lib/firefox/components/PushClient.js
-lib/firefox/components/PushNotificationService.js
+lib/firefox/components/PushComponents.js
lib/firefox/components/RemoteWebNavigation.js
lib/firefox/components/RequestSyncManager.js
lib/firefox/components/RequestSyncScheduler.js
@@ -3085,6 +3190,7 @@ lib/firefox/components/SystemMessageCache.js
lib/firefox/components/SystemMessageInternal.js
lib/firefox/components/SystemMessageManager.js
lib/firefox/components/TCPPresentationServer.js
+lib/firefox/components/TVSimulatorService.js
lib/firefox/components/TelemetryStartup.js
lib/firefox/components/UnifiedComplete.js
lib/firefox/components/Weave.js
@@ -3190,6 +3296,8 @@ lib/firefox/hyphenation/hyph_sv.dic
lib/firefox/hyphenation/hyph_tr.dic
lib/firefox/hyphenation/hyph_uk.dic
lib/firefox/liblgpllibs.so
+lib/firefox/libmozavcodec.so
+lib/firefox/libmozavutil.so
lib/firefox/libmozsqlite3.so
lib/firefox/libxul.so
lib/firefox/modules/AboutReader.jsm
@@ -3286,7 +3394,6 @@ lib/firefox/modules/FxAccountsWebChannel.jsm
lib/firefox/modules/GMPInstallManager.jsm
lib/firefox/modules/GMPUtils.jsm
lib/firefox/modules/Geometry.jsm
-lib/firefox/modules/HealthReport.jsm
lib/firefox/modules/History.jsm
lib/firefox/modules/Http.jsm
lib/firefox/modules/ISO8601DateUtils.jsm
@@ -3319,7 +3426,6 @@ lib/firefox/modules/MatchPattern.jsm
lib/firefox/modules/MessageBroadcaster.jsm
lib/firefox/modules/MessagePortBase.jsm
lib/firefox/modules/MessagePortWorker.js
-lib/firefox/modules/Metrics.jsm
lib/firefox/modules/Microformats.js
lib/firefox/modules/MozSocialAPI.jsm
lib/firefox/modules/NativeApp.jsm
@@ -3368,7 +3474,6 @@ lib/firefox/modules/PushCrypto.jsm
lib/firefox/modules/PushDB.jsm
lib/firefox/modules/PushRecord.jsm
lib/firefox/modules/PushService.jsm
-lib/firefox/modules/PushServiceChildPreload.jsm
lib/firefox/modules/PushServiceHttp2.jsm
lib/firefox/modules/PushServiceWebSocket.jsm
lib/firefox/modules/ReaderMode.jsm
@@ -3800,7 +3905,6 @@ lib/firefox/modules/services-sync/engines/history.js
lib/firefox/modules/services-sync/engines/passwords.js
lib/firefox/modules/services-sync/engines/prefs.js
lib/firefox/modules/services-sync/engines/tabs.js
-lib/firefox/modules/services-sync/healthreport.jsm
lib/firefox/modules/services-sync/identity.js
lib/firefox/modules/services-sync/jpakeclient.js
lib/firefox/modules/services-sync/keys.js
@@ -3816,13 +3920,6 @@ lib/firefox/modules/services-sync/stages/enginesync.js
lib/firefox/modules/services-sync/status.js
lib/firefox/modules/services-sync/userapi.js
lib/firefox/modules/services-sync/util.js
-lib/firefox/modules/services/datareporting/policy.jsm
-lib/firefox/modules/services/healthreport/healthreporter.jsm
-lib/firefox/modules/services/healthreport/profile.jsm
-lib/firefox/modules/services/healthreport/providers.jsm
-lib/firefox/modules/services/metrics/dataprovider.jsm
-lib/firefox/modules/services/metrics/providermanager.jsm
-lib/firefox/modules/services/metrics/storage.jsm
lib/firefox/modules/sqlite/sqlite_internal.js
lib/firefox/modules/vtt.jsm
lib/firefox/modules/workers/PromiseWorker.js
@@ -3878,18 +3975,6 @@ lib/firefox/res/table-remove-column.gif
lib/firefox/res/table-remove-row-active.gif
lib/firefox/res/table-remove-row-hover.gif
lib/firefox/res/table-remove-row.gif
-lib/firefox/res/text_caret.png
-lib/firefox/res/text_caret@1.5x.png
-lib/firefox/res/text_caret@2.25x.png
-lib/firefox/res/text_caret@2x.png
-lib/firefox/res/text_caret_tilt_left.png
-lib/firefox/res/text_caret_tilt_left@1.5x.png
-lib/firefox/res/text_caret_tilt_left@2.25x.png
-lib/firefox/res/text_caret_tilt_left@2x.png
-lib/firefox/res/text_caret_tilt_right.png
-lib/firefox/res/text_caret_tilt_right@1.5x.png
-lib/firefox/res/text_caret_tilt_right@2.25x.png
-lib/firefox/res/text_caret_tilt_right@2x.png
lib/firefox/run-mozilla.sh
lib/firefox/webapprt-stub
lib/firefox/webapprt/chrome.manifest
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 2d498c8fc07..0fc23133c6b 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.242 2016/04/13 20:37:33 ryoon Exp $
+$NetBSD: distinfo,v 1.243 2016/04/27 16:22:40 ryoon Exp $
-SHA1 (firefox-45.0.2.source.tar.xz) = a4ca00cba9e351534b9c15b091deb10ed011fd30
-RMD160 (firefox-45.0.2.source.tar.xz) = e7e31ea784758ca9b41aa930be9b7a958234b758
-SHA512 (firefox-45.0.2.source.tar.xz) = 8c0b7afb41a1a405fe499299d1a8b1138dac52b9ad67bfc8761b70a26f330581c2aa1d76d67075896ec3a0c3f5367b8b58365ebc8b3a01f801fa37071b3de526
-Size (firefox-45.0.2.source.tar.xz) = 184298180 bytes
-SHA1 (patch-aa) = c97ef4b107ea917c2a10d1a1fdaf524d794612a0
+SHA1 (firefox-46.0.source.tar.xz) = 95c5673b4449e8d694c50aea23d8160509d6a85b
+RMD160 (firefox-46.0.source.tar.xz) = 333ab663beceeed102a90e0c5c3f17610b9895d8
+SHA512 (firefox-46.0.source.tar.xz) = f5a652e25fa74e3cb271af04d50cc7b63ca73fde9d2ff350e84b3dda55352bac2b28b567aed12164285d992414ad475da9d2555ab972e5c5d7b8f5226591036b
+Size (firefox-46.0.source.tar.xz) = 187338968 bytes
+SHA1 (patch-aa) = aea6148d8f8927ef21f5736e61d3324ff86006e7
SHA1 (patch-ao) = fef085ff0df6f2fa2e54dca473e849eb7bc2cf84
SHA1 (patch-as) = d5d7f8250a9cd462f25d529c2a79c59a1bba9db2
SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
@@ -15,16 +15,15 @@ SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f
SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3
SHA1 (patch-config_baseconfig.mk) = b8e8d46be72d381f7b95b62b9c0778e98954a888
-SHA1 (patch-config_external_moz.build) = fa4f350b077f5c4a1d7a07d123c635bd9c7f1f75
+SHA1 (patch-config_external_moz.build) = 9c832b575765923f4aa628281eda7eaba959f607
SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd
SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = a87a47454da13791bd0158ba6c8431164c1fb1b4
+SHA1 (patch-config_system-headers) = c3c2ca7778e1762d4b48916b42618d480322f7d4
SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
SHA1 (patch-dom_base_DOMRequest.cpp) = b934991e8ad03c3785e4c7d197b42f697571ec09
SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46
-SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 4685a646a76282619d7c42fac43500e0065f067d
-SHA1 (patch-dom_media_moz.build) = a89695c9557f59e00b42c60742f27a82de0f77fb
+SHA1 (patch-dom_media_moz.build) = 25d9983d421c46496a77b3040fd889e5a7af54b0
SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 6219ce1b3f2893c1d53453fcb5568d081b72e106
SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 0d10aa4c913d431fb8fa5f995f6e40cb364f069e
@@ -34,12 +33,10 @@ SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 0379bef956f8abf2da2
SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
-SHA1 (patch-gfx_skia_generate__mozbuild.py) = 68d690afd9092f11e17b7ec7db0987e8b6778cc5
-SHA1 (patch-gfx_skia_moz.build) = 019f502ee236c67ab3cba8c0e31591899c2c857c
-SHA1 (patch-gfx_skia_skia_src_core_SkUtilsArm.cpp) = 80283dd702be199ec7d038f4b2bb3385e0c4b482
-SHA1 (patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp) = 99fad319f00a72754f3596791f353b8ab1359d2b
-SHA1 (patch-gfx_skia_skia_src_opts_memset.arm.S) = a7ecacb40b482b2713ec71af197528bbe4bea00d
-SHA1 (patch-gfx_thebes_moz.build) = bbc67642604042c8d63e6de1a02d2c62fcf16d83
+SHA1 (patch-gfx_skia_generate__mozbuild.py) = 8cd84f55db2551ff1c593f257b656864c7ca7506
+SHA1 (patch-gfx_skia_moz.build) = 30248e176157ed04185be53d949aa99886568734
+SHA1 (patch-gfx_skia_skia_src_core_SkUtilsArm.cpp) = 149a76954f4ac078d367cf56aad4f9f17ec79df5
+SHA1 (patch-gfx_thebes_moz.build) = 022f9647b83afce00abe5a7ba4bd48cf3c7296ea
SHA1 (patch-gfx_ycbcr__row__arm.s) = cddf801b7ffc113a3e26bcc1f8d4a0aa3ced60c7
SHA1 (patch-gfx_ycbcr_moz.build) = 121386ef62ff7425e6f93bc624555199f2ac3485
SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = f9909ded72762b2c3547dd002707db43745f2b9d
@@ -74,10 +71,10 @@ SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
SHA1 (patch-js_src_shell_jsoptparse.cpp) = 2502ae2b4e6103788c2a888b6cb19cedf9d2976f
SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
-SHA1 (patch-media_libcubeb_src_cubeb.c) = 5c2a9adef2c3b8fe40490ac8062ae77d182b5e59
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 7394a73b1624ea525885aed524357bbd1a19138b
+SHA1 (patch-media_libcubeb_src_cubeb.c) = e55e26dae70ddb51d5668a3f60be37b668299ed3
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 361942835850eee0a6e77574c380704f8f8ad89b
SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62
-SHA1 (patch-media_libcubeb_src_moz.build) = 3ed7f6e8caf8cca718cd8dcb120bc401cd9a82ef
+SHA1 (patch-media_libcubeb_src_moz.build) = 9d99f250c78ff39dc0f3039fcf3622f7404f0f33
SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = b280f691dbe67b6de592dcd04baf33c6cf480cc8
@@ -86,7 +83,7 @@ SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b5980
SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de
SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933
-SHA1 (patch-media_libtheora_moz.build) = 4d03d454e13bda8321198aeb957aaabcfb4c6512
+SHA1 (patch-media_libtheora_moz.build) = 3245731c491b0fc715709be3355c4324bcc85896
SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910
SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
@@ -115,13 +112,11 @@ SHA1 (patch-modules_libpref_init_all.js) = fc47d4133490d3da79217864028f5a86023a6
SHA1 (patch-mozglue_build_arm.cpp) = e89e9ff5a26fb11b55df29a0b29d1cd6f35e46e6
SHA1 (patch-mozglue_build_arm.h) = e303e53d1931b28aab68346c7f6caac4402d16f1
SHA1 (patch-netwerk_dns_moz.build) = 6bf4691cf81d5f6fc1b392a4fac4368615e18faa
-SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
-SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
SHA1 (patch-rc) = 3bc75b2005bb1a371231846ea605bcf55251db57
SHA1 (patch-storage_SQLiteMutex.h) = 9552e325e4e6e0f611a83a5eea2617e04236616f
SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 4b664bb6ac2c23e8bfddd406bf76e288548e8910
SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h) = 3b0973c96eadb7bff91eab211d3c159a9b22fa9c
-SHA1 (patch-toolkit_library_moz.build) = 625d78e64959f78a5d0b8148749bb43a0abcbcf7
+SHA1 (patch-toolkit_library_moz.build) = 361a7c01f9459389998f3d0c4999633d49c1aa5b
SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6
SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
@@ -130,7 +125,7 @@ SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68
SHA1 (patch-xpcom_components_Module.h) = 35c5d831b0f916be4cbed18f904ab561dde72ab0
SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 6083e298140357bc5f2fa018885fed42eecb1ac4
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 4717f2a285200ccb5f580e12ffd73c51ae9e9c00
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 82026e72559334810be2f8a510d22f0553a353c2
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
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index b2ad5525938..40889f1365c 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.72 2016/03/08 21:32:52 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.73 2016/04/27 16:22:40 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -48,8 +48,8 @@ CONFIGURE_ARGS+= --enable-crypto
CONFIGURE_ARGS+= --with-pthreads
CONFIGURE_ARGS+= --disable-javaxpcom
CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
-CONFIGURE_ARGS+= --enable-gstreamer=1.0
-#CONFIGURE_ARGS+= --disable-gstreamer
+#CONFIGURE_ARGS+= --enable-gstreamer=1.0
+##CONFIGURE_ARGS+= --disable-gstreamer
CONFIGURE_ARGS+= --enable-svg
CONFIGURE_ARGS+= --enable-mathml
CONFIGURE_ARGS+= --enable-pango
@@ -236,8 +236,8 @@ BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
.include "../../textproc/hunspell/buildlink3.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../multimedia/gstreamer1/buildlink3.mk"
-.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+#.include "../../multimedia/gstreamer1/buildlink3.mk"
+#.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
.include "../../x11/pixman/buildlink3.mk"
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 61d73214d69..528e07c6895 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
+$NetBSD: patch-aa,v 1.45 2016/04/27 16:22:40 ryoon Exp $
* The profiler does not support Darwin/PPC so don't try to enable it
on that platform. Also it makes extra files appear in the PLIST on Linux
@@ -14,9 +14,9 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
heavy patching. Ideally they should be fixed individually but that
will be an extremely hard work, so don't define XP_MACOSX for now.
---- configure.in.orig 2016-03-03 21:47:52.000000000 +0000
+--- configure.in.orig 2016-04-15 16:57:45.000000000 +0000
+++ configure.in
-@@ -1746,7 +1746,7 @@ fi
+@@ -1722,7 +1722,7 @@ fi
dnl ========================================================
dnl SPS Profiler
dnl ========================================================
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
case "${OS_TARGET}" in
Android)
-@@ -1996,7 +1996,6 @@ case "$target" in
+@@ -2004,7 +2004,6 @@ case "$target" in
_PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
direct_nspr_config=1
else
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
AC_DEFINE(XP_DARWIN)
_PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
# The ExceptionHandling framework is needed for Objective-C exception
-@@ -2580,8 +2579,7 @@ MOZ_CXX11
+@@ -2646,8 +2645,7 @@ MOZ_CXX11
AC_LANG_C
@@ -43,8 +43,8 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
dnl ===============================================================
if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3476,6 +3474,14 @@ if test -n "$YASM"; then
- _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
+@@ -3544,6 +3542,14 @@ if test -n "$YASM"; then
+ AC_MSG_RESULT([$_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION.$_YASM_RELEASE ($YASM_VERSION)])
fi
+if test -n "${LIBXUL_SDK_DIR}"; then
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -3503,11 +3509,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3571,11 +3577,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
MOZ_NATIVE_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -4260,6 +4262,10 @@ cairo-gonk)
+@@ -4321,6 +4323,10 @@ cairo-gonk)
esac
@@ -82,8 +82,8 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
AC_SUBST(MOZ_PDF_PRINTING)
if test "$MOZ_PDF_PRINTING"; then
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5018,6 +5024,9 @@ if test -n "$MOZ_WEBRTC"; then
- MOZ_VPX=1
+@@ -5064,6 +5070,9 @@ if test -n "$MOZ_WEBRTC"; then
+ MOZ_RAW=1
MOZ_VPX_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
@@ -92,7 +92,7 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5161,6 +5170,142 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5207,6 +5216,155 @@ if test "${ac_cv_c_attribute_aligned}" !
fi
dnl ========================================================
@@ -232,10 +232,23 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
+
+dnl ========================================================
- dnl = Disable VP8 decoder support
++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 ========================================================
- MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5563,6 +5708,67 @@ fi
+ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa" || test "$MOZ_WIDGET_TOOLKIT" = "uikit"; then
+@@ -5579,6 +5737,67 @@ fi
AC_SUBST(MOZ_WEBM_ENCODER)
dnl ==================================
@@ -303,7 +316,7 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
dnl = Check alsa availability on Linux
dnl ==================================
-@@ -5576,12 +5782,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+@@ -5592,12 +5811,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
MOZ_ALSA=1,
MOZ_ALSA=)
@@ -327,7 +340,7 @@ $NetBSD: patch-aa,v 1.44 2016/03/09 07:12:25 tnn Exp $
AC_SUBST(MOZ_ALSA)
dnl ========================================================
-@@ -8139,6 +8356,49 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8101,6 +8331,49 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build
index 23258053390..f7947593d54 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.10 2015/09/23 06:44:42 ryoon Exp $
+$NetBSD: patch-config_external_moz.build,v 1.11 2016/04/27 16:22:40 ryoon Exp $
---- config/external/moz.build.orig 2015-08-24 21:53:10.000000000 +0000
+--- config/external/moz.build.orig 2016-04-15 16:57:45.000000000 +0000
+++ config/external/moz.build
-@@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']:
+@@ -20,10 +20,19 @@ if CONFIG['MOZ_UPDATER']:
# There's no "native brotli" yet, but probably in the future...
external_dirs += ['modules/brotli']
@@ -23,11 +23,11 @@ $NetBSD: patch-config_external_moz.build,v 1.10 2015/09/23 06:44:42 ryoon Exp $
+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
external_dirs += ['media/libtremor']
- if CONFIG['MOZ_WEBM']:
-@@ -49,9 +58,6 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
- external_dirs += [
+ if CONFIG['MOZ_WEBM_ENCODER']:
+@@ -51,9 +60,6 @@ external_dirs += [
'media/kiss_fft',
'media/libcubeb',
+ 'media/libnestegg',
- 'media/libogg',
- 'media/libopus',
- 'media/libtheora',
diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers
index 592aa9b03c5..b43b31abd37 100644
--- a/www/firefox/patches/patch-config_system-headers
+++ b/www/firefox/patches/patch-config_system-headers
@@ -1,16 +1,16 @@
-$NetBSD: patch-config_system-headers,v 1.17 2016/01/27 00:08:26 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.18 2016/04/27 16:22:40 ryoon Exp $
---- config/system-headers.orig 2016-01-15 01:01:40.000000000 +0000
+--- config/system-headers.orig 2016-04-15 16:57:45.000000000 +0000
+++ config/system-headers
-@@ -627,6 +627,7 @@ libgnome/libgnome.h
+@@ -629,6 +629,7 @@ libgnome/libgnome.h
libgnomeui/gnome-icon-lookup.h
libgnomeui/gnome-icon-theme.h
libgnomeui/gnome-ui-init.h
+libv4l2.h
- lib$routines.h
limits
limits.h
-@@ -721,6 +722,7 @@ mapiutil.h
+ link.h
+@@ -722,6 +723,7 @@ mapiutil.h
mapix.h
Math64.h
math.h
@@ -18,7 +18,7 @@ $NetBSD: patch-config_system-headers,v 1.17 2016/01/27 00:08:26 ryoon Exp $
mbstring.h
#ifdef ANDROID
media/AudioEffect.h
-@@ -1313,6 +1315,25 @@ vpx/vp8cx.h
+@@ -1312,6 +1314,25 @@ vpx/vp8cx.h
vpx/vp8dx.h
vpx_mem/vpx_mem.h
#endif
@@ -44,7 +44,7 @@ $NetBSD: patch-config_system-headers,v 1.17 2016/01/27 00:08:26 ryoon Exp $
gst/gst.h
gst/app/gstappsink.h
gst/app/gstappsrc.h
-@@ -1343,3 +1364,43 @@ unicode/utypes.h
+@@ -1342,3 +1363,43 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
diff --git a/www/firefox/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp b/www/firefox/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp
deleted file mode 100644
index f7dfa38accc..00000000000
--- a/www/firefox/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-dom_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2015/02/28 04:30:55 ryoon Exp $
-
---- dom/media/gstreamer/GStreamerAllocator.cpp.orig 2015-02-17 21:40:44.000000000 +0000
-+++ dom/media/gstreamer/GStreamerAllocator.cpp
-@@ -51,7 +51,6 @@ typedef struct
- #pragma GCC diagnostic ignored "-Wunused-function"
- G_DEFINE_TYPE(MozGfxMemoryAllocator, moz_gfx_memory_allocator, GST_TYPE_ALLOCATOR);
- G_DEFINE_TYPE(MozGfxBufferPool, moz_gfx_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL);
--#pragma GCC diagnostic pop
-
- void
- moz_gfx_memory_reset(MozGfxMemory *mem)
diff --git a/www/firefox/patches/patch-dom_media_moz.build b/www/firefox/patches/patch-dom_media_moz.build
index 73c361f69f2..37b6cc7b218 100644
--- a/www/firefox/patches/patch-dom_media_moz.build
+++ b/www/firefox/patches/patch-dom_media_moz.build
@@ -1,10 +1,10 @@
-$NetBSD: patch-dom_media_moz.build,v 1.2 2015/04/05 12:54:11 ryoon Exp $
+$NetBSD: patch-dom_media_moz.build,v 1.3 2016/04/27 16:22:40 ryoon Exp $
---- dom/media/moz.build.orig 2015-03-27 02:20:26.000000000 +0000
+--- dom/media/moz.build.orig 2016-04-15 16:57:42.000000000 +0000
+++ dom/media/moz.build
-@@ -276,6 +276,27 @@ if CONFIG['ANDROID_VERSION'] > '15':
- CFLAGS += CONFIG['GSTREAMER_CFLAGS']
- CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
+@@ -314,6 +314,27 @@ if CONFIG['ANDROID_VERSION'] > '15':
+ if CONFIG['MOZ_GONK_MEDIACODEC']:
+ DEFINES['MOZ_GONK_MEDIACODEC'] = True
+if CONFIG['MOZ_NATIVE_OGG']:
+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']
diff --git a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
index 17dbcce94d2..5f04fafc625 100644
--- a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
+++ b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.3 2015/11/03 15:52:57 ryoon Exp $
+$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.4 2016/04/27 16:22:40 ryoon Exp $
---- gfx/skia/generate_mozbuild.py.orig 2015-10-22 22:30:23.000000000 +0000
+--- gfx/skia/generate_mozbuild.py.orig 2016-04-15 16:57:40.000000000 +0000
+++ gfx/skia/generate_mozbuild.py
-@@ -147,6 +147,12 @@ if CONFIG['GNU_CXX']:
- if CONFIG['CPU_ARCH'] == 'arm':
- SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+@@ -135,6 +135,12 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
+ '-Wno-unused-private-field',
+ ]
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
diff --git a/www/firefox/patches/patch-gfx_skia_moz.build b/www/firefox/patches/patch-gfx_skia_moz.build
index 88dc1518a99..175d9b24170 100644
--- a/www/firefox/patches/patch-gfx_skia_moz.build
+++ b/www/firefox/patches/patch-gfx_skia_moz.build
@@ -1,10 +1,10 @@
-$NetBSD: patch-gfx_skia_moz.build,v 1.10 2015/11/03 15:52:57 ryoon Exp $
+$NetBSD: patch-gfx_skia_moz.build,v 1.11 2016/04/27 16:22:40 ryoon Exp $
---- gfx/skia/moz.build.orig 2015-10-22 22:30:23.000000000 +0000
+--- gfx/skia/moz.build.orig 2016-04-15 16:57:40.000000000 +0000
+++ gfx/skia/moz.build
-@@ -675,6 +675,12 @@ if CONFIG['GNU_CXX']:
- if CONFIG['CPU_ARCH'] == 'arm':
- SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+@@ -752,6 +752,12 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_
+ '-Wno-unused-private-field',
+ ]
+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_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
index 44208c8fffd..0d86da9f17e 100644
--- a/www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
+++ b/www/firefox/patches/patch-gfx_skia_skia_src_core_SkUtilsArm.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.1 2015/11/03 15:52:57 ryoon Exp $
+$NetBSD: patch-gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.2 2016/04/27 16:22:40 ryoon Exp $
---- gfx/skia/skia/src/core/SkUtilsArm.cpp.orig 2015-10-22 22:30:24.000000000 +0000
+--- 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>
@@ -10,10 +10,10 @@ $NetBSD: patch-gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.1 2015/11/03 15:52:57 r
+#include <sys/sysctl.h>
+#endif
+
- // Set USE_ANDROID_NDK_CPU_FEATURES to use the Android NDK's
- // cpu-features helper library to detect NEON at runtime. See
- // http://crbug.com/164154 to see why this is needed in Chromium
-@@ -47,6 +51,11 @@
+ #if defined(SK_BUILD_FOR_ANDROID)
+ # ifdef MOZ_SKIA
+ # include "mozilla/arm.h"
+@@ -24,6 +28,11 @@
# endif
#endif
@@ -25,21 +25,3 @@ $NetBSD: patch-gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.1 2015/11/03 15:52:57 r
// 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) {
-@@ -82,6 +91,17 @@ static bool sk_cpu_arm_check_neon(void)
-
- result = (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-
-+#elif defined(__NetBSD__)
-+
-+ size_t len;
-+ int flag;
-+ len = sizeof(flag);
-+ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0) {
-+ result = flag != 0;
-+ } else {
-+ result = false;
-+ }
-+
- #else // USE_ANDROID_NDK_CPU_FEATURES
-
- // There is no user-accessible CPUID instruction on ARM that we can use.
diff --git a/www/firefox/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp b/www/firefox/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
deleted file mode 100644
index 92bc3310d69..00000000000
--- a/www/firefox/patches/patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp,v 1.1 2015/11/03 15:52:57 ryoon Exp $
-
---- gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp.orig 2015-10-22 22:30:24.000000000 +0000
-+++ gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
-@@ -97,7 +97,11 @@ void SI8_D16_nofilter_DX_arm(const SkBit
- "2: \n\t"
- : [xx] "+r" (xx), [count8] "+r" (count8), [colors] "+r" (colors)
- : [table] "r" (table), [srcAddr] "r" (srcAddr)
-+#if defined(__NetBSD__)
-+ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10"
-+#else
- : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11"
-+#endif
- );
-
- for (i = (count & 7); i > 0; --i) {
-@@ -181,7 +185,11 @@ void SI8_opaque_D32_nofilter_DX_arm(cons
- "4: \n\t" // exit
- : [xx] "+r" (xx), [count] "+r" (count), [colors] "+r" (colors)
- : [table] "r" (table), [srcAddr] "r" (srcAddr)
-+#if defined(__NetBSD__)
-+ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10"
-+#else
- : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11"
-+#endif
- );
- }
-
diff --git a/www/firefox/patches/patch-gfx_skia_skia_src_opts_memset.arm.S b/www/firefox/patches/patch-gfx_skia_skia_src_opts_memset.arm.S
deleted file mode 100644
index bfc28ebb21b..00000000000
--- a/www/firefox/patches/patch-gfx_skia_skia_src_opts_memset.arm.S
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-gfx_skia_skia_src_opts_memset.arm.S,v 1.1 2015/11/03 15:52:57 ryoon Exp $
-
---- gfx/skia/skia/src/opts/memset.arm.S.orig 2015-10-22 22:30:24.000000000 +0000
-+++ gfx/skia/skia/src/opts/memset.arm.S
-@@ -13,6 +13,12 @@
- * to aid future maintenance.
- */
-
-+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
-+#define UNWIND
-+#else
-+#define UNWIND @
-+#endif
-+
- .text
- .align 4
- .syntax unified
-@@ -30,7 +36,8 @@
- *
- */
- arm_memset16:
-- .fnstart
-+ .cfi_startproc
-+ UNWIND .fnstart
- push {lr}
-
- /* if count is equal to zero then abort */
-@@ -51,10 +58,12 @@ arm_memset16:
-
- /* Now jump into the main loop below. */
- b .Lwork_32
-- .fnend
-+ UNWIND .fnend
-+ .cfi_endproc
-
- arm_memset32:
-- .fnstart
-+ .cfi_startproc
-+ UNWIND .fnstart
- push {lr}
-
- /* if count is equal to zero then abort */
-@@ -108,4 +117,5 @@ arm_memset32:
-
- .Lfinish:
- pop {pc}
-- .fnend
-+ UNWIND .fnend
-+ .cfi_endproc
diff --git a/www/firefox/patches/patch-gfx_thebes_moz.build b/www/firefox/patches/patch-gfx_thebes_moz.build
index ab5f7116bc3..474796871f3 100644
--- a/www/firefox/patches/patch-gfx_thebes_moz.build
+++ b/www/firefox/patches/patch-gfx_thebes_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-gfx_thebes_moz.build,v 1.2 2016/01/28 06:48:50 ryoon Exp $
+$NetBSD: patch-gfx_thebes_moz.build,v 1.3 2016/04/27 16:22:40 ryoon Exp $
---- gfx/thebes/moz.build.orig 2016-01-23 23:23:35.000000000 +0000
+--- gfx/thebes/moz.build.orig 2016-04-15 16:57:42.000000000 +0000
+++ gfx/thebes/moz.build
-@@ -291,6 +291,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
+@@ -293,6 +293,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
CFLAGS += CONFIG['TK_CFLAGS']
@@ -15,11 +15,12 @@ $NetBSD: patch-gfx_thebes_moz.build,v 1.2 2016/01/28 06:48:50 ryoon Exp $
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-@@ -304,7 +310,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
+@@ -306,8 +312,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
-DEFINES['GRAPHITE2_STATIC'] = True
-
- if CONFIG['OS_ARCH'] == 'WINNT':
- del DEFINES['UNICODE']
+ if CONFIG['CLANG_CXX']:
+ # Suppress warnings from Skia header files.
+ SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
index fd442b4cb69..6bb1d8f2eba 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.2 2016/03/08 21:32:52 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.3 2016/04/27 16:22:40 ryoon Exp $
---- media/libcubeb/src/cubeb.c.orig 2016-02-25 23:01:58.000000000 +0000
+--- media/libcubeb/src/cubeb.c.orig 2016-04-15 16:57:46.000000000 +0000
+++ media/libcubeb/src/cubeb.c
@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, ch
#if defined(USE_KAI)
@@ -10,9 +10,9 @@ $NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.2 2016/03/08 21:32:52 ryoon Exp $
+int oss_init(cubeb ** context, char const * context_name);
+#endif
+
int
- validate_stream_params(cubeb_stream_params stream_params)
-@@ -129,6 +132,9 @@ cubeb_init(cubeb ** context, char const
+@@ -152,6 +155,9 @@ cubeb_init(cubeb ** context, char const
#if defined(USE_KAI)
kai_init,
#endif
diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
index 0fe9a7ae489..902eb7208dc 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.14 2016/04/27 16:22:40 ryoon Exp $
---- media/libcubeb/src/cubeb_alsa.c.orig 2016-02-25 23:01:58.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig 2016-04-15 16:57:46.000000000 +0000
+++ media/libcubeb/src/cubeb_alsa.c
@@ -7,12 +7,18 @@
#undef NDEBUG
@@ -82,7 +82,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
};
enum stream_state {
-@@ -258,32 +311,35 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -257,32 +310,35 @@ alsa_refill_stream(cubeb_stream * stm)
long got;
void * p;
int draining;
@@ -137,7 +137,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
/* This should never happen. */
if ((unsigned int) avail > stm->buffer_size) {
-@@ -294,8 +350,8 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -293,8 +349,8 @@ alsa_refill_stream(cubeb_stream * stm)
available to write. If avail is still zero here, the stream must be in
a funky state, so recover and try again. */
if (avail == 0) {
@@ -148,7 +148,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (avail <= 0) {
pthread_mutex_unlock(&stm->mutex);
stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-@@ -303,7 +359,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -302,7 +358,7 @@ alsa_refill_stream(cubeb_stream * stm)
}
}
@@ -157,7 +157,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
assert(p);
pthread_mutex_unlock(&stm->mutex);
-@@ -312,10 +368,11 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -311,10 +367,11 @@ alsa_refill_stream(cubeb_stream * stm)
if (got < 0) {
pthread_mutex_unlock(&stm->mutex);
stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
@@ -170,7 +170,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
float * b = (float *) p;
-@@ -328,14 +385,66 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -327,14 +384,66 @@ alsa_refill_stream(cubeb_stream * stm)
b[i] *= stm->volume;
}
}
@@ -245,7 +245,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
}
if (got != avail) {
long buffer_fill = stm->buffer_size - (avail - got);
-@@ -343,7 +452,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -342,7 +451,7 @@ alsa_refill_stream(cubeb_stream * stm)
/* Fill the remaining buffer with silence to guarantee one full period
has been written. */
@@ -254,7 +254,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
set_timeout(&stm->drain_timeout, buffer_time * 1000);
-@@ -454,26 +563,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -453,26 +562,26 @@ get_slave_pcm_node(snd_config_t * lconf,
slave_def = NULL;
@@ -286,7 +286,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (r < 0) {
break;
}
-@@ -482,7 +591,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -481,7 +590,7 @@ get_slave_pcm_node(snd_config_t * lconf,
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
@@ -295,7 +295,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (r < 0) {
break;
}
-@@ -491,7 +600,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -490,7 +599,7 @@ get_slave_pcm_node(snd_config_t * lconf,
} while (0);
if (slave_def) {
@@ -304,7 +304,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
}
return NULL;
-@@ -514,22 +623,22 @@ init_local_config_with_workaround(char c
+@@ -513,22 +622,22 @@ init_local_config_with_workaround(char c
lconf = NULL;
@@ -331,7 +331,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (r < 0) {
break;
}
-@@ -538,7 +647,7 @@ init_local_config_with_workaround(char c
+@@ -537,7 +646,7 @@ init_local_config_with_workaround(char c
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
@@ -340,7 +340,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (r < 0) {
break;
}
-@@ -549,12 +658,12 @@ init_local_config_with_workaround(char c
+@@ -548,12 +657,12 @@ init_local_config_with_workaround(char c
}
/* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -355,7 +355,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (r < 0) {
break;
}
-@@ -565,18 +674,18 @@ init_local_config_with_workaround(char c
+@@ -564,18 +673,18 @@ init_local_config_with_workaround(char c
/* Don't clobber an explicit existing handle_underrun value, set it only
if it doesn't already exist. */
@@ -377,7 +377,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (r < 0) {
break;
}
-@@ -584,7 +693,7 @@ init_local_config_with_workaround(char c
+@@ -583,7 +692,7 @@ init_local_config_with_workaround(char c
return lconf;
} while (0);
@@ -386,7 +386,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
return NULL;
}
-@@ -596,9 +705,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
+@@ -595,9 +704,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
pthread_mutex_lock(&cubeb_alsa_mutex);
if (local_config) {
@@ -398,7 +398,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -611,7 +720,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -610,7 +719,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
int r;
pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -407,7 +407,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
return r;
-@@ -668,12 +777,65 @@ alsa_init(cubeb ** context, char const *
+@@ -667,12 +776,65 @@ alsa_init(cubeb ** context, char const *
pthread_attr_t attr;
snd_pcm_t * dummy;
@@ -474,7 +474,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
cubeb_alsa_error_handler_set = 1;
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -681,6 +843,8 @@ alsa_init(cubeb ** context, char const *
+@@ -680,6 +842,8 @@ alsa_init(cubeb ** context, char const *
ctx = calloc(1, sizeof(*ctx));
assert(ctx);
@@ -483,7 +483,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
ctx->ops = &alsa_ops;
r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -730,7 +894,7 @@ alsa_init(cubeb ** context, char const *
+@@ -729,7 +893,7 @@ alsa_init(cubeb ** context, char const *
config fails with EINVAL, the PA PCM is too old for this workaround. */
if (r == -EINVAL) {
pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -492,7 +492,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
ctx->local_config = NULL;
} else if (r >= 0) {
-@@ -769,9 +933,13 @@ alsa_destroy(cubeb * ctx)
+@@ -768,9 +932,13 @@ alsa_destroy(cubeb * ctx)
pthread_mutex_destroy(&ctx->mutex);
free(ctx->fds);
@@ -507,7 +507,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
pthread_mutex_unlock(&cubeb_alsa_mutex);
}
-@@ -839,7 +1007,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -849,7 +1017,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
return CUBEB_ERROR;
}
@@ -516,7 +516,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
assert(r == 0);
/* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-@@ -849,23 +1017,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -859,23 +1027,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
latency = latency < 500 ? 500 : latency;
}
@@ -531,7 +531,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
return CUBEB_ERROR_INVALID_FORMAT;
}
-- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &stm->period_size);
+- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &stm->period_size);
assert(r == 0);
@@ -546,7 +546,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
assert((nfds_t) r == stm->nfds);
r = pthread_cond_init(&stm->cond, NULL);
-@@ -896,7 +1064,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -906,7 +1074,7 @@ alsa_stream_destroy(cubeb_stream * stm)
pthread_mutex_lock(&stm->mutex);
if (stm->pcm) {
if (stm->state == DRAINING) {
@@ -555,7 +555,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
}
alsa_locked_pcm_close(stm->pcm);
stm->pcm = NULL;
-@@ -906,7 +1074,10 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -916,7 +1084,10 @@ alsa_stream_destroy(cubeb_stream * stm)
pthread_mutex_destroy(&stm->mutex);
r = pthread_cond_destroy(&stm->cond);
@@ -567,7 +567,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
alsa_unregister_stream(stm);
-@@ -938,12 +1109,12 @@ alsa_get_max_channel_count(cubeb * ctx,
+@@ -948,12 +1119,12 @@ alsa_get_max_channel_count(cubeb * ctx,
return CUBEB_ERROR;
}
@@ -582,7 +582,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
if (r < 0) {
return CUBEB_ERROR;
}
-@@ -963,34 +1134,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -973,34 +1144,34 @@ alsa_get_preferred_sample_rate(cubeb * c
/* get a pcm, disabling resampling, so we get a rate the
* hardware/dmix/pulse/etc. supports. */
@@ -625,7 +625,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
return CUBEB_OK;
}
-@@ -1014,7 +1185,7 @@ alsa_stream_start(cubeb_stream * stm)
+@@ -1024,7 +1195,7 @@ alsa_stream_start(cubeb_stream * stm)
ctx = stm->context;
pthread_mutex_lock(&stm->mutex);
@@ -634,7 +634,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
gettimeofday(&stm->last_activity, NULL);
pthread_mutex_unlock(&stm->mutex);
-@@ -1048,7 +1219,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1058,7 +1229,7 @@ alsa_stream_stop(cubeb_stream * stm)
pthread_mutex_unlock(&ctx->mutex);
pthread_mutex_lock(&stm->mutex);
@@ -643,7 +643,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
pthread_mutex_unlock(&stm->mutex);
return CUBEB_OK;
-@@ -1064,14 +1235,17 @@ alsa_stream_get_position(cubeb_stream *
+@@ -1074,14 +1245,17 @@ alsa_stream_get_position(cubeb_stream *
pthread_mutex_lock(&stm->mutex);
delay = -1;
@@ -664,7 +664,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.13 2016/03/08 21:32:52 ryoon
*position = 0;
if (stm->write_position >= (snd_pcm_uframes_t) delay) {
-@@ -1090,7 +1264,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1100,7 +1274,7 @@ alsa_stream_get_latency(cubeb_stream * s
snd_pcm_sframes_t delay;
/* This function returns the delay in frames until a frame written using
snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
diff --git a/www/firefox/patches/patch-media_libcubeb_src_moz.build b/www/firefox/patches/patch-media_libcubeb_src_moz.build
index f6909035dd1..2c2d72e2f1a 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_moz.build
+++ b/www/firefox/patches/patch-media_libcubeb_src_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.6 2016/03/08 21:32:52 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.7 2016/04/27 16:22:40 ryoon Exp $
Don't assume cocoa toolkit just because OS_TARGET is Darwin.
---- media/libcubeb/src/moz.build.orig 2016-02-25 23:01:58.000000000 +0000
+--- media/libcubeb/src/moz.build.orig 2016-04-15 16:57:46.000000000 +0000
+++ media/libcubeb/src/moz.build
@@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']:
]
@@ -36,10 +36,11 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin.
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
if CONFIG['ANDROID_VERSION'] >= '17':
LOCAL_INCLUDES += [
-@@ -74,5 +83,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
+@@ -74,6 +83,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
'%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'],
]
+CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+
diff --git a/www/firefox/patches/patch-media_libtheora_moz.build b/www/firefox/patches/patch-media_libtheora_moz.build
index 8050eae122b..d23e7e38e88 100644
--- a/www/firefox/patches/patch-media_libtheora_moz.build
+++ b/www/firefox/patches/patch-media_libtheora_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_libtheora_moz.build,v 1.4 2015/09/23 06:44:42 ryoon Exp $
+$NetBSD: patch-media_libtheora_moz.build,v 1.5 2016/04/27 16:22:40 ryoon Exp $
---- media/libtheora/moz.build.orig 2015-08-24 21:53:11.000000000 +0000
+--- media/libtheora/moz.build.orig 2016-04-15 16:57:47.000000000 +0000
+++ media/libtheora/moz.build
-@@ -21,6 +21,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias'
# The encoder is currently not included.
DEFINES['THEORA_DISABLE_ENCODE'] = True
@@ -10,5 +10,5 @@ $NetBSD: patch-media_libtheora_moz.build,v 1.4 2015/09/23 06:44:42 ryoon Exp $
+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
+
# Suppress warnings in third-party code.
- if CONFIG['GNU_CC']:
+ if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
CFLAGS += ['-Wno-type-limits']
diff --git a/www/firefox/patches/patch-pb b/www/firefox/patches/patch-pb
deleted file mode 100644
index c0b84729ca4..00000000000
--- a/www/firefox/patches/patch-pb
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-pb,v 1.4 2014/02/20 13:19:03 ryoon Exp $
-
---- xulrunner/installer/libxul.pc.in.orig 2013-07-30 00:59:18.000000000 +0000
-+++ xulrunner/installer/libxul.pc.in
-@@ -7,5 +7,5 @@ Name: libxul
- Description: The Mozilla Runtime and Embedding Engine
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%
-+Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_XUL_LINK%
- Cflags: -I${includedir} %WCHAR_CFLAGS%
diff --git a/www/firefox/patches/patch-pc b/www/firefox/patches/patch-pc
deleted file mode 100644
index f9792b30510..00000000000
--- a/www/firefox/patches/patch-pc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-pc,v 1.4 2014/02/20 13:19:03 ryoon Exp $
-
---- xulrunner/installer/libxul-embedding.pc.in.orig 2013-07-30 00:59:18.000000000 +0000
-+++ xulrunner/installer/libxul-embedding.pc.in
-@@ -6,5 +6,6 @@ idldir=%idldir%
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue -ldl
-+# XXXtnn -ldl removed
-+Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build
index 2f16b0898bc..f596aebf44c 100644
--- a/www/firefox/patches/patch-toolkit_library_moz.build
+++ b/www/firefox/patches/patch-toolkit_library_moz.build
@@ -1,4 +1,4 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.4 2015/05/12 22:48:54 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.5 2016/04/27 16:22:40 ryoon Exp $
MOZ_GSTREAMER:
GSTREAMER_LIBS are linked to libxul on Darwin, while they are
@@ -6,9 +6,9 @@ MOZ_GSTREAMER:
toolkit being cocoa isn't relevant at all. It's Darwin that needs
the special handling, not Cocoa.
---- toolkit/library/moz.build.orig 2015-05-04 00:43:33.000000000 +0000
+--- toolkit/library/moz.build.orig 2016-04-15 16:57:47.000000000 +0000
+++ toolkit/library/moz.build
-@@ -214,6 +214,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
+@@ -211,6 +211,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
]
OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
@@ -16,7 +16,7 @@ MOZ_GSTREAMER:
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
if CONFIG['MOZ_NATIVE_JPEG']:
-@@ -225,6 +226,30 @@ if CONFIG['MOZ_NATIVE_PNG']:
+@@ -222,6 +223,30 @@ if CONFIG['MOZ_NATIVE_PNG']:
if CONFIG['MOZ_NATIVE_HUNSPELL']:
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
@@ -47,12 +47,10 @@ MOZ_GSTREAMER:
if CONFIG['MOZ_NATIVE_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
-@@ -234,8 +259,14 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
- if not CONFIG['MOZ_TREE_PIXMAN']:
- OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
+@@ -234,6 +259,15 @@ if not CONFIG['MOZ_TREE_PIXMAN']:
+ if CONFIG['MOZ_ALSA']:
+ OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
--if CONFIG['MOZ_ALSA']:
-- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
+
@@ -61,15 +59,7 @@ MOZ_GSTREAMER:
+
+if CONFIG['MOZ_OSS']:
+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
-
++
if CONFIG['HAVE_CLOCK_MONOTONIC']:
OS_LIBS += CONFIG['REALTIME_LIBS']
-@@ -365,7 +396,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
- if CONFIG['MOZ_ENABLE_QT']:
- OS_LIBS += CONFIG['XEXT_LIBS']
-
--if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['MOZ_GSTREAMER']:
-+if CONFIG['OS_ARCH'] == 'Darwin' and CONFIG['MOZ_GSTREAMER']:
- OS_LIBS += CONFIG['GSTREAMER_LIBS']
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
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
index 44521c50ee3..a251f47dea3 100644
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
+++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.4 2015/09/23 06:44:42 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.5 2016/04/27 16:22:40 ryoon Exp $
---- xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-08-24 21:53:22.000000000 +0000
+--- xpcom/reflect/xptcall/md/unix/moz.build.orig 2016-04-15 16:57:50.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/moz.build
@@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
'xptcinvoke_darwin.cpp',
@@ -11,12 +11,3 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.4 2015/09/23 06:44:42
SOURCES += [
'!xptcstubs_asm_ppc_darwin.s',
'xptcinvoke_asm_ppc_rhapsody.s',
-@@ -24,7 +24,7 @@ if CONFIG['OS_ARCH'] == 'GNU':
- 'xptcstubs_gcc_x86_unix.cpp'
- ]
-
--if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD') or \
-+if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'DragonFly') or \
- CONFIG['OS_ARCH'].startswith('GNU_'):
- if CONFIG['OS_TEST'] == 'x86_64':
- SOURCES += [