summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2014-10-05 01:59:08 +0000
committerryoon <ryoon@pkgsrc.org>2014-10-05 01:59:08 +0000
commitfa2193397ecd46516dad360e7ae0a3d820659237 (patch)
tree5dde41b1bbe2ef7c621f3446dd460ab3ccd66955 /www/firefox
parent4a268c81c4b6279498175324a28c4e51d5aee563 (diff)
downloadpkgsrc-fa2193397ecd46516dad360e7ae0a3d820659237.tar.gz
Update to 32.0.3
Changelog: Fixed 32.0.3: New security fixes can be found here New New HTTP cache provides improved performance including crash recovery New Integration of generational garbage collection New Public key pinning support enabled New View historical use information for logins stored in password manager New Display the number of found items in the find toolbar New Easier back, forward, reload, and bookmarking through the context menu New Lower Sorbian [dsb] locale added Changed Removed and turned off trust bit for some 1024-bit root certificates Changed Performance improvements to Password Manager and Add-on Manager HTML5 drawFocusIfNeeded enabled by default HTML5 ECMAScript 6 built-in method Array#copyWithin implemented HTML5 CSS position:sticky enabled by default HTML5 mix-blend-mode enabled by default HTML5 New Array built-in: Array.from() HTML5 navigator.languages property and languagechange event implemented HTML5 Vibration API updated to latest W3C spec HTML5 CSS box-decoration-break replaces -moz-background-inline-policy HTML5 box-decoration-break enabled by default Developer HiDPI support in Developer Tools UI Developer Inspector button moved to the top left Developer Hidden nodes displayed differently in the markup-view Developer New Web Audio Editor Developer Code completion and inline documentation added to Scratchpad Fixed 32.0.2 - Corrupt installations cause Firefox to crash on update Fixed 32.0.1 - Stability issues for computers with multiple graphics cards Fixed 32.0.1 - Mixed content icon may be incorrectly displayed instead of lock icon for SSL sites Fixed 32.0.1 - WebRTC: setRemoteDescription() silently fails if no success callback is specified Fixed Various security fixes Fixed Mac OS X: cmd-L does not open a new window when no window is available Fixed Text Rendering Issues on Windows 7 with Platform Update KB2670838 (MSIE 10 Prerequisite) or on Windows 8.1 Security fixes: Fixed in Firefox 32.0.3 MFSA 2014-73 RSA Signature Forgery in NSS Fixed in Firefox 32 MFSA 2014-72 Use-after-free setting text directionality MFSA 2014-71 Profile directory file access through file: protocol MFSA 2014-70 Out-of-bounds read in Web Audio audio timeline MFSA 2014-69 Uninitialized memory use during GIF rendering MFSA 2014-68 Use-after-free during DOM interactions with SVG MFSA 2014-67 Miscellaneous memory safety hazards (rv:32.0 / rv:31.1 / rv:24.8)
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/PLIST182
-rw-r--r--www/firefox/distinfo38
-rw-r--r--www/firefox/mozilla-common.mk4
-rw-r--r--www/firefox/patches/patch-aa183
-rw-r--r--www/firefox/patches/patch-ak8
-rw-r--r--www/firefox/patches/patch-as133
-rw-r--r--www/firefox/patches/patch-build_clang-plugin_configure13
-rw-r--r--www/firefox/patches/patch-config_external_moz.build7
-rw-r--r--www/firefox/patches/patch-content_media_AudioStream.cpp12
-rw-r--r--www/firefox/patches/patch-content_media_AudioStream.h16
-rw-r--r--www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc15
-rw-r--r--www/firefox/patches/patch-js_src_gc_Memory.cpp12
-rw-r--r--www/firefox/patches/patch-js_src_vm_WeakMapPtr.cpp18
-rw-r--r--www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi18
-rw-r--r--www/firefox/patches/patch-memory_jemalloc_src_configure31
-rw-r--r--www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm8
-rw-r--r--www/firefox/patches/patch-webapprt_moz.build15
-rw-r--r--www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp88
-rw-r--r--www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp34
-rw-r--r--www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp64
-rw-r--r--www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h14
22 files changed, 355 insertions, 562 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index c407f59bcca..fd4000a0ce5 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.174 2014/07/26 00:16:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.175 2014/10/05 01:59:08 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 31.0
+MOZ_BRANCH= 32.0.3
MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index d4d49a314b5..f156d5c7d47 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.83 2014/07/24 14:57:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.84 2014/10/05 01:59:08 ryoon Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -67,6 +67,9 @@ lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2.png
lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2@2x.png
lib/firefox/browser/chrome/browser/content/browser/abouthome/sync.png
lib/firefox/browser/chrome/browser/content/browser/abouthome/sync@2x.png
+lib/firefox/browser/chrome/browser/content/browser/aboutneterror/info.svg
+lib/firefox/browser/chrome/browser/content/browser/aboutneterror/netError.css
+lib/firefox/browser/chrome/browser/content/browser/aboutneterror/netError.xhtml
lib/firefox/browser/chrome/browser/content/browser/baseMenuOverlay.xul
lib/firefox/browser/chrome/browser/content/browser/blockedSite.xhtml
lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.js
@@ -122,7 +125,9 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/matchbrac
lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/mozilla.css
lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/search.js
lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/searchcursor.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/show-hint.js
lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/sublime.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/tern.js
lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/trailingspace.js
lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/vim.js
lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/xml-fold.js
@@ -157,6 +162,7 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/framework/toolbox-pr
lib/firefox/browser/chrome/browser/content/browser/devtools/framework/toolbox-process-window.xul
lib/firefox/browser/chrome/browser/content/browser/devtools/framework/toolbox-window.xul
lib/firefox/browser/chrome/browser/content/browser/devtools/framework/toolbox.xul
+lib/firefox/browser/chrome/browser/content/browser/devtools/graphs-frame.xhtml
lib/firefox/browser/chrome/browser/content/browser/devtools/inspector/inspector.css
lib/firefox/browser/chrome/browser/content/browser/devtools/inspector/inspector.xul
lib/firefox/browser/chrome/browser/content/browser/devtools/layoutview/view.css
@@ -183,6 +189,11 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/j
lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/strings.js
lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/tree.js
lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/ui.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-loader.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-loader.xul
+lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-test.html
+lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor.xul
+lib/firefox/browser/chrome/browser/content/browser/devtools/readdir.js
lib/firefox/browser/chrome/browser/content/browser/devtools/responsivedesign/resize-commands.js
lib/firefox/browser/chrome/browser/content/browser/devtools/ruleview.css
lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad-commands.js
@@ -219,18 +230,15 @@ lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.css
lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.js
lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xhtml
lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xml
-lib/firefox/browser/chrome/browser/content/browser/fonts/ClearSans-Regular.woff
-lib/firefox/browser/chrome/browser/content/browser/fonts/FiraSans-Light.woff
-lib/firefox/browser/chrome/browser/content/browser/fonts/FiraSans-Regular.woff
lib/firefox/browser/chrome/browser/content/browser/hiddenWindow.xul
lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul
lib/firefox/browser/chrome/browser/content/browser/license.html
+lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png
lib/firefox/browser/chrome/browser/content/browser/migration/migration.js
lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul
lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.css
lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.js
lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.xul
-lib/firefox/browser/chrome/browser/content/browser/newtab/preloaderContent.js
lib/firefox/browser/chrome/browser/content/browser/nsContextMenu.js
lib/firefox/browser/chrome/browser/content/browser/pageinfo/feeds.js
lib/firefox/browser/chrome/browser/content/browser/pageinfo/feeds.xml
@@ -281,21 +289,14 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/fonts.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.css
lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.xml
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/advanced.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/advanced.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/applications.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/applications.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/content.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/content.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/main.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/main.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/privacy.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/privacy.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/security.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/security.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/sync.js
-lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/sync.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/languages.js
lib/firefox/browser/chrome/browser/content/browser/preferences/languages.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/main.js
@@ -315,6 +316,8 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/sync.js
lib/firefox/browser/chrome/browser/content/browser/preferences/sync.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/tabs.js
lib/firefox/browser/chrome/browser/content/browser/preferences/tabs.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/report-phishing-overlay.xul
lib/firefox/browser/chrome/browser/content/browser/safeMode.css
lib/firefox/browser/chrome/browser/content/browser/safeMode.js
@@ -357,6 +360,7 @@ lib/firefox/browser/chrome/browser/content/browser/tabview-content.js
lib/firefox/browser/chrome/browser/content/browser/tabview.css
lib/firefox/browser/chrome/browser/content/browser/tabview.html
lib/firefox/browser/chrome/browser/content/browser/tabview.js
+lib/firefox/browser/chrome/browser/content/browser/translation-infobar.xml
lib/firefox/browser/chrome/browser/content/browser/urlbarBindings.xml
lib/firefox/browser/chrome/browser/content/browser/utilityOverlay.js
lib/firefox/browser/chrome/browser/content/browser/viewSourceOverlay.xul
@@ -387,6 +391,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/actionicon-tab.png
lib/firefox/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme.css
lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css
lib/firefox/browser/chrome/browser/skin/classic/browser/click-to-play-warning-stripes.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/content-contextmenu.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/background-noise-toolbar.png
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration-rtl.png
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration.png
@@ -405,6 +410,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy-bw
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy.png
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/alerticon-warning.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/alerticon-warning@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/add.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/connection-footer.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/default-app-icon.png
@@ -420,7 +426,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/rem
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/rocket.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/warning.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/arrow-e.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/background-noise-toolbar.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/arrow-e@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-divider@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png
@@ -439,44 +445,59 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-respons
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-responsivemode@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-scratchpad.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-scratchpad@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-screenshot.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-screenshot@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-tilt.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-tilt@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/commandline-icon.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/commandline-icon@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/commandline.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/computedview.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/controls.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/controls@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dark-theme.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox-eye.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-collapse.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-collapse@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-expand.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-expand@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-pause.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-pause@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-play.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-play@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-in.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-in@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-out.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-out@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-bottom@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-side@2x.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dropmarker.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dropmarker.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-breakpoint.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-error.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/eyedropper.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-close.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-open.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-globe.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filters.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars-light.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/font-inspector.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/inspector.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-ltr.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-rtl.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-ltr.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-rtl.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemToggle-light.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemToggle.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemToggle@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/layoutview.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/light-theme.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass-light.png
@@ -486,21 +507,30 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glas
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/markup-view.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/netmonitor.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/noise.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch-checked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-background.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/projecteditor/file-icons-sheet@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/projecteditor/projecteditor.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/ruleview.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/scratchpad.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/splitview.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger-paused.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-inspector.svg
@@ -509,6 +539,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-options.sv
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-profiler.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-scratchpad.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-styleeditor.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-webaudio.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-webconsole.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png
@@ -522,12 +553,17 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tracer-icon.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tracer-icon@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/undock@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-delete.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-delete@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-edit.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-edit@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-lock.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-lock@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-open-inspector.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-open-inspector@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webaudioeditor.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole_networkpanel.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/widgets.css
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/allDownloadsViewOverlay.css
@@ -555,6 +591,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https-mix
lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https-mixed-display.png
lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https.png
lib/firefox/browser/chrome/browser/skin/classic/browser/identity.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/in-content/common.css
lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize.png
lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-exit.png
lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help.png
@@ -608,8 +645,11 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/d
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown-disabled@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/header.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/header@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/help-glyph.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/help-glyph@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
@@ -652,20 +692,22 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-mi
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-middle.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-start.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-overflow-border.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-overflow-indicator.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-end.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-start.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-separator.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-end.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/edit-light.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/search.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/stack-expander.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/tabview.css
lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/tabview.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-arrow.png
lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-64.png
@@ -714,6 +756,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/devtools/netmonitor.dtd
lib/firefox/browser/chrome/en-US/locale/browser/devtools/netmonitor.properties
lib/firefox/browser/chrome/en-US/locale/browser/devtools/profiler.dtd
lib/firefox/browser/chrome/en-US/locale/browser/devtools/profiler.properties
+lib/firefox/browser/chrome/en-US/locale/browser/devtools/projecteditor.properties
lib/firefox/browser/chrome/en-US/locale/browser/devtools/responsiveUI.properties
lib/firefox/browser/chrome/en-US/locale/browser/devtools/scratchpad.dtd
lib/firefox/browser/chrome/en-US/locale/browser/devtools/scratchpad.properties
@@ -771,6 +814,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/preferences/security.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/selectBookmark.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/sync.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/tabs.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences/translation.dtd
lib/firefox/browser/chrome/en-US/locale/browser/quitDialog.properties
lib/firefox/browser/chrome/en-US/locale/browser/safeMode.dtd
lib/firefox/browser/chrome/en-US/locale/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -795,6 +839,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/tabbrowser.properties
lib/firefox/browser/chrome/en-US/locale/browser/tabview.properties
lib/firefox/browser/chrome/en-US/locale/browser/taskbar.properties
lib/firefox/browser/chrome/en-US/locale/browser/translation.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/translation.properties
lib/firefox/browser/chrome/en-US/locale/pdfviewer/chrome.properties
lib/firefox/browser/chrome/en-US/locale/pdfviewer/viewer.properties
lib/firefox/browser/chrome/icons/default/default16.png
@@ -1097,6 +1142,7 @@ lib/firefox/browser/icons/mozicon128.png
lib/firefox/browser/modules/AboutHome.jsm
lib/firefox/browser/modules/BrowserNewTabPreloader.jsm
lib/firefox/browser/modules/BrowserUITelemetry.jsm
+lib/firefox/browser/modules/Chat.jsm
lib/firefox/browser/modules/ContentClick.jsm
lib/firefox/browser/modules/ContentLinkHandler.jsm
lib/firefox/browser/modules/ContentSearch.jsm
@@ -1129,6 +1175,7 @@ lib/firefox/browser/modules/devtools/Curl.jsm
lib/firefox/browser/modules/devtools/DOMHelpers.jsm
lib/firefox/browser/modules/devtools/DeveloperToolbar.jsm
lib/firefox/browser/modules/devtools/FloatingScrollbars.jsm
+lib/firefox/browser/modules/devtools/Graphs.jsm
lib/firefox/browser/modules/devtools/Jsbeautify.jsm
lib/firefox/browser/modules/devtools/Parser.jsm
lib/firefox/browser/modules/devtools/SideMenuWidget.jsm
@@ -1176,6 +1223,30 @@ lib/firefox/browser/modules/devtools/profiler/consts.js
lib/firefox/browser/modules/devtools/profiler/controller.js
lib/firefox/browser/modules/devtools/profiler/panel.js
lib/firefox/browser/modules/devtools/profiler/sidebar.js
+lib/firefox/browser/modules/devtools/projecteditor/editors.js
+lib/firefox/browser/modules/devtools/projecteditor/helpers/event.js
+lib/firefox/browser/modules/devtools/projecteditor/helpers/file-picker.js
+lib/firefox/browser/modules/devtools/projecteditor/helpers/l10n.js
+lib/firefox/browser/modules/devtools/projecteditor/helpers/promise.js
+lib/firefox/browser/modules/devtools/projecteditor/helpers/readdir.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/app-manager/app-project-editor.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/app-manager/plugin.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/core.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/delete/delete.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/dirty/dirty.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/image-view/image-editor.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/image-view/plugin.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/logging/logging.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/new/new.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/save/save.js
+lib/firefox/browser/modules/devtools/projecteditor/plugins/status-bar/plugin.js
+lib/firefox/browser/modules/devtools/projecteditor/project.js
+lib/firefox/browser/modules/devtools/projecteditor/projecteditor.js
+lib/firefox/browser/modules/devtools/projecteditor/shells.js
+lib/firefox/browser/modules/devtools/projecteditor/stores/base.js
+lib/firefox/browser/modules/devtools/projecteditor/stores/local.js
+lib/firefox/browser/modules/devtools/projecteditor/stores/resource.js
+lib/firefox/browser/modules/devtools/projecteditor/tree.js
lib/firefox/browser/modules/devtools/resize-commands.js
lib/firefox/browser/modules/devtools/responsivedesign.jsm
lib/firefox/browser/modules/devtools/scratchpad-manager.jsm
@@ -1191,7 +1262,9 @@ lib/firefox/browser/modules/devtools/shared/undo.js
lib/firefox/browser/modules/devtools/shared/widgets/CSSTransformPreviewer.js
lib/firefox/browser/modules/devtools/shared/widgets/FastListWidget.js
lib/firefox/browser/modules/devtools/shared/widgets/Spectrum.js
+lib/firefox/browser/modules/devtools/shared/widgets/TableWidget.js
lib/firefox/browser/modules/devtools/shared/widgets/Tooltip.js
+lib/firefox/browser/modules/devtools/shared/widgets/TreeWidget.js
lib/firefox/browser/modules/devtools/sourceeditor/autocomplete.js
lib/firefox/browser/modules/devtools/sourceeditor/css-autocompleter.js
lib/firefox/browser/modules/devtools/sourceeditor/css-tokenizer.js
@@ -1244,6 +1317,13 @@ lib/firefox/browser/modules/sessionstore/TabState.jsm
lib/firefox/browser/modules/sessionstore/TabStateCache.jsm
lib/firefox/browser/modules/sessionstore/Utils.jsm
lib/firefox/browser/modules/tabview/utils.jsm
+lib/firefox/browser/modules/translation/BingTranslator.jsm
+lib/firefox/browser/modules/translation/LanguageDetector.jsm
+lib/firefox/browser/modules/translation/Translation.jsm
+lib/firefox/browser/modules/translation/TranslationContentHandler.jsm
+lib/firefox/browser/modules/translation/TranslationDocument.jsm
+lib/firefox/browser/modules/translation/cld-worker.js
+lib/firefox/browser/modules/translation/cld-worker.js.mem
lib/firefox/browser/modules/webrtcUI.jsm
lib/firefox/browser/searchplugins/amazondotcom.xml
lib/firefox/browser/searchplugins/bing.xml
@@ -1286,8 +1366,6 @@ lib/firefox/chrome/en-US/locale/en-US/global/brand.dtd
lib/firefox/chrome/en-US/locale/en-US/global/browser.properties
lib/firefox/chrome/en-US/locale/en-US/global/charsetMenu.dtd
lib/firefox/chrome/en-US/locale/en-US/global/charsetMenu.properties
-lib/firefox/chrome/en-US/locale/en-US/global/charsetOverlay.dtd
-lib/firefox/chrome/en-US/locale/en-US/global/charsetTitles.properties
lib/firefox/chrome/en-US/locale/en-US/global/commonDialog.dtd
lib/firefox/chrome/en-US/locale/en-US/global/commonDialogs.properties
lib/firefox/chrome/en-US/locale/en-US/global/config.dtd
@@ -1298,11 +1376,12 @@ lib/firefox/chrome/en-US/locale/en-US/global/contentAreaCommands.properties
lib/firefox/chrome/en-US/locale/en-US/global/crashes.dtd
lib/firefox/chrome/en-US/locale/en-US/global/crashes.properties
lib/firefox/chrome/en-US/locale/en-US/global/css.properties
-lib/firefox/chrome/en-US/locale/en-US/global/customizeCharset.dtd
lib/firefox/chrome/en-US/locale/en-US/global/customizeToolbar.dtd
lib/firefox/chrome/en-US/locale/en-US/global/customizeToolbar.properties
lib/firefox/chrome/en-US/locale/en-US/global/dateFormat.properties
lib/firefox/chrome/en-US/locale/en-US/global/datetimepicker.dtd
+lib/firefox/chrome/en-US/locale/en-US/global/devtools/csscoverage.dtd
+lib/firefox/chrome/en-US/locale/en-US/global/devtools/csscoverage.properties
lib/firefox/chrome/en-US/locale/en-US/global/devtools/debugger.properties
lib/firefox/chrome/en-US/locale/en-US/global/devtools/styleinspector.properties
lib/firefox/chrome/en-US/locale/en-US/global/dialog.properties
@@ -1489,6 +1568,7 @@ lib/firefox/chrome/toolkit/content/global/about.js
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/aboutCompartments.xhtml
lib/firefox/chrome/toolkit/content/global/aboutMemory.css
lib/firefox/chrome/toolkit/content/global/aboutMemory.js
@@ -1557,8 +1637,6 @@ lib/firefox/chrome/toolkit/content/global/bindings/wizard.xml
lib/firefox/chrome/toolkit/content/global/browser-child.js
lib/firefox/chrome/toolkit/content/global/browser-content.js
lib/firefox/chrome/toolkit/content/global/buildconfig.html
-lib/firefox/chrome/toolkit/content/global/charsetOverlay.js
-lib/firefox/chrome/toolkit/content/global/charsetOverlay.xul
lib/firefox/chrome/toolkit/content/global/commonDialog.css
lib/firefox/chrome/toolkit/content/global/commonDialog.js
lib/firefox/chrome/toolkit/content/global/commonDialog.xul
@@ -1569,8 +1647,6 @@ lib/firefox/chrome/toolkit/content/global/console.js
lib/firefox/chrome/toolkit/content/global/console.xul
lib/firefox/chrome/toolkit/content/global/consoleBindings.xml
lib/firefox/chrome/toolkit/content/global/contentAreaUtils.js
-lib/firefox/chrome/toolkit/content/global/customizeCharset.js
-lib/firefox/chrome/toolkit/content/global/customizeCharset.xul
lib/firefox/chrome/toolkit/content/global/customizeToolbar.css
lib/firefox/chrome/toolkit/content/global/customizeToolbar.js
lib/firefox/chrome/toolkit/content/global/customizeToolbar.xul
@@ -1593,6 +1669,7 @@ lib/firefox/chrome/toolkit/content/global/globalOverlay.xul
lib/firefox/chrome/toolkit/content/global/inlineSpellCheckUI.js
lib/firefox/chrome/toolkit/content/global/license.html
lib/firefox/chrome/toolkit/content/global/menulist.css
+lib/firefox/chrome/toolkit/content/global/minimal-xul.css
lib/firefox/chrome/toolkit/content/global/mozilla.xhtml
lib/firefox/chrome/toolkit/content/global/netError.xhtml
lib/firefox/chrome/toolkit/content/global/notfound.wav
@@ -1722,7 +1799,6 @@ lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.xml
lib/firefox/chrome/toolkit/res/arrow.gif
lib/firefox/chrome/toolkit/res/arrowd.gif
lib/firefox/chrome/toolkit/res/broken-image.png
-lib/firefox/chrome/toolkit/res/charsetData.properties
lib/firefox/chrome/toolkit/res/forms.css
lib/firefox/chrome/toolkit/res/full-screen-override.css
lib/firefox/chrome/toolkit/res/hiddenWindow.html
@@ -2004,12 +2080,14 @@ lib/firefox/components/ActivityRequestHandler.js
lib/firefox/components/ActivityWrapper.js
lib/firefox/components/AlarmsManager.js
lib/firefox/components/AppsService.js
+lib/firefox/components/AutofillController.js
lib/firefox/components/BrowserElementParent.js
+lib/firefox/components/ChromeNotifications.js
lib/firefox/components/ColorAnalyzer.js
lib/firefox/components/ConsoleAPIStorage.js
lib/firefox/components/ContactManager.js
lib/firefox/components/DataReportingService.js
-lib/firefox/components/DataStoreService.js
+lib/firefox/components/DataStoreImpl.js
lib/firefox/components/DownloadLegacy.js
lib/firefox/components/FeedProcessor.js
lib/firefox/components/FormHistoryStartup.js
@@ -2026,6 +2104,7 @@ lib/firefox/components/Push.js
lib/firefox/components/PushServiceLauncher.js
lib/firefox/components/SettingsManager.js
lib/firefox/components/SiteSpecificUserAgent.js
+lib/firefox/components/SlowScriptDebug.js
lib/firefox/components/SystemMessageInternal.js
lib/firefox/components/SystemMessageManager.js
lib/firefox/components/TCPServerSocket.js
@@ -2083,7 +2162,7 @@ lib/firefox/components/nsUrlClassifierLib.js
lib/firefox/components/nsUrlClassifierListManager.js
lib/firefox/components/nsWebHandlerApp.js
lib/firefox/components/recording-cmdline.js
-lib/firefox/components/storage-mozStorage.js
+lib/firefox/components/storage-json.js
lib/firefox/components/txEXSLTRegExFunctions.js
lib/firefox/defaults/autoconfig/platform.js
lib/firefox/defaults/autoconfig/prefcalls.js
@@ -2132,6 +2211,7 @@ lib/firefox/hyphenation/hyph_sv.dic
lib/firefox/hyphenation/hyph_tr.dic
lib/firefox/hyphenation/hyph_uk.dic
lib/firefox/libmozalloc.so
+lib/firefox/libmozjs.so
lib/firefox/libxul.so
lib/firefox/modules/ActivitiesService.jsm
lib/firefox/modules/ActivitiesServiceFilter.jsm
@@ -2171,8 +2251,6 @@ lib/firefox/modules/DOMRequestHelper.jsm
lib/firefox/modules/DataStoreChangeNotifier.jsm
lib/firefox/modules/DataStoreCursorImpl.jsm
lib/firefox/modules/DataStoreDB.jsm
-lib/firefox/modules/DataStoreImpl.jsm
-lib/firefox/modules/DataStoreServiceInternal.jsm
lib/firefox/modules/DeferredSave.jsm
lib/firefox/modules/DeferredTask.jsm
lib/firefox/modules/Deprecated.jsm
@@ -2213,7 +2291,10 @@ lib/firefox/modules/LightweightThemeConsumer.jsm
lib/firefox/modules/LightweightThemeManager.jsm
lib/firefox/modules/LoadContextInfo.jsm
lib/firefox/modules/Log.jsm
+lib/firefox/modules/LoginHelper.jsm
+lib/firefox/modules/LoginImport.jsm
lib/firefox/modules/LoginManagerContent.jsm
+lib/firefox/modules/LoginStore.jsm
lib/firefox/modules/MessagePortBase.jsm
lib/firefox/modules/MessagePortWorker.js
lib/firefox/modules/Metrics.jsm
@@ -2231,7 +2312,6 @@ lib/firefox/modules/PageThumbs.jsm
lib/firefox/modules/PageThumbsWorker.js
lib/firefox/modules/Payment.jsm
lib/firefox/modules/PerfMeasurement.jsm
-lib/firefox/modules/PermissionPromptHelper.jsm
lib/firefox/modules/PermissionSettings.jsm
lib/firefox/modules/PermissionsInstaller.jsm
lib/firefox/modules/PermissionsTable.jsm
@@ -2419,6 +2499,9 @@ lib/firefox/modules/commonjs/sdk/l10n/plural-rules.js
lib/firefox/modules/commonjs/sdk/l10n/prefs.js
lib/firefox/modules/commonjs/sdk/l10n/properties/core.js
lib/firefox/modules/commonjs/sdk/lang/functional.js
+lib/firefox/modules/commonjs/sdk/lang/functional/concurrent.js
+lib/firefox/modules/commonjs/sdk/lang/functional/core.js
+lib/firefox/modules/commonjs/sdk/lang/functional/helpers.js
lib/firefox/modules/commonjs/sdk/lang/type.js
lib/firefox/modules/commonjs/sdk/lang/weak-set.js
lib/firefox/modules/commonjs/sdk/loader/cuddlefish.js
@@ -2448,10 +2531,10 @@ lib/firefox/modules/commonjs/sdk/places/host/host-tags.js
lib/firefox/modules/commonjs/sdk/places/utils.js
lib/firefox/modules/commonjs/sdk/platform/xpcom.js
lib/firefox/modules/commonjs/sdk/preferences/event-target.js
+lib/firefox/modules/commonjs/sdk/preferences/native-options.js
lib/firefox/modules/commonjs/sdk/preferences/service.js
lib/firefox/modules/commonjs/sdk/private-browsing.js
lib/firefox/modules/commonjs/sdk/private-browsing/utils.js
-lib/firefox/modules/commonjs/sdk/private-browsing/window/utils.js
lib/firefox/modules/commonjs/sdk/querystring.js
lib/firefox/modules/commonjs/sdk/request.js
lib/firefox/modules/commonjs/sdk/selection.js
@@ -2555,7 +2638,6 @@ lib/firefox/modules/commonjs/toolkit/loader.js
lib/firefox/modules/ctypes.jsm
lib/firefox/modules/debug.js
lib/firefox/modules/devtools/Console.jsm
-lib/firefox/modules/devtools/DevToolsExtensions.jsm
lib/firefox/modules/devtools/DevToolsUtils.js
lib/firefox/modules/devtools/DevToolsUtils.jsm
lib/firefox/modules/devtools/Devices.jsm
@@ -2589,6 +2671,7 @@ lib/firefox/modules/devtools/gcli/commands/commands.js
lib/firefox/modules/devtools/gcli/commands/connect.js
lib/firefox/modules/devtools/gcli/commands/context.js
lib/firefox/modules/devtools/gcli/commands/cookie.js
+lib/firefox/modules/devtools/gcli/commands/csscoverage.js
lib/firefox/modules/devtools/gcli/commands/exec.js
lib/firefox/modules/devtools/gcli/commands/global.js
lib/firefox/modules/devtools/gcli/commands/help.js
@@ -2619,6 +2702,7 @@ lib/firefox/modules/devtools/gcli/fields/delegate.js
lib/firefox/modules/devtools/gcli/fields/fields.js
lib/firefox/modules/devtools/gcli/fields/selection.js
lib/firefox/modules/devtools/gcli/index.js
+lib/firefox/modules/devtools/gcli/l10n.js
lib/firefox/modules/devtools/gcli/languages/command.html
lib/firefox/modules/devtools/gcli/languages/command.js
lib/firefox/modules/devtools/gcli/languages/javascript.js
@@ -2662,15 +2746,21 @@ lib/firefox/modules/devtools/gcli/util/spell.js
lib/firefox/modules/devtools/gcli/util/util.js
lib/firefox/modules/devtools/output-parser.js
lib/firefox/modules/devtools/pretty-fast.js
+lib/firefox/modules/devtools/qrcode/decoder/index.js
+lib/firefox/modules/devtools/qrcode/encoder/index.js
+lib/firefox/modules/devtools/qrcode/index.js
lib/firefox/modules/devtools/server/actors/call-watcher.js
lib/firefox/modules/devtools/server/actors/canvas.js
lib/firefox/modules/devtools/server/actors/childtab.js
lib/firefox/modules/devtools/server/actors/common.js
+lib/firefox/modules/devtools/server/actors/csscoverage.js
lib/firefox/modules/devtools/server/actors/device.js
lib/firefox/modules/devtools/server/actors/eventlooplag.js
+lib/firefox/modules/devtools/server/actors/framerate.js
lib/firefox/modules/devtools/server/actors/gcli.js
lib/firefox/modules/devtools/server/actors/highlighter.js
lib/firefox/modules/devtools/server/actors/inspector.js
+lib/firefox/modules/devtools/server/actors/layout.js
lib/firefox/modules/devtools/server/actors/memory.js
lib/firefox/modules/devtools/server/actors/preference.js
lib/firefox/modules/devtools/server/actors/pretty-print-worker.js
@@ -2689,16 +2779,28 @@ lib/firefox/modules/devtools/server/actors/webbrowser.js
lib/firefox/modules/devtools/server/actors/webconsole.js
lib/firefox/modules/devtools/server/actors/webgl.js
lib/firefox/modules/devtools/server/child.js
+lib/firefox/modules/devtools/server/content-globals.js
lib/firefox/modules/devtools/server/main.js
lib/firefox/modules/devtools/server/protocol.js
-lib/firefox/modules/devtools/server/transport.js
lib/firefox/modules/devtools/source-map.js
lib/firefox/modules/devtools/styleinspector/css-logic.js
+lib/firefox/modules/devtools/tern/browser.js
+lib/firefox/modules/devtools/tern/comment.js
+lib/firefox/modules/devtools/tern/condense.js
+lib/firefox/modules/devtools/tern/def.js
+lib/firefox/modules/devtools/tern/ecma5.js
+lib/firefox/modules/devtools/tern/infer.js
+lib/firefox/modules/devtools/tern/signal.js
+lib/firefox/modules/devtools/tern/tern.js
lib/firefox/modules/devtools/toolkit/webconsole/client.js
lib/firefox/modules/devtools/toolkit/webconsole/network-helper.js
lib/firefox/modules/devtools/toolkit/webconsole/network-monitor.js
lib/firefox/modules/devtools/toolkit/webconsole/utils.js
lib/firefox/modules/devtools/touch-events.js
+lib/firefox/modules/devtools/transport/packets.js
+lib/firefox/modules/devtools/transport/stream-utils.js
+lib/firefox/modules/devtools/transport/transport.js
+lib/firefox/modules/devtools/worker-loader.js
lib/firefox/modules/identity/FirefoxAccounts.jsm
lib/firefox/modules/identity/Identity.jsm
lib/firefox/modules/identity/IdentityProvider.jsm
@@ -2731,6 +2833,7 @@ lib/firefox/modules/osfile/ospath.jsm
lib/firefox/modules/osfile/ospath_unix.jsm
lib/firefox/modules/osfile/ospath_win.jsm
lib/firefox/modules/reflect.jsm
+lib/firefox/modules/sdk/bootstrap.js
lib/firefox/modules/services-common/async.js
lib/firefox/modules/services-common/bagheeraclient.js
lib/firefox/modules/services-common/hawkclient.js
@@ -2805,8 +2908,7 @@ lib/firefox/res/entityTables/mathml20.properties
lib/firefox/res/entityTables/transliterate.properties
lib/firefox/res/fonts/mathfont.properties
lib/firefox/res/fonts/mathfontMathJax_Main.properties
-lib/firefox/res/fonts/mathfontSTIXNonUnicode.properties
-lib/firefox/res/fonts/mathfontSTIXSizeOneSym.properties
+lib/firefox/res/fonts/mathfontSTIXGeneral.properties
lib/firefox/res/fonts/mathfontStandardSymbolsL.properties
lib/firefox/res/fonts/mathfontUnicode.properties
lib/firefox/res/grabber.gif
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index babc24a3406..02194e852d4 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.159 2014/08/13 22:33:44 joerg Exp $
+$NetBSD: distinfo,v 1.160 2014/10/05 01:59:08 ryoon Exp $
-SHA1 (firefox-31.0.source.tar.bz2) = a6c3e25ee3aeb7da42db2aaeb50a385d63532beb
-RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564
-Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
-SHA1 (patch-aa) = b58a026dda6b32421f23e206894dfc28dbb9fb86
-SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
+SHA1 (firefox-32.0.3.source.tar.bz2) = 1f831147365478e353212714038e812ca3e9fe42
+RMD160 (firefox-32.0.3.source.tar.bz2) = f09e2cc92a35f0f3e88079d063c22bf16215327a
+Size (firefox-32.0.3.source.tar.bz2) = 150323569 bytes
+SHA1 (patch-aa) = b1bc5485f573392950595a7c93abeaaa14fb190c
+SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc
SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
-SHA1 (patch-as) = c197e5bf9ef2f325add320f59c81525b1162a2d3
+SHA1 (patch-as) = e20234ba1ce89035132c436fd3f77d0170cb3b42
SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d94
SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da
SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
@@ -21,21 +21,20 @@ SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac86
SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f
SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7
+SHA1 (patch-build_clang-plugin_configure) = eb5bf7774a938766bffd7636811801b96afd2280
SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1
SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
-SHA1 (patch-config_external_moz.build) = f437c4802de266caf512dc470879c8ed0961559b
+SHA1 (patch-config_external_moz.build) = 99b10ed0e04f78f97678bd81cbc5da09aecf88e4
SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693
SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949
SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44
-SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157
-SHA1 (patch-content_media_AudioStream.h) = 11cd8649f35c001fa0bf9e0f6119e49bd41ab9b4
+SHA1 (patch-content_media_AudioStream.h) = 95270817c8d2efd794f440f985fd0da6ef7ed333
SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13
-SHA1 (patch-content_media_fmp4_demuxer_bit_reader.cc) = 6d87cd7231e61a12396d15dd2fa3d1a51051e8ee
SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb
SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
@@ -77,8 +76,9 @@ SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609
SHA1 (patch-js_src_Makefile.in) = 780e408dfddfd90c6013b316e2e52800c62eee5e
SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
-SHA1 (patch-js_src_gc_Memory.cpp) = 3db31553ec6f7b1fac4fd4ce11b77be1ea4208b8
+SHA1 (patch-js_src_gc_Memory.cpp) = f2ee54f0a05d870651a3235b95bbb346586f3c3c
SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
+SHA1 (patch-js_src_vm_WeakMapPtr.cpp) = c1778892afa6fb97de911221715a14f6dd9cab2f
SHA1 (patch-mb) = b661abce429a88554fca6c930b4dbf71ba6bb5cb
SHA1 (patch-media_libcubeb_src_Makefile.in) = fe880774789b0be54dec6fd83b89457fc8c2cabc
SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 5ef0de0ac875334e959ff0d4bfa43a2e5ab087b9
@@ -96,9 +96,10 @@ SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 4ff5796e15d9aa6adb849
SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = ae0fcc32f7d146d2a494b42a58a9fcbb73c2a74c
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ffc1d956e826a0005b76285596ba24a2f4a3806c
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 4721f01a89ef353c9b743b3cfefda4877d5283d9
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = eb585898f92a7782e85c01262c26c9ad47fbcb89
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 78a9522f0e37cfc3ec8267e6c15de9dba0ec7ff3
SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543
+SHA1 (patch-memory_jemalloc_src_configure) = 563834e1a0dc0eba17b4f263de26787672ff9200
SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9d9036ddd28c7b8ce37860e0120df2997a3a0c59
SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749
SHA1 (patch-mfbt_Attributes.h) = e99809555ce743e7e393cdf20efa3a00c0b9098a
@@ -114,11 +115,11 @@ SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
SHA1 (patch-storage_src_moz.build) = 1e08d96f6be012286547c723bfeb445c50d3ad83
SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
-SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = 78f89457f5ddc958dec607a53800ae8367b94b0c
+SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890
SHA1 (patch-toolkit_library_libxul.mk) = ceba8edf009787ad68a1d2b284c090d8c140c139
SHA1 (patch-toolkit_toolkit.mozbuild) = 0993d50cc02c2b421e6de087dfb0a9cb30562c6b
SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
-SHA1 (patch-webapprt_moz.build) = cb3d92bc8ada1e2b49877cf7bbe6fbc32278230a
+SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c
SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
@@ -126,10 +127,9 @@ SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf
SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488
SHA1 (patch-xl) = 9555b86c72b2e144e341d6af1dbfbc07cc8c94db
SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657
-SHA1 (patch-xpcom_base_nsDebugImpl.cpp) = dfeb14b000ba435170a17bab98fdf07335f4ef71
-SHA1 (patch-xpcom_base_nsStackWalk.cpp) = fa62f11a97f909ce1c5cea60cf6e58a6071490a5
-SHA1 (patch-xpcom_base_nsUUIDGenerator.cpp) = 8891ad1486384e8bb83b99c64bc3fe009a65e2c0
-SHA1 (patch-xpcom_base_nsUUIDGenerator.h) = 62e334685fcefc3d1c708e1436c7bf2a40d87ab7
+SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 2475818905150a4779607ab24ea6bd261e62f5bd
+SHA1 (patch-xpcom_base_nsUUIDGenerator.cpp) = 36343baeafef7bf923cae1fe4e844ca360181b83
+SHA1 (patch-xpcom_base_nsUUIDGenerator.h) = 43e9704cde02cca793af47c47627e2df1b770d5b
SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = fdb961a615e5c66a1d0a3c724cf124a2b47f2ed6
SHA1 (patch-xpcom_build_nsXPComInit.cpp) = 727fd1ce934f129de5fcc5e6059d3cb8c30b1e17
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index f53eb6956e3..7409a8adf92 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.42 2014/08/16 13:05:16 tsutsui Exp $
+# $NetBSD: mozilla-common.mk,v 1.43 2014/10/05 01:59:08 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --disable-installer
CONFIGURE_ARGS+= --enable-url-classifier
#CONFIGURE_ARGS+= --enable-startup-notification
# Disabled from https://bugzilla.mozilla.org/show_bug.cgi?id=977400
-#CONFIGURE_ARGS+= --enable-shared-js
+CONFIGURE_ARGS+= --enable-shared-js
CONFIGURE_ARGS+= --with-system-ply
CONFIGURE_ARGS+= --disable-icf
CONFIGURE_ARGS+= --disable-necko-wifi
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index bdaa8675e7d..bfec0e3b9e7 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
+$NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
* The profiler does not support Darwin/PPC so don't try to enable it
on that platform.
@@ -13,9 +13,9 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon 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 2014-07-17 01:45:08.000000000 +0000
+--- configure.in.orig 2014-09-24 01:05:10.000000000 +0000
+++ configure.in
-@@ -962,7 +962,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH
+@@ -958,7 +958,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH
MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
-@@ -1676,7 +1676,13 @@ Linux)
+@@ -1672,7 +1672,13 @@ Linux)
MOZ_ENABLE_PROFILER_SPS=
esac
;;
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
*)
MOZ_ENABLE_PROFILER_SPS=
;;
-@@ -1780,7 +1786,7 @@ case "$host" in
+@@ -1776,7 +1782,7 @@ case "$host" in
;;
*-darwin*)
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
;;
-@@ -1912,7 +1918,6 @@ case "$target" in
+@@ -1908,7 +1914,6 @@ case "$target" in
AC_DEFINE(XP_DARWIN)
_PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
else
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
AC_DEFINE(XP_DARWIN)
_PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
# The ExceptionHandling framework is needed for Objective-C exception
-@@ -2522,118 +2527,15 @@ MOZ_CXX11
+@@ -2527,8 +2532,7 @@ MOZ_CXX11
AC_LANG_C
@@ -64,125 +64,18 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
-dnl Borrowed from glibc configure.in
+dnl Setup default hidden visibility and wrapped system headers.
dnl ===============================================================
- if test "$GNU_CC"; then
-- AC_CACHE_CHECK(for visibility(hidden) attribute,
-- ac_cv_visibility_hidden,
-- [cat > conftest.c <<EOF
-- int foo __attribute__ ((visibility ("hidden"))) = 1;
--EOF
-- ac_cv_visibility_hidden=no
-- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-- if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
-- ac_cv_visibility_hidden=yes
-- fi
-- fi
-- rm -f conftest.[cs]
-- ])
-- if test "$ac_cv_visibility_hidden" = "yes"; then
-- AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
--
-- AC_CACHE_CHECK(for visibility(default) attribute,
-- ac_cv_visibility_default,
-- [cat > conftest.c <<EOF
-- int foo __attribute__ ((visibility ("default"))) = 1;
--EOF
-- ac_cv_visibility_default=no
-- if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-- if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
-- ac_cv_visibility_default=yes
-- fi
-- fi
-- rm -f conftest.[cs]
-- ])
-- if test "$ac_cv_visibility_default" = "yes"; then
-- AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
--
-- AC_CACHE_CHECK(for visibility pragma support,
-- ac_cv_visibility_pragma,
-- [cat > conftest.c <<EOF
--#pragma GCC visibility push(hidden)
-- int foo_hidden = 1;
--#pragma GCC visibility push(default)
-- int foo_default = 1;
--EOF
-- ac_cv_visibility_pragma=no
-- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-- if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
-- if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
-- ac_cv_visibility_pragma=yes
-- fi
-- fi
-- fi
-- rm -f conftest.[cs]
-- ])
-- if test "$ac_cv_visibility_pragma" = "yes"; then
-- AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905),
-- ac_cv_have_visibility_class_bug,
-- [cat > conftest.c <<EOF
--#pragma GCC visibility push(hidden)
--struct __attribute__ ((visibility ("default"))) TestStruct {
-- static void Init();
--};
--__attribute__ ((visibility ("default"))) void TestFunc() {
-- TestStruct::Init();
--}
--EOF
-- ac_cv_have_visibility_class_bug=no
-- if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-- ac_cv_have_visibility_class_bug=yes
-- else
-- if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
-- ac_cv_have_visibility_class_bug=yes
-- fi
-- fi
-- rm -rf conftest.{c,S}
-- ])
--
-- AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
-- ac_cv_have_visibility_builtin_bug,
-- [cat > conftest.c <<EOF
--#pragma GCC visibility push(hidden)
--#pragma GCC visibility push(default)
--#include <string.h>
--#pragma GCC visibility pop
--
--__attribute__ ((visibility ("default"))) void Func() {
-- char c[[100]];
-- memset(c, 0, sizeof(c));
--}
--EOF
-- ac_cv_have_visibility_builtin_bug=no
-- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-- ac_cv_have_visibility_builtin_bug=yes
-- else
-- if test `grep -c "@PLT" conftest.S` = 0; then
-- ac_cv_visibility_builtin_bug=yes
-- fi
-- fi
-- rm -f conftest.{c,S}
-- ])
-- if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
-- "$ac_cv_have_visibility_class_bug" = "no"; then
-- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-- WRAP_SYSTEM_INCLUDES=1
-- STL_FLAGS='-I$(DIST)/stl_wrappers'
-- WRAP_STL_INCLUDES=1
-- else
-- VISIBILITY_FLAGS='-fvisibility=hidden'
-- fi # have visibility pragma bug
-- fi # have visibility pragma
-- fi # have visibility(default) attribute
-- fi # have visibility(hidden) attribute
-+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
-+ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-+ WRAP_SYSTEM_INCLUDES=1
-+ STL_FLAGS='-I$(DIST)/stl_wrappers'
-+ WRAP_STL_INCLUDES=1
- fi # GNU_CC
+ if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
+@@ -2667,7 +2671,7 @@ if test "$ac_cv_sockaddr_sa_len" = true
+ AC_DEFINE(HAVE_SA_LEN)
+ fi
- # visibility hidden flag for Sun Studio on Solaris
-@@ -3004,7 +2906,7 @@ dnl Checks for library functions.
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+ [ --enable-dtrace build with dtrace support if available (default=no)],
+ [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then
+@@ -2928,7 +2932,7 @@ dnl Checks for library functions.
dnl ========================================================
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
@@ -191,7 +84,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
-@@ -3691,6 +3593,14 @@ if test -n "$YASM"; then
+@@ -3625,6 +3629,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@@ -206,7 +99,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -3718,11 +3628,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3652,11 +3664,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -219,7 +112,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
MOZ_NATIVE_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -4387,6 +4293,10 @@ cairo-gonk)
+@@ -4342,6 +4350,10 @@ cairo-gonk)
esac
@@ -230,7 +123,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
AC_SUBST(MOZ_PDF_PRINTING)
if test "$MOZ_PDF_PRINTING"; then
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5106,6 +5016,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5068,6 +5080,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VPX=1
MOZ_VPX_ERROR_CONCEALMENT=1
@@ -240,29 +133,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5130,15 +5043,18 @@ AC_SUBST(MOZ_SRTP)
-
- dnl Use integers over floats for audio on B2G and Android, because audio
- dnl backends for those platforms don't support floats.
--if test "$OS_TARGET" = "Android"; then
-+case "$OS_TARGET" in
-+Android)
- MOZ_SAMPLE_TYPE_S16=1
- AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
- AC_SUBST(MOZ_SAMPLE_TYPE_S16)
--else
-+ ;;
-+*)
- MOZ_SAMPLE_TYPE_FLOAT32=1
- AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
- AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
--fi
-+ ;;
-+esac
-
- dnl ========================================================
- dnl = Disable Speech API code
-@@ -5190,6 +5106,63 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5154,6 +5169,63 @@ if test "${ac_cv_c_attribute_aligned}" !
fi
dnl ========================================================
@@ -326,7 +197,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
dnl = Disable Opus audio codec support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5198,6 +5171,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5162,6 +5234,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
MOZ_OPUS=1)
dnl ========================================================
@@ -424,7 +295,7 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5938,7 +6002,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
+@@ -5944,7 +6107,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
if test "$MOZ_GAMEPAD"; then
case "$OS_TARGET" in
Darwin)
@@ -434,8 +305,8 @@ $NetBSD: patch-aa,v 1.29 2014/07/24 14:57:12 ryoon Exp $
+ fi
;;
WINNT)
- if test -z "$MOZ_HAS_WINSDK_WITH_D3D"; then
-@@ -8036,6 +8102,52 @@ if test "$USE_FC_FREETYPE"; then
+ case "$MOZ_WINSDK_MAXVER" in
+@@ -8074,6 +8239,52 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
diff --git a/www/firefox/patches/patch-ak b/www/firefox/patches/patch-ak
index aed65f16601..145853c3b8a 100644
--- a/www/firefox/patches/patch-ak
+++ b/www/firefox/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.11 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-ak,v 1.12 2014/10/05 01:59:08 ryoon Exp $
---- js/src/ctypes/libffi/configure.orig 2013-01-04 23:44:34.000000000 +0000
+--- js/src/ctypes/libffi/configure.orig 2014-09-24 01:05:20.000000000 +0000
+++ js/src/ctypes/libffi/configure
-@@ -11278,7 +11278,7 @@ case "$host" in
+@@ -17226,7 +17226,7 @@ case "$host" in
powerpc-*-aix* | rs6000-*-aix*)
TARGET=POWERPC_AIX; TARGETDIR=powerpc
;;
- powerpc-*-freebsd* | powerpc-*-openbsd*)
+ powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*)
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+ HAVE_LONG_DOUBLE_VARIANT=1
;;
- powerpc*-*-rtems*)
diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as
index 95d62acc712..0f459bfc7dd 100644
--- a/www/firefox/patches/patch-as
+++ b/www/firefox/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.11 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: patch-as,v 1.12 2014/10/05 01:59:08 ryoon Exp $
Treat DragonFly like FreeBSD.
---- js/src/configure.in.orig 2014-05-29 23:30:53.000000000 +0000
+--- js/src/configure.in.orig 2014-09-24 01:05:20.000000000 +0000
+++ js/src/configure.in
-@@ -2082,116 +2082,13 @@ AC_LANG_CPLUSPLUS
+@@ -2093,8 +2093,7 @@ AC_LANG_CPLUSPLUS
MOZ_CXX11
@@ -12,121 +12,18 @@ Treat DragonFly like FreeBSD.
-dnl Borrowed from glibc configure.in
+dnl Setup default hidden visibility and wrapped system headers.
dnl ===============================================================
- if test "$GNU_CC"; then
-- AC_CACHE_CHECK(for visibility(hidden) attribute,
-- ac_cv_visibility_hidden,
-- [cat > conftest.c <<EOF
-- int foo __attribute__ ((visibility ("hidden"))) = 1;
--EOF
-- ac_cv_visibility_hidden=no
-- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-- if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
-- ac_cv_visibility_hidden=yes
-- fi
-- fi
-- rm -f conftest.[cs]
-- ])
-- if test "$ac_cv_visibility_hidden" = "yes"; then
-- AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
--
-- AC_CACHE_CHECK(for visibility(default) attribute,
-- ac_cv_visibility_default,
-- [cat > conftest.c <<EOF
-- int foo __attribute__ ((visibility ("default"))) = 1;
--EOF
-- ac_cv_visibility_default=no
-- if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-- if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
-- ac_cv_visibility_default=yes
-- fi
-- fi
-- rm -f conftest.[cs]
-- ])
-- if test "$ac_cv_visibility_default" = "yes"; then
-- AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
--
-- AC_CACHE_CHECK(for visibility pragma support,
-- ac_cv_visibility_pragma,
-- [cat > conftest.c <<EOF
--#pragma GCC visibility push(hidden)
-- int foo_hidden = 1;
--#pragma GCC visibility push(default)
-- int foo_default = 1;
--EOF
-- ac_cv_visibility_pragma=no
-- if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-- if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
-- if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
-- ac_cv_visibility_pragma=yes
-- fi
-- fi
-- fi
-- rm -f conftest.[cs]
-- ])
-- if test "$ac_cv_visibility_pragma" = "yes"; then
-- AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905),
-- ac_cv_have_visibility_class_bug,
-- [cat > conftest.c <<EOF
--#pragma GCC visibility push(hidden)
--struct __attribute__ ((visibility ("default"))) TestStruct {
-- static void Init();
--};
--__attribute__ ((visibility ("default"))) void TestFunc() {
-- TestStruct::Init();
--}
--EOF
-- ac_cv_have_visibility_class_bug=no
-- if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-- ac_cv_have_visibility_class_bug=yes
-- else
-- if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
-- ac_cv_have_visibility_class_bug=yes
-- fi
-- fi
-- rm -rf conftest.{c,S}
-- ])
--
-- AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
-- ac_cv_have_visibility_builtin_bug,
-- [cat > conftest.c <<EOF
--#pragma GCC visibility push(hidden)
--#pragma GCC visibility push(default)
--#include <string.h>
--#pragma GCC visibility pop
--
--__attribute__ ((visibility ("default"))) void Func() {
-- char c[[100]];
-- memset(c, 0, sizeof(c));
--}
--EOF
-- ac_cv_have_visibility_builtin_bug=no
-- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-- ac_cv_have_visibility_builtin_bug=yes
-- else
-- if test `grep -c "@PLT" conftest.S` = 0; then
-- ac_cv_visibility_builtin_bug=yes
-- fi
-- fi
-- rm -f conftest.{c,S}
-- ])
-- if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
-- "$ac_cv_have_visibility_class_bug" = "no"; then
-- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-- WRAP_SYSTEM_INCLUDES=1
-- else
-- VISIBILITY_FLAGS='-fvisibility=hidden'
-- fi # have visibility pragma bug
-- fi # have visibility pragma
-- fi # have visibility(default) attribute
-- fi # have visibility(hidden) attribute
-+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-+ AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
-+ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-+ WRAP_SYSTEM_INCLUDES=1
- fi # GNU_CC
+ if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
+ AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
+@@ -2160,7 +2159,7 @@ dnl Quota support
+ MOZ_CHECK_HEADERS(sys/quota.h)
+ MOZ_CHECK_HEADERS(linux/quota.h)
- # visibility hidden flag for Sun Studio on Solaris
-@@ -3162,7 +3059,7 @@ if test "$MOZ_MEMORY"; then
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+ [ --enable-dtrace build with dtrace support if available (default=no)],
+ [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then
+@@ -3108,7 +3107,7 @@ if test "$MOZ_MEMORY"; then
*-darwin*)
AC_DEFINE(MOZ_MEMORY_DARWIN)
;;
@@ -135,7 +32,7 @@ Treat DragonFly like FreeBSD.
AC_DEFINE(MOZ_MEMORY_BSD)
;;
*-android*|*-linuxandroid*)
-@@ -4100,6 +3997,16 @@ MOZ_SUBCONFIGURE_ICU()
+@@ -4038,6 +4037,16 @@ MOZ_SUBCONFIGURE_ICU()
dnl ========================================================
dnl JavaScript shell
dnl ========================================================
diff --git a/www/firefox/patches/patch-build_clang-plugin_configure b/www/firefox/patches/patch-build_clang-plugin_configure
new file mode 100644
index 00000000000..8a8cdc0f755
--- /dev/null
+++ b/www/firefox/patches/patch-build_clang-plugin_configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-build_clang-plugin_configure,v 1.1 2014/10/05 01:59:08 ryoon Exp $
+
+--- build/clang-plugin/configure.orig 2014-09-24 01:05:09.000000000 +0000
++++ build/clang-plugin/configure
+@@ -42,7 +42,7 @@ LLVMCXXFLAGS=`$LLVMCONFIG --cxxflags`
+ LLVMLDFLAGS=`$LLVMCONFIG --ldflags`
+ LLVMLDFLAGS="$LLVMLDFLAGS `$LLVMCONFIG --libs $LLVMLIBS`"
+
+-if [ $PLATFORM == Darwin ]; then
++if [ $PLATFORM = Darwin ]; then
+ DSO_LDOPTS="-dynamiclib -shared"
+ CLANGLDFLAGS="-lclangFrontend -lclangDriver -lclangSerialization \
+ -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST \
diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build
index b37d6cfb049..f050fea1d13 100644
--- a/www/firefox/patches/patch-config_external_moz.build
+++ b/www/firefox/patches/patch-config_external_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-config_external_moz.build,v 1.3 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: patch-config_external_moz.build,v 1.4 2014/10/05 01:59:08 ryoon Exp $
---- config/external/moz.build.orig 2014-05-29 23:30:30.000000000 +0000
+--- config/external/moz.build.orig 2014-09-24 01:05:10.000000000 +0000
+++ config/external/moz.build
@@ -15,13 +15,19 @@ if CONFIG['MOZ_UPDATER']:
if not CONFIG['MOZ_NATIVE_BZ2']:
@@ -25,7 +25,7 @@ $NetBSD: patch-config_external_moz.build,v 1.3 2014/06/11 00:40:59 ryoon Exp $
external_dirs += ['media/libopus']
if CONFIG['MOZ_WEBM']:
-@@ -36,13 +42,15 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
+@@ -36,14 +42,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ
if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += ['media/libpng']
@@ -41,6 +41,7 @@ $NetBSD: patch-config_external_moz.build,v 1.3 2014/06/11 00:40:59 ryoon Exp $
- 'media/libogg',
- 'media/libtheora',
- 'media/libspeex_resampler',
+ 'media/libstagefright',
- 'media/libsoundtouch',
]
diff --git a/www/firefox/patches/patch-content_media_AudioStream.cpp b/www/firefox/patches/patch-content_media_AudioStream.cpp
deleted file mode 100644
index 52aa4c6e14f..00000000000
--- a/www/firefox/patches/patch-content_media_AudioStream.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-content_media_AudioStream.cpp,v 1.3 2014/04/30 15:07:18 ryoon Exp $
-
---- content/media/AudioStream.cpp.orig 2014-04-18 02:02:42.000000000 +0000
-+++ content/media/AudioStream.cpp
-@@ -13,7 +13,6 @@
- #include "mozilla/Mutex.h"
- #include <algorithm>
- #include "mozilla/Preferences.h"
--#include "soundtouch/SoundTouch.h"
- #include "Latency.h"
-
- namespace mozilla {
diff --git a/www/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h
index 311156c43eb..5ae162d0a86 100644
--- a/www/firefox/patches/patch-content_media_AudioStream.h
+++ b/www/firefox/patches/patch-content_media_AudioStream.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-content_media_AudioStream.h,v 1.5 2014/08/13 22:33:44 joerg Exp $
+$NetBSD: patch-content_media_AudioStream.h,v 1.6 2014/10/05 01:59:08 ryoon Exp $
---- content/media/AudioStream.h.orig 2014-07-17 01:45:09.000000000 +0000
+--- content/media/AudioStream.h.orig 2014-09-24 01:05:11.000000000 +0000
+++ content/media/AudioStream.h
@@ -17,6 +17,7 @@
#include "mozilla/RefPtr.h"
@@ -10,14 +10,12 @@ $NetBSD: patch-content_media_AudioStream.h,v 1.5 2014/08/13 22:33:44 joerg Exp $
template <>
class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream>
-@@ -25,10 +26,6 @@ public:
- static void Release(cubeb_stream* aStream) { cubeb_stream_destroy(aStream); }
+@@ -26,7 +27,7 @@ public:
};
--namespace soundtouch {
+ namespace soundtouch {
-class SoundTouch;
--}
--
- namespace mozilla {
++class MOZ_IMPORT_API SoundTouch;
+ }
- class AudioStream;
+ namespace mozilla {
diff --git a/www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc b/www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc
deleted file mode 100644
index d7dd078a492..00000000000
--- a/www/firefox/patches/patch-content_media_fmp4_demuxer_bit_reader.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-content_media_fmp4_demuxer_bit_reader.cc,v 1.1 2014/07/25 14:21:18 tron Exp $
-
-Fix build with pre-C++11 compilers like G++ 4.5.3.
-
---- content/media/fmp4/demuxer/bit_reader.cc.orig 2014-07-17 02:45:09.000000000 +0100
-+++ content/media/fmp4/demuxer/bit_reader.cc 2014-07-25 13:00:34.000000000 +0100
-@@ -9,7 +9,7 @@
-
- BitReader::BitReader(const uint8_t* data, off_t size)
- : data_(data), bytes_left_(size), num_remaining_bits_in_curr_byte_(0) {
-- DCHECK(data_ != nullptr && bytes_left_ > 0);
-+ DCHECK(data_ != 0 && bytes_left_ > 0);
-
- UpdateCurrByte();
- }
diff --git a/www/firefox/patches/patch-js_src_gc_Memory.cpp b/www/firefox/patches/patch-js_src_gc_Memory.cpp
index b49412da1d4..1d663545f99 100644
--- a/www/firefox/patches/patch-js_src_gc_Memory.cpp
+++ b/www/firefox/patches/patch-js_src_gc_Memory.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_gc_Memory.cpp,v 1.1 2014/04/10 07:33:59 martin Exp $
+$NetBSD: patch-js_src_gc_Memory.cpp,v 1.2 2014/10/05 01:59:08 ryoon Exp $
Make sure mmap() delivers memory with upper 17 bits clear on sparc64 on NetBSD:
with topdown-vm we would map in the last 4 gig of the address space (past
@@ -7,11 +7,11 @@ the VA hole) otherwise by default, thus busting the JSValue restrictions.
https://bugzilla.mozilla.org/show_bug.cgi?id=994133
---- js/src/gc/Memory.cpp.orig 2014-04-09 20:42:54.000000000 +0200
-+++ js/src/gc/Memory.cpp 2014-04-09 20:38:34.000000000 +0200
-@@ -312,7 +312,7 @@ gc::InitMemorySubsystem(JSRuntime *rt)
- static inline void *
- MapMemory(size_t length, int prot, int flags, int fd, off_t offset)
+--- js/src/gc/Memory.cpp.orig 2014-09-24 01:05:20.000000000 +0000
++++ js/src/gc/Memory.cpp
+@@ -350,7 +350,7 @@ static inline void *
+ MapMemory(size_t length, int prot = PROT_READ | PROT_WRITE,
+ int flags = MAP_PRIVATE | MAP_ANON, int fd = -1, off_t offset = 0)
{
-#if defined(__ia64__)
+#if defined(__ia64__) || (defined(__sparc64__) && defined(__NetBSD__))
diff --git a/www/firefox/patches/patch-js_src_vm_WeakMapPtr.cpp b/www/firefox/patches/patch-js_src_vm_WeakMapPtr.cpp
new file mode 100644
index 00000000000..123e27156ef
--- /dev/null
+++ b/www/firefox/patches/patch-js_src_vm_WeakMapPtr.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-js_src_vm_WeakMapPtr.cpp,v 1.1 2014/10/05 01:59:08 ryoon Exp $
+
+https://hg.mozilla.org/mozilla-central/rev/c64aa77208a6
+
+--- js/src/vm/WeakMapPtr.cpp.orig 2014-09-24 01:05:24.000000000 +0000
++++ js/src/vm/WeakMapPtr.cpp
+@@ -120,9 +120,9 @@ JS::WeakMapPtr<K, V>::put(JSContext *cx,
+ // Supported specializations of JS::WeakMap:
+ //
+
+-template class JS::WeakMapPtr<JSObject*, JSObject*>;
++template class JS_PUBLIC_API(JS::WeakMapPtr)<JSObject*, JSObject*>;
+
+ #ifdef DEBUG
+ // Nobody's using this at the moment, but we want to make sure it compiles.
+-template class JS::WeakMapPtr<JSObject*, JS::Value>;
++template class JS_PUBLIC_API(JS::WeakMapPtr)<JSObject*, JS::Value>;
+ #endif
diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
index 303e6a11ddc..ebf6bf6a07e 100644
--- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
+++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.4 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.5 2014/10/05 01:59:08 ryoon Exp $
---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2013-09-10 03:43:47.000000000 +0000
+--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2014-09-24 01:05:32.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
@@ -7,6 +7,9 @@
# be found in the AUTHORS file in the root of the source tree.
@@ -12,10 +12,10 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
'targets': [
{
'target_name': 'video_capture_module',
-@@ -49,6 +52,16 @@
- }, { # include_internal_video_capture == 1
- 'conditions': [
- ['include_v4l2_video_capture==1', {
+@@ -46,6 +49,16 @@
+ 'linux/video_capture_linux.cc',
+ 'linux/video_capture_linux.h',
+ ],
+ 'conditions': [
+ ['use_libv4l2==1', {
+ 'defines': [
@@ -26,6 +26,6 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
+ ],
+ }],
+ ],
- 'include_dirs': [
- 'linux',
- ],
+ }], # linux
+ ['OS=="mac"', {
+ 'sources': [
diff --git a/www/firefox/patches/patch-memory_jemalloc_src_configure b/www/firefox/patches/patch-memory_jemalloc_src_configure
new file mode 100644
index 00000000000..8633d61d0bd
--- /dev/null
+++ b/www/firefox/patches/patch-memory_jemalloc_src_configure
@@ -0,0 +1,31 @@
+$NetBSD: patch-memory_jemalloc_src_configure,v 1.1 2014/10/05 01:59:08 ryoon Exp $
+
+--- memory/jemalloc/src/configure.orig 2014-09-24 01:05:32.000000000 +0000
++++ memory/jemalloc/src/configure
+@@ -6344,7 +6344,7 @@ else
+ fi
+
+ if test "x$have_sbrk" = "x1" ; then
+- if test "x$sbrk_deprecated" == "x1" ; then
++ if test "x$sbrk_deprecated" = "x1" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling dss allocation because sbrk is deprecated" >&5
+ $as_echo "Disabling dss allocation because sbrk is deprecated" >&6; }
+ enable_dss="0"
+@@ -6945,7 +6945,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $je_cv_gcc_builtin_ffsl" >&5
+ $as_echo "$je_cv_gcc_builtin_ffsl" >&6; }
+
+-if test "x${je_cv_gcc_builtin_ffsl}" == "xyes" ; then
++if test "x${je_cv_gcc_builtin_ffsl}" = "xyes" ; then
+ $as_echo "#define JEMALLOC_INTERNAL_FFSL __builtin_ffsl" >>confdefs.h
+
+ $as_echo "#define JEMALLOC_INTERNAL_FFS __builtin_ffs" >>confdefs.h
+@@ -6988,7 +6988,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $je_cv_function_ffsl" >&5
+ $as_echo "$je_cv_function_ffsl" >&6; }
+
+- if test "x${je_cv_function_ffsl}" == "xyes" ; then
++ if test "x${je_cv_function_ffsl}" = "xyes" ; then
+ $as_echo "#define JEMALLOC_INTERNAL_FFSL ffsl" >>confdefs.h
+
+ $as_echo "#define JEMALLOC_INTERNAL_FFS ffs" >>confdefs.h
diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
index f58f53189f9..f7c135c271a 100644
--- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
+++ b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm
@@ -1,9 +1,9 @@
-$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.3 2014/06/11 00:41:36 ryoon Exp $
+$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.4 2014/10/05 01:59:08 ryoon Exp $
---- toolkit/components/osfile/modules/osfile_unix_front.jsm.orig 2014-05-29 23:31:41.000000000 +0000
+--- toolkit/components/osfile/modules/osfile_unix_front.jsm.orig 2014-09-24 01:05:38.000000000 +0000
+++ toolkit/components/osfile/modules/osfile_unix_front.jsm
-@@ -373,7 +373,7 @@
- throw_on_negative("statvfs", UnixFile.statvfs(sourcePath, fileSystemInfoPtr));
+@@ -399,7 +399,7 @@
+ throw_on_negative("statvfs", (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr));
let bytes = new Type.uint64_t.implementation(
- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail);
diff --git a/www/firefox/patches/patch-webapprt_moz.build b/www/firefox/patches/patch-webapprt_moz.build
index ef137072d08..d62919908f0 100644
--- a/www/firefox/patches/patch-webapprt_moz.build
+++ b/www/firefox/patches/patch-webapprt_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-webapprt_moz.build,v 1.1 2014/05/29 17:03:58 pho Exp $
+$NetBSD: patch-webapprt_moz.build,v 1.2 2014/10/05 01:59:08 ryoon Exp $
Don't assume cocoa toolkit just because OS_ARCH is Darwin.
---- webapprt/moz.build.orig 2014-05-06 22:56:37.000000000 +0000
+--- webapprt/moz.build.orig 2014-09-24 01:05:40.000000000 +0000
+++ webapprt/moz.build
@@ -6,7 +6,7 @@
@@ -11,12 +11,5 @@ Don't assume cocoa toolkit just because OS_ARCH is Darwin.
-elif CONFIG['OS_ARCH'] == 'Darwin':
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
DIRS += ['mac']
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
- DIRS += ['gtk2']
-@@ -45,4 +45,4 @@ if CONFIG['MOZILLA_OFFICIAL']:
- DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
- DEFINES['MOZ_APP_BASENAME'] = CONFIG['MOZ_APP_BASENAME']
-
--JAR_MANIFESTS += ['jar.mn']
-\ No newline at end of file
-+JAR_MANIFESTS += ['jar.mn']
+ elif CONFIG['MOZ_ENABLE_GTK']:
+ DIRS += ['gtk']
diff --git a/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp b/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp
deleted file mode 100644
index a2e9fbbb2b2..00000000000
--- a/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-xpcom_base_nsDebugImpl.cpp,v 1.1 2014/06/11 00:41:36 ryoon Exp $
-
---- xpcom/base/nsDebugImpl.cpp.orig 2014-05-29 23:31:50.000000000 +0000
-+++ xpcom/base/nsDebugImpl.cpp
-@@ -44,12 +44,43 @@
- #endif
- #endif
-
--#if defined(XP_MACOSX)
-+#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
- #include <stdbool.h>
- #include <unistd.h>
-+#include <sys/param.h>
- #include <sys/sysctl.h>
- #endif
-
-+#if defined(__OpenBSD__)
-+#include <sys/proc.h>
-+#endif
-+
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <sys/user.h>
-+#endif
-+
-+#if defined(__NetBSD__)
-+#undef KERN_PROC
-+#define KERN_PROC KERN_PROC2
-+#define KINFO_PROC struct kinfo_proc2
-+#else
-+#define KINFO_PROC struct kinfo_proc
-+#endif
-+
-+#if defined(XP_MACOSX)
-+#define KP_FLAGS kp_proc.p_flag
-+#elif defined(__DragonFly__)
-+#define KP_FLAGS kp_flags
-+#elif defined(__FreeBSD__)
-+#define KP_FLAGS ki_flag
-+#elif defined(__OpenBSD__) && !defined(_P_TRACED)
-+#define KP_FLAGS p_psflags
-+#define P_TRACED PS_TRACED
-+#else
-+#define KP_FLAGS p_flag
-+#endif
-+
- #include "mozilla/mozalloc_abort.h"
-
- static void
-@@ -143,16 +174,22 @@ nsDebugImpl::GetIsDebuggerAttached(bool*
-
- #if defined(XP_WIN)
- *aResult = ::IsDebuggerPresent();
--#elif defined(XP_MACOSX)
-+#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
- // Specify the info we're looking for
-- int mib[4];
-- mib[0] = CTL_KERN;
-- mib[1] = KERN_PROC;
-- mib[2] = KERN_PROC_PID;
-- mib[3] = getpid();
-+ int mib[] = {
-+ CTL_KERN,
-+ KERN_PROC,
-+ KERN_PROC_PID,
-+ getpid(),
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+ sizeof(KINFO_PROC),
-+ 1,
-+#endif
-+ };
- size_t mibSize = sizeof(mib) / sizeof(int);
-
-- struct kinfo_proc info;
-+ KINFO_PROC info;
- size_t infoSize = sizeof(info);
- memset(&info, 0, infoSize);
-
-@@ -162,7 +199,7 @@ nsDebugImpl::GetIsDebuggerAttached(bool*
- return NS_OK;
- }
-
-- if (info.kp_proc.p_flag & P_TRACED) {
-+ if (info.KP_FLAGS & P_TRACED) {
- *aResult = true;
- }
- #endif
diff --git a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp
index 3f1b8984f3e..bdd8c099a8b 100644
--- a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp
+++ b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp
@@ -1,36 +1,20 @@
-$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.7 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.8 2014/10/05 01:59:08 ryoon Exp $
* Replace XP_MACOSX with XP_DARWIN as the former is not defined when
the toolkit is not cocoa.
---- xpcom/base/nsStackWalk.cpp.orig 2014-05-29 23:31:50.000000000 +0000
+--- xpcom/base/nsStackWalk.cpp.orig 2014-09-24 01:05:41.000000000 +0000
+++ xpcom/base/nsStackWalk.cpp
-@@ -33,8 +33,8 @@ static CriticalAddress gCriticalAddress;
- #include <dlfcn.h>
- #endif
-
--#define NSSTACKWALK_SUPPORTS_MACOSX \
-- (defined(XP_MACOSX) && \
-+#define NSSTACKWALK_SUPPORTS_DARWIN \
-+ (defined(XP_DARWIN) && \
- (defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE)))
-
- #define NSSTACKWALK_SUPPORTS_LINUX \
-@@ -42,11 +42,11 @@ static CriticalAddress gCriticalAddress;
- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
- defined(HAVE__UNWIND_BACKTRACE)))
-
--#define NSSTACKWALK_SUPPORTS_SOLARIS \
-+#define notNSSTACKWALK_SUPPORTS_SOLARIS \
- (defined(__sun) && \
- (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+@@ -47,7 +47,7 @@ static CriticalAddress gCriticalAddress;
+ (defined(__sun) && \
+ (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
-#if NSSTACKWALK_SUPPORTS_MACOSX
+#if NSSTACKWALK_SUPPORTS_DARWIN
#include <pthread.h>
#include <CoreServices/CoreServices.h>
-@@ -838,7 +838,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
+@@ -866,7 +866,7 @@ NS_FormatCodeAddressDetails(void* aPC, c
// WIN32 x86 stack walking code
// i386 or PPC Linux stackwalking code or Solaris
@@ -39,16 +23,16 @@ $NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.7 2014/06/11 00:40:59 ryoon Exp $
#include <stdlib.h>
#include <string.h>
-@@ -1162,7 +1162,7 @@ FramePointerStackWalk(NS_WalkStackCallba
+@@ -1191,7 +1191,7 @@ FramePointerStackWalk(NS_WalkStackCallba
(long(next) & 3)) {
break;
}
-#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__)
+#if (defined(__ppc__) && defined(XP_DARWIN)) || defined(__powerpc64__)
// ppc mac or powerpc64 linux
- void *pc = *(bp+2);
+ void* pc = *(bp + 2);
bp += 3;
-@@ -1192,7 +1192,7 @@ FramePointerStackWalk(NS_WalkStackCallba
+@@ -1221,7 +1221,7 @@ FramePointerStackWalk(NS_WalkStackCallba
}
#define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__))
diff --git a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
index 0a3c13c6b76..aa3f45ec8a3 100644
--- a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
+++ b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-xpcom_base_nsUUIDGenerator.cpp,v 1.4 2014/07/24 14:57:12 ryoon Exp $
+$NetBSD: patch-xpcom_base_nsUUIDGenerator.cpp,v 1.5 2014/10/05 01:59:08 ryoon Exp $
---- xpcom/base/nsUUIDGenerator.cpp.orig 2014-07-17 01:45:42.000000000 +0000
+--- xpcom/base/nsUUIDGenerator.cpp.orig 2014-09-24 01:05:41.000000000 +0000
+++ xpcom/base/nsUUIDGenerator.cpp
-@@ -15,6 +15,10 @@
+@@ -16,6 +16,10 @@
#include "nsUUIDGenerator.h"
@@ -13,57 +13,57 @@ $NetBSD: patch-xpcom_base_nsUUIDGenerator.cpp,v 1.4 2014/07/24 14:57:12 ryoon Ex
using namespace mozilla;
NS_IMPL_ISUPPORTS(nsUUIDGenerator, nsIUUIDGenerator)
-@@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
- // We're a service, so we're guaranteed that Init() is not going
- // to be reentered while we're inside Init().
-
+@@ -35,7 +39,7 @@ nsUUIDGenerator::Init()
+ // We're a service, so we're guaranteed that Init() is not going
+ // to be reentered while we're inside Init().
+
-#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
- /* initialize random number generator using NSPR random noise */
- unsigned int seed;
+ /* initialize random number generator using NSPR random noise */
+ unsigned int seed;
-@@ -67,7 +71,7 @@ nsUUIDGenerator::Init()
- return NS_ERROR_FAILURE;
+@@ -72,7 +76,7 @@ nsUUIDGenerator::Init()
+ }
#endif
-#endif /* non XP_WIN and non XP_MACOSX */
+#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
- return NS_OK;
+ return NS_OK;
}
-@@ -114,13 +118,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
- * back to it; instead, we use the value returned when we called
- * initstate, since older glibc's have broken setstate() return values
- */
+@@ -122,13 +126,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+ * back to it; instead, we use the value returned when we called
+ * initstate, since older glibc's have broken setstate() return values
+ */
-#ifndef ANDROID
+#ifndef HAVE_ARC4RANDOM
- setstate(mState);
+ setstate(mState);
#endif
+#ifdef HAVE_ARC4RANDOM_BUF
-+ arc4random_buf(id, sizeof(nsID));
++ arc4random_buf(aId, sizeof(nsID));
+#else /* HAVE_ARC4RANDOM_BUF */
- size_t bytesLeft = sizeof(nsID);
- while (bytesLeft > 0) {
+ size_t bytesLeft = sizeof(nsID);
+ while (bytesLeft > 0) {
-#ifdef ANDROID
+#ifdef HAVE_ARC4RANDOM
- long rval = arc4random();
- const size_t mRBytes = 4;
+ long rval = arc4random();
+ const size_t mRBytes = 4;
#else
-@@ -141,6 +148,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -150,6 +157,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
- bytesLeft -= toWrite;
- }
+ bytesLeft -= toWrite;
+ }
+#endif /* HAVE_ARC4RANDOM_BUF */
- /* Put in the version */
- id->m2 &= 0x0fff;
-@@ -150,7 +158,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
- id->m3[0] &= 0x3f;
- id->m3[0] |= 0x80;
+ /* Put in the version */
+ aId->m2 &= 0x0fff;
+@@ -159,7 +167,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+ aId->m3[0] &= 0x3f;
+ aId->m3[0] |= 0x80;
-#ifndef ANDROID
+#ifndef HAVE_ARC4RANDOM
- /* Restore the previous RNG state */
- setstate(mSavedState);
+ /* Restore the previous RNG state */
+ setstate(mSavedState);
#endif
diff --git a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h
index eb194c2705c..919edf99b8d 100644
--- a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h
+++ b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-xpcom_base_nsUUIDGenerator.h,v 1.3 2014/06/11 00:41:36 ryoon Exp $
+$NetBSD: patch-xpcom_base_nsUUIDGenerator.h,v 1.4 2014/10/05 01:59:08 ryoon Exp $
---- xpcom/base/nsUUIDGenerator.h.orig 2014-05-29 23:31:50.000000000 +0000
+--- xpcom/base/nsUUIDGenerator.h.orig 2014-09-24 01:05:41.000000000 +0000
+++ xpcom/base/nsUUIDGenerator.h
-@@ -27,7 +27,7 @@ private:
+@@ -29,7 +29,7 @@ private:
protected:
- mozilla::Mutex mLock;
+ mozilla::Mutex mLock;
-#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
- char mState[128];
- char *mSavedState;
- uint8_t mRBytes;
+ char mState[128];
+ char* mSavedState;
+ uint8_t mRBytes;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 18:07:34 +0000