summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/Makefile9
-rw-r--r--www/firefox/PLIST147
-rw-r--r--www/firefox/distinfo54
-rw-r--r--www/firefox/mozilla-common.mk10
-rw-r--r--www/firefox/patches/patch-aa76
-rw-r--r--www/firefox/patches/patch-al16
-rw-r--r--www/firefox/patches/patch-as16
-rw-r--r--www/firefox/patches/patch-config_external_moz.build22
-rw-r--r--www/firefox/patches/patch-gfx_thebes_gfxWindowsPlatform.cpp15
-rw-r--r--www/firefox/patches/patch-intl_unicharutil_util_moz.build7
-rw-r--r--www/firefox/patches/patch-js_src_Makefile.in14
-rw-r--r--www/firefox/patches/patch-js_src_gc_Statistics.cpp15
-rw-r--r--www/firefox/patches/patch-js_src_jit-LIR.cpp10
-rw-r--r--www/firefox/patches/patch-js_src_jit_MIR.cpp10
-rw-r--r--www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp6
-rw-r--r--www/firefox/patches/patch-media_libcubeb_src_moz.build10
-rw-r--r--www/firefox/patches/patch-media_libtheora_moz.build10
-rw-r--r--www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp12
-rw-r--r--www/firefox/patches/patch-mobile_android_installer_Makefile.in15
-rw-r--r--www/firefox/patches/patch-mobile_android_installer_package-manifest.in13
-rw-r--r--www/firefox/patches/patch-modules_libpref_init_all.js4
-rw-r--r--www/firefox/patches/patch-mozglue_misc_StackWalk.cpp13
-rw-r--r--www/firefox/patches/patch-rc12
-rw-r--r--www/firefox/patches/patch-security_manager_ssl_nsNSSComponent.cpp12
-rw-r--r--www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp12
-rw-r--r--www/firefox/patches/patch-storage_SQLiteMutex.h (renamed from www/firefox/patches/patch-bg)8
-rw-r--r--www/firefox/patches/patch-storage_mozStorageConnection.cpp18
-rw-r--r--www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h13
-rw-r--r--www/firefox/patches/patch-toolkit_modules_GMPInstallManager.jsm30
-rw-r--r--www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm12
-rw-r--r--www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp59
-rw-r--r--www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp28
-rw-r--r--www/firefox/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp17
-rw-r--r--www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in24
-rw-r--r--www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build8
35 files changed, 295 insertions, 462 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 96be25f6231..a3271dce9c3 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.225 2015/08/30 09:29:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.226 2015/09/23 06:44:41 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 40.0
-MOZ_BRANCH_MINOR= .3
+MOZ_BRANCH= 41.0
+MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION= 1
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
WRKSRC= ${WRKDIR}/mozilla-release
#WRKSRC= ${WRKDIR}/mozilla-beta
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 8bd69267f46..cbb355895ac 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.99 2015/08/11 23:48:17 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.100 2015/09/23 06:44:41 ryoon Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -78,12 +78,6 @@ lib/firefox/browser/chrome/browser/content/browser/blockedSite.xhtml
lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.js
lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.xul
lib/firefox/browser/chrome/browser/content/browser/bookmarks/sidebarUtils.js
-lib/firefox/browser/chrome/browser/content/browser/browser-pocket-de.properties
-lib/firefox/browser/chrome/browser/content/browser/browser-pocket-en-US.properties
-lib/firefox/browser/chrome/browser/content/browser/browser-pocket-es-ES.properties
-lib/firefox/browser/chrome/browser/content/browser/browser-pocket-ja.properties
-lib/firefox/browser/chrome/browser/content/browser/browser-pocket-ru.properties
-lib/firefox/browser/chrome/browser/content/browser/browser-pocket.dtd
lib/firefox/browser/chrome/browser/content/browser/browser-tabPreviews.xml
lib/firefox/browser/chrome/browser/content/browser/browser.css
lib/firefox/browser/chrome/browser/content/browser/browser.js
@@ -196,6 +190,7 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/debugger/tracer-view
lib/firefox/browser/chrome/browser/content/browser/devtools/debugger/utils.js
lib/firefox/browser/chrome/browser/content/browser/devtools/debugger/variable-bubble-view.js
lib/firefox/browser/chrome/browser/content/browser/devtools/debugger/watch-expressions-view.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/debugger/workers-view.js
lib/firefox/browser/chrome/browser/content/browser/devtools/eyedropper.xul
lib/firefox/browser/chrome/browser/content/browser/devtools/eyedropper/crosshairs.css
lib/firefox/browser/chrome/browser/content/browser/devtools/eyedropper/nocursor.css
@@ -218,7 +213,6 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/framework/toolbox.xu
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
lib/firefox/browser/chrome/browser/content/browser/devtools/layoutview/view.js
lib/firefox/browser/chrome/browser/content/browser/devtools/layoutview/view.xhtml
lib/firefox/browser/chrome/browser/content/browser/devtools/markup-view.css
@@ -232,15 +226,16 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/netmonitor.xul
lib/firefox/browser/chrome/browser/content/browser/devtools/performance.xul
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/performance-controller.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/performance-view.js
-lib/firefox/browser/chrome/browser/content/browser/devtools/performance/system.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details-js-call-tree.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details-js-flamegraph.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details-memory-call-tree.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details-memory-flamegraph.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details-optimizations.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details-subview.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details-waterfall.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/details.js
-lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/jit-optimizations.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/frames-list.js
+lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/optimizations-list.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/overview.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/recordings.js
lib/firefox/browser/chrome/browser/content/browser/devtools/performance/views/toolbar.js
@@ -249,9 +244,7 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-loader
lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-test.xul
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
lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad.js
lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad.xul
lib/firefox/browser/chrome/browser/content/browser/devtools/shadereditor.js
@@ -292,6 +285,9 @@ 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/gcli_sec_bad.svg
+lib/firefox/browser/chrome/browser/content/browser/gcli_sec_good.svg
+lib/firefox/browser/chrome/browser/content/browser/gcli_sec_moderate.svg
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
@@ -310,20 +306,6 @@ lib/firefox/browser/chrome/browser/content/browser/loop/js/roomViews.js
lib/firefox/browser/chrome/browser/content/browser/loop/libs/l10n.js
lib/firefox/browser/chrome/browser/content/browser/loop/libs/sdk.js
lib/firefox/browser/chrome/browser/content/browser/loop/panel.html
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/css/ot.css
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-chrome.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-copy-firefox.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-firefox.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-predenied-chrome.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-prompt-chrome.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/audioonly-publisher.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/audioonly-subscriber.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/buttons.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/loader.gif
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/mic-off.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/mic-on.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/speaker-off.png
-lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/speaker-on.png
lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/js/dynamic_config.min.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/common.css
lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/conversation.css
@@ -334,6 +316,8 @@ lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-call-av
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14.png
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14@2x.png
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/beta-ribbon.svg
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/chatbubble-arrow-left.svg
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/chatbubble-arrow-right.svg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/check.svg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/dropdown-inverse.png
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/dropdown-inverse@2x.png
@@ -353,6 +337,7 @@ lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-14x14@2x.png
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/sad.png
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/spinner.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/spinner.svg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/spinner@2x.png
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-account-16x16.svg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-help-16x16.svg
@@ -373,11 +358,15 @@ lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/feedbackApiCli
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/feedbackStore.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/feedbackViews.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/fxOSActiveRoomStore.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/linkifiedTextView.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/mixins.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/models.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/otSdkDriver.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/roomStates.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/store.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/textChatStore.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/textChatView.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/urlRegExps.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/utils.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/validate.js
lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/views.js
@@ -389,6 +378,7 @@ lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/react-0.12.2
lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/connected.ogg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/connecting.ogg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/failure.ogg
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/message.ogg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/ringtone.ogg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/room-joined-in.ogg
lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/room-joined.ogg
@@ -457,7 +447,6 @@ lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_close@1
lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_close@2x.png
lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive@1x.png
lib/firefox/browser/chrome/browser/content/browser/pocket/panels/img/tag_closeactive@2x.png
-lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/dictionary.js
lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/messages.js
lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/saved.js
lib/firefox/browser/chrome/browser/content/browser/pocket/panels/js/signup.js
@@ -548,6 +537,7 @@ lib/firefox/browser/chrome/browser/content/browser/searchSuggestionUI.css
lib/firefox/browser/chrome/browser/content/browser/searchSuggestionUI.js
lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.js
lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.xul
+lib/firefox/browser/chrome/browser/content/browser/social-content.js
lib/firefox/browser/chrome/browser/content/browser/socialchat.xml
lib/firefox/browser/chrome/browser/content/browser/socialmarks.xml
lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs-bindings.xml
@@ -563,8 +553,6 @@ lib/firefox/browser/chrome/browser/content/browser/sync/genericChange.js
lib/firefox/browser/chrome/browser/content/browser/sync/genericChange.xul
lib/firefox/browser/chrome/browser/content/browser/sync/key.xhtml
lib/firefox/browser/chrome/browser/content/browser/sync/notification.xml
-lib/firefox/browser/chrome/browser/content/browser/sync/progress.js
-lib/firefox/browser/chrome/browser/content/browser/sync/progress.xhtml
lib/firefox/browser/chrome/browser/content/browser/sync/quota.js
lib/firefox/browser/chrome/browser/content/browser/sync/quota.xul
lib/firefox/browser/chrome/browser/content/browser/sync/setup.js
@@ -592,7 +580,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Privacy-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Push-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Push-64.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Secure.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Security-broken.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-inverted.png
lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-small.png
@@ -612,6 +599,14 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSyncTabs.css
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutTabCrashed.css
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutWelcomeBack.css
lib/firefox/browser/chrome/browser/skin/classic/browser/actionicon-tab.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-anchor.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-confirm.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-downloading.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-error.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-installed.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-restart.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-warning.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/bad-content-blocked-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/bad-content-blocked-16@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/bad-content-blocked-64.png
@@ -622,6 +617,11 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme
lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css
lib/firefox/browser/chrome/browser/skin/classic/browser/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/controlcenter/arrow-subview.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/conn-not-secure.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/conn-secure.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/panel.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/permissions.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
@@ -646,6 +646,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devedition/urlbar-histor
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/add.svg
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/animation-fast-track.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/animationinspector.css
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
@@ -720,6 +721,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-o
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-maximize@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-bottom-minimize@2x.png
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.svg
@@ -764,8 +767,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/performance.css
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/power.svg
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/projecteditor/projecteditor.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/pseudo-class.svg
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
@@ -801,6 +804,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-options.sv
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-profiler-active.svg
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-shadereditor.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-storage.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
@@ -826,8 +830,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-open-insp
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.svg
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
@@ -845,6 +848,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/subscribe-ui.css
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/subscribe.css
lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen-darknoise.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/default-profile-image.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-icon.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-star-lit.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-star-off.svg
@@ -858,7 +862,6 @@ 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@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https.png
lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https@2x.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/identity.png
lib/firefox/browser/chrome/browser/skin/classic/browser/loop/menuPanel.png
lib/firefox/browser/chrome/browser/skin/classic/browser/loop/menuPanel@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/loop/toolbar-inverted.png
@@ -924,7 +927,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/default-profile-image.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
@@ -975,7 +977,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-menuPanel.p
lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-menuPanel@2x.png
lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar-inverted.png
lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress.css
lib/firefox/browser/chrome/browser/skin/classic/browser/syncQuota.css
lib/firefox/browser/chrome/browser/skin/classic/browser/syncSetup.css
lib/firefox/browser/chrome/browser/skin/classic/browser/tab-crashed.svg
@@ -994,7 +995,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-backgroun
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/tabDragIndicator.png
@@ -1057,6 +1057,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/aboutTabCrashed.dtd
lib/firefox/browser/chrome/en-US/locale/browser/accounts.properties
lib/firefox/browser/chrome/en-US/locale/browser/appstrings.properties
lib/firefox/browser/chrome/en-US/locale/browser/baseMenuOverlay.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/browser-pocket.properties
lib/firefox/browser/chrome/en-US/locale/browser/browser.dtd
lib/firefox/browser/chrome/en-US/locale/browser/browser.properties
lib/firefox/browser/chrome/en-US/locale/browser/customizableui/customizableWidgets.properties
@@ -1077,6 +1078,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/devtools/eyedropper.properties
lib/firefox/browser/chrome/en-US/locale/browser/devtools/filterwidget.dtd
lib/firefox/browser/chrome/en-US/locale/browser/devtools/filterwidget.properties
lib/firefox/browser/chrome/en-US/locale/browser/devtools/font-inspector.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/devtools/har.properties
lib/firefox/browser/chrome/en-US/locale/browser/devtools/inspector.dtd
lib/firefox/browser/chrome/en-US/locale/browser/devtools/inspector.properties
lib/firefox/browser/chrome/en-US/locale/browser/devtools/jsonview.properties
@@ -1176,7 +1178,6 @@ lib/firefox/browser/chrome/en-US/locale/browser/syncBrand.dtd
lib/firefox/browser/chrome/en-US/locale/browser/syncCustomize.dtd
lib/firefox/browser/chrome/en-US/locale/browser/syncGenericChange.properties
lib/firefox/browser/chrome/en-US/locale/browser/syncKey.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/syncProgress.dtd
lib/firefox/browser/chrome/en-US/locale/browser/syncQuota.dtd
lib/firefox/browser/chrome/en-US/locale/browser/syncQuota.properties
lib/firefox/browser/chrome/en-US/locale/browser/syncSetup.dtd
@@ -1536,6 +1537,7 @@ lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/firefox/browser/icons/mozicon128.png
lib/firefox/browser/modules/AboutHome.jsm
+lib/firefox/browser/modules/AboutNewTab.jsm
lib/firefox/browser/modules/BrowserUITelemetry.jsm
lib/firefox/browser/modules/CastingApps.jsm
lib/firefox/browser/modules/Chat.jsm
@@ -1551,7 +1553,6 @@ lib/firefox/browser/modules/CustomizationTabPreloader.jsm
lib/firefox/browser/modules/CustomizeMode.jsm
lib/firefox/browser/modules/DirectoryLinksProvider.jsm
lib/firefox/browser/modules/DownloadsCommon.jsm
-lib/firefox/browser/modules/DownloadsLogger.jsm
lib/firefox/browser/modules/DownloadsTaskbar.jsm
lib/firefox/browser/modules/DownloadsViewUI.jsm
lib/firefox/browser/modules/DragPositionManager.jsm
@@ -1562,6 +1563,7 @@ lib/firefox/browser/modules/FormValidationHandler.jsm
lib/firefox/browser/modules/HiddenFrame.jsm
lib/firefox/browser/modules/MigrationUtils.jsm
lib/firefox/browser/modules/NetworkPrioritizer.jsm
+lib/firefox/browser/modules/NewTabURL.jsm
lib/firefox/browser/modules/PanelFrame.jsm
lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
lib/firefox/browser/modules/PlacesUIUtils.jsm
@@ -1585,7 +1587,6 @@ lib/firefox/browser/modules/devtools/Chart.jsm
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/Graphs.jsm
lib/firefox/browser/modules/devtools/GraphsWorker.js
lib/firefox/browser/modules/devtools/Jsbeautify.jsm
lib/firefox/browser/modules/devtools/Parser.jsm
@@ -1600,6 +1601,7 @@ lib/firefox/browser/modules/devtools/VariablesView.jsm
lib/firefox/browser/modules/devtools/VariablesViewController.jsm
lib/firefox/browser/modules/devtools/ViewHelpers.jsm
lib/firefox/browser/modules/devtools/animationinspector/components.js
+lib/firefox/browser/modules/devtools/animationinspector/utils.js
lib/firefox/browser/modules/devtools/app-manager/app-projects.js
lib/firefox/browser/modules/devtools/app-manager/app-validator.js
lib/firefox/browser/modules/devtools/app-manager/builtin-adb-store.js
@@ -1629,6 +1631,12 @@ lib/firefox/browser/modules/devtools/inspector/selector-search.js
lib/firefox/browser/modules/devtools/main.js
lib/firefox/browser/modules/devtools/markupview/html-editor.js
lib/firefox/browser/modules/devtools/markupview/markup-view.js
+lib/firefox/browser/modules/devtools/netmonitor/har/har-automation.js
+lib/firefox/browser/modules/devtools/netmonitor/har/har-builder.js
+lib/firefox/browser/modules/devtools/netmonitor/har/har-collector.js
+lib/firefox/browser/modules/devtools/netmonitor/har/har-exporter.js
+lib/firefox/browser/modules/devtools/netmonitor/har/har-utils.js
+lib/firefox/browser/modules/devtools/netmonitor/har/toolbox-overlay.js
lib/firefox/browser/modules/devtools/netmonitor/panel.js
lib/firefox/browser/modules/devtools/performance/actors.js
lib/firefox/browser/modules/devtools/performance/compatibility.js
@@ -1640,13 +1648,16 @@ lib/firefox/browser/modules/devtools/performance/io.js
lib/firefox/browser/modules/devtools/performance/jit.js
lib/firefox/browser/modules/devtools/performance/marker-details.js
lib/firefox/browser/modules/devtools/performance/marker-utils.js
+lib/firefox/browser/modules/devtools/performance/marker-view.js
lib/firefox/browser/modules/devtools/performance/markers-overview.js
+lib/firefox/browser/modules/devtools/performance/markers.js
lib/firefox/browser/modules/devtools/performance/panel.js
lib/firefox/browser/modules/devtools/performance/recording-model.js
lib/firefox/browser/modules/devtools/performance/recording-utils.js
lib/firefox/browser/modules/devtools/performance/tree-model.js
lib/firefox/browser/modules/devtools/performance/tree-view.js
-lib/firefox/browser/modules/devtools/performance/waterfall.js
+lib/firefox/browser/modules/devtools/performance/waterfall-ticks.js
+lib/firefox/browser/modules/devtools/performance/waterfall-utils.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
@@ -1695,18 +1706,20 @@ lib/firefox/browser/modules/devtools/shared/telemetry.js
lib/firefox/browser/modules/devtools/shared/theme-switching.js
lib/firefox/browser/modules/devtools/shared/theme.js
lib/firefox/browser/modules/devtools/shared/undo.js
+lib/firefox/browser/modules/devtools/shared/widgets/BarGraphWidget.js
lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierPresets.js
lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierWidget.js
lib/firefox/browser/modules/devtools/shared/widgets/FastListWidget.js
lib/firefox/browser/modules/devtools/shared/widgets/FilterWidget.js
lib/firefox/browser/modules/devtools/shared/widgets/FlameGraph.js
+lib/firefox/browser/modules/devtools/shared/widgets/Graphs.js
+lib/firefox/browser/modules/devtools/shared/widgets/LineGraphWidget.js
lib/firefox/browser/modules/devtools/shared/widgets/MdnDocsWidget.js
+lib/firefox/browser/modules/devtools/shared/widgets/MountainGraphWidget.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/shared/worker-helper.js
-lib/firefox/browser/modules/devtools/shared/worker.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
@@ -1791,6 +1804,7 @@ lib/firefox/browser/modules/sessionstore/SessionWorker.jsm
lib/firefox/browser/modules/sessionstore/TabAttributes.jsm
lib/firefox/browser/modules/sessionstore/TabState.jsm
lib/firefox/browser/modules/sessionstore/TabStateCache.jsm
+lib/firefox/browser/modules/sessionstore/TabStateFlusher.jsm
lib/firefox/browser/modules/sessionstore/Utils.jsm
lib/firefox/browser/modules/tabview/utils.jsm
lib/firefox/browser/modules/translation/BingTranslator.jsm
@@ -1798,6 +1812,7 @@ 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/YandexTranslator.jsm
lib/firefox/browser/modules/translation/cld-worker.js
lib/firefox/browser/modules/translation/cld-worker.js.mem
lib/firefox/browser/modules/webrtcUI.jsm
@@ -2034,8 +2049,11 @@ lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.js
lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.xul
lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.js
lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.xhtml
+lib/firefox/chrome/toolkit/content/gfxsanity/sanitytest.html
+lib/firefox/chrome/toolkit/content/gfxsanity/videotest.mp4
lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js
lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js
+lib/firefox/chrome/toolkit/content/global/BrowserElementCopyPaste.js
lib/firefox/chrome/toolkit/content/global/BrowserElementPanning.js
lib/firefox/chrome/toolkit/content/global/BrowserElementPanningAPZDisabled.js
lib/firefox/chrome/toolkit/content/global/PushServiceChildPreload.js
@@ -2159,7 +2177,6 @@ lib/firefox/chrome/toolkit/content/global/nsUserSettings.js
lib/firefox/chrome/toolkit/content/global/platformHTMLBindings.xml
lib/firefox/chrome/toolkit/content/global/plugins.css
lib/firefox/chrome/toolkit/content/global/plugins.html
-lib/firefox/chrome/toolkit/content/global/post-fork-preload.js
lib/firefox/chrome/toolkit/content/global/preload.js
lib/firefox/chrome/toolkit/content/global/printPageSetup.js
lib/firefox/chrome/toolkit/content/global/printPageSetup.xul
@@ -2193,6 +2210,7 @@ lib/firefox/chrome/toolkit/content/global/textbox.css
lib/firefox/chrome/toolkit/content/global/treeUtils.js
lib/firefox/chrome/toolkit/content/global/viewPartialSource.js
lib/firefox/chrome/toolkit/content/global/viewPartialSource.xul
+lib/firefox/chrome/toolkit/content/global/viewSource-content.js
lib/firefox/chrome/toolkit/content/global/viewSource.css
lib/firefox/chrome/toolkit/content/global/viewSource.js
lib/firefox/chrome/toolkit/content/global/viewSource.xul
@@ -2277,6 +2295,8 @@ lib/firefox/chrome/toolkit/res/hiddenWindow.html
lib/firefox/chrome/toolkit/res/html.css
lib/firefox/chrome/toolkit/res/loading-image.png
lib/firefox/chrome/toolkit/res/mathml.css
+lib/firefox/chrome/toolkit/res/noframes.css
+lib/firefox/chrome/toolkit/res/noscript.css
lib/firefox/chrome/toolkit/res/number-control.css
lib/firefox/chrome/toolkit/res/plaintext.css
lib/firefox/chrome/toolkit/res/quirk.css
@@ -2403,8 +2423,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown.svg
lib/firefox/chrome/toolkit/skin/classic/global/in-content/help-glyph.svg
lib/firefox/chrome/toolkit/skin/classic/global/in-content/info-pages.css
lib/firefox/chrome/toolkit/skin/classic/global/in-content/radio.svg
-lib/firefox/chrome/toolkit/skin/classic/global/inContentUI.css
-lib/firefox/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png
lib/firefox/chrome/toolkit/skin/classic/global/linkTree.css
lib/firefox/chrome/toolkit/skin/classic/global/listbox.css
lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
@@ -2714,6 +2732,7 @@ lib/firefox/hyphenation/hyph_sl.dic
lib/firefox/hyphenation/hyph_sv.dic
lib/firefox/hyphenation/hyph_tr.dic
lib/firefox/hyphenation/hyph_uk.dic
+lib/firefox/libmozsqlite3.so
${PLIST.mozglue}lib/firefox/libmozglue.so
lib/firefox/libxul.so
lib/firefox/modules/AboutReader.jsm
@@ -2807,6 +2826,7 @@ lib/firefox/modules/HealthReport.jsm
lib/firefox/modules/History.jsm
lib/firefox/modules/Http.jsm
lib/firefox/modules/ISO8601DateUtils.jsm
+lib/firefox/modules/ImageObjectProcessor.js
lib/firefox/modules/ImportExport.jsm
lib/firefox/modules/IndexedDBHelper.jsm
lib/firefox/modules/InlineSpellChecker.jsm
@@ -2826,8 +2846,9 @@ lib/firefox/modules/LoginManagerContent.jsm
lib/firefox/modules/LoginManagerParent.jsm
lib/firefox/modules/LoginRecipes.jsm
lib/firefox/modules/LoginStore.jsm
-lib/firefox/modules/ManifestObtainer.jsm
-lib/firefox/modules/ManifestProcessor.jsm
+lib/firefox/modules/ManifestObtainer.js
+lib/firefox/modules/ManifestProcessor.js
+lib/firefox/modules/MatchPattern.jsm
lib/firefox/modules/MessagePortBase.jsm
lib/firefox/modules/MessagePortWorker.js
lib/firefox/modules/Metrics.jsm
@@ -2872,7 +2893,10 @@ lib/firefox/modules/Promise.jsm
lib/firefox/modules/PromiseUtils.jsm
lib/firefox/modules/PromiseWorker.jsm
lib/firefox/modules/PropertyListUtils.jsm
+lib/firefox/modules/PushDB.jsm
lib/firefox/modules/PushService.jsm
+lib/firefox/modules/PushServiceHttp2.jsm
+lib/firefox/modules/PushServiceWebSocket.jsm
lib/firefox/modules/ReaderMode.jsm
lib/firefox/modules/RemoteAddonsChild.jsm
lib/firefox/modules/RemoteAddonsParent.jsm
@@ -2915,6 +2939,8 @@ lib/firefox/modules/TelemetryArchive.jsm
lib/firefox/modules/TelemetryController.jsm
lib/firefox/modules/TelemetryEnvironment.jsm
lib/firefox/modules/TelemetryLog.jsm
+lib/firefox/modules/TelemetryReportingPolicy.jsm
+lib/firefox/modules/TelemetrySend.jsm
lib/firefox/modules/TelemetrySession.jsm
lib/firefox/modules/TelemetryStopwatch.jsm
lib/firefox/modules/TelemetryStorage.jsm
@@ -2929,7 +2955,15 @@ lib/firefox/modules/UpdateChannel.jsm
lib/firefox/modules/UserAgentOverrides.jsm
lib/firefox/modules/UserAgentUpdates.jsm
lib/firefox/modules/UserCustomizations.jsm
+lib/firefox/modules/ValueExtractor.js
+lib/firefox/modules/ViewSourceBrowser.jsm
lib/firefox/modules/WebChannel.jsm
+lib/firefox/modules/WebManifest.jsm
+lib/firefox/modules/WebNavigation.jsm
+lib/firefox/modules/WebNavigationContent.js
+lib/firefox/modules/WebRequest.jsm
+lib/firefox/modules/WebRequestCommon.jsm
+lib/firefox/modules/WebRequestContent.js
lib/firefox/modules/WebappOSUtils.jsm
lib/firefox/modules/Webapps.jsm
lib/firefox/modules/WindowDraggingUtils.jsm
@@ -3268,6 +3302,7 @@ lib/firefox/modules/devtools/gcli/commands/preflist.js
lib/firefox/modules/devtools/gcli/commands/restart.js
lib/firefox/modules/devtools/gcli/commands/rulers.js
lib/firefox/modules/devtools/gcli/commands/screenshot.js
+lib/firefox/modules/devtools/gcli/commands/security.js
lib/firefox/modules/devtools/gcli/commands/test.js
lib/firefox/modules/devtools/gcli/commands/tools.js
lib/firefox/modules/devtools/gcli/connectors/connectors.js
@@ -3362,9 +3397,11 @@ 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/monitor.js
+lib/firefox/modules/devtools/server/actors/object.js
lib/firefox/modules/devtools/server/actors/preference.js
lib/firefox/modules/devtools/server/actors/pretty-print-worker.js
lib/firefox/modules/devtools/server/actors/profiler.js
+lib/firefox/modules/devtools/server/actors/promises.js
lib/firefox/modules/devtools/server/actors/root.js
lib/firefox/modules/devtools/server/actors/script.js
lib/firefox/modules/devtools/server/actors/settings.js
@@ -3382,18 +3419,25 @@ lib/firefox/modules/devtools/server/actors/utils/audionodes.json
lib/firefox/modules/devtools/server/actors/utils/automation-timeline.js
lib/firefox/modules/devtools/server/actors/utils/make-debugger.js
lib/firefox/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
-lib/firefox/modules/devtools/server/actors/utils/memory-bridge.js
lib/firefox/modules/devtools/server/actors/utils/stack.js
lib/firefox/modules/devtools/server/actors/webapps.js
lib/firefox/modules/devtools/server/actors/webaudio.js
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/actors/worker.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/worker.js
lib/firefox/modules/devtools/shared/async-storage.js
+lib/firefox/modules/devtools/shared/framerate.js
+lib/firefox/modules/devtools/shared/memory.js
+lib/firefox/modules/devtools/shared/system.js
+lib/firefox/modules/devtools/shared/timeline.js
+lib/firefox/modules/devtools/shared/worker-helper.js
+lib/firefox/modules/devtools/shared/worker.js
lib/firefox/modules/devtools/source-map.js
lib/firefox/modules/devtools/styleinspector/css-logic.js
lib/firefox/modules/devtools/tern/browser.js
@@ -3408,7 +3452,8 @@ 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/touch/simulator-content.js
+lib/firefox/modules/devtools/touch/simulator.js
lib/firefox/modules/devtools/transport/packets.js
lib/firefox/modules/devtools/transport/stream-utils.js
lib/firefox/modules/devtools/transport/transport.js
@@ -3522,9 +3567,7 @@ lib/firefox/res/entityTables/html40Special.properties
lib/firefox/res/entityTables/html40Symbols.properties
lib/firefox/res/entityTables/mathml20.properties
lib/firefox/res/fonts/mathfont.properties
-lib/firefox/res/fonts/mathfontMathJax_Main.properties
lib/firefox/res/fonts/mathfontSTIXGeneral.properties
-lib/firefox/res/fonts/mathfontStandardSymbolsL.properties
lib/firefox/res/fonts/mathfontUnicode.properties
lib/firefox/res/grabber.gif
lib/firefox/res/html/folder.png
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 24750a3104e..c45003d8d8a 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.214 2015/08/30 09:29:15 ryoon Exp $
+$NetBSD: distinfo,v 1.215 2015/09/23 06:44:41 ryoon Exp $
-SHA1 (firefox-40.0.3.source.tar.bz2) = 6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13
-RMD160 (firefox-40.0.3.source.tar.bz2) = 640b728067690744fc979093018f19d3b1fd546c
-Size (firefox-40.0.3.source.tar.bz2) = 178261482 bytes
-SHA1 (patch-aa) = 4cd96ed9fc9eb9b36077a0382c7c5c3f37f435e5
-SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
+SHA1 (firefox-41.0.source.tar.xz) = 0ce7a5ccdf671a6c98eaac07d06d49a895a99449
+RMD160 (firefox-41.0.source.tar.xz) = bb0297d545feaca8566a4b69fc14a2c142aa9bf6
+Size (firefox-41.0.source.tar.xz) = 159785356 bytes
+SHA1 (patch-aa) = 5a5cdde09e66edbc9986a4a71f39f9173fe186e2
SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
-SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a
+SHA1 (patch-as) = 05f31f318155e0f927e13754c0fec5f4d50a39dc
SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0
SHA1 (patch-b2g_installer_package-manifest.in) = daf8468729a96875d346643d4f9df54a39a4bdd7
SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
-SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
SHA1 (patch-browser_app_nsBrowserApp.cpp) = 2957fa349b34d41b273be689a97cfbc613cead02
SHA1 (patch-browser_installer_package-manifest.in) = aee56636fc83ea6441c5303ef0297971b41516d1
SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
@@ -19,7 +17,7 @@ SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f
SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3
SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
-SHA1 (patch-config_external_moz.build) = cacef877270c4314e73ff6e943c70eb378b28509
+SHA1 (patch-config_external_moz.build) = fa4f350b077f5c4a1d7a07d123c635bd9c7f1f75
SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd
SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
@@ -42,12 +40,13 @@ SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76
SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
SHA1 (patch-gfx_skia_generate__mozbuild.py) = b15b7586cfbdea112bcf4b5792663f4cdbe91560
SHA1 (patch-gfx_skia_moz.build) = 2537653a708b986d179d17ffdb56e88fe147290c
+SHA1 (patch-gfx_thebes_gfxWindowsPlatform.cpp) = 55f978ab302dea08e13dfb1b09f460f10d4f5dc8
SHA1 (patch-gfx_thebes_moz.build) = f64917350eaf693866b0e7196cb7f1cc9e9470fc
SHA1 (patch-gfx_ycbcr_moz.build) = 121386ef62ff7425e6f93bc624555199f2ac3485
SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = f9909ded72762b2c3547dd002707db43745f2b9d
SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 522c46732d44be15411d39e16c89bc848d5c6f7a
SHA1 (patch-intl_hyphenation_hnjalloc.h) = 5b5ac622ed2dd8711f00be0af59c95ebc86a8a78
-SHA1 (patch-intl_unicharutil_util_moz.build) = 1e8eb1f6e66ed80a1689e2205a7d04efe5243d5b
+SHA1 (patch-intl_unicharutil_util_moz.build) = 91fdd9b4eae9cdfe5b7366213296ee13c9b31b3a
SHA1 (patch-ipc_chromium_Makefile.in) = edd85b79cd3879f7595b932442bb0e93505d5506
SHA1 (patch-ipc_chromium_moz.build) = de12255865e45cfdf0f7dc57ce101be75ac8ad54
SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a
@@ -72,14 +71,12 @@ SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f0449710
SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2
SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
SHA1 (patch-js_public_CallArgs.h) = fde9a73b8a694c4c7415848aa25e14ccefe547dd
-SHA1 (patch-js_src_Makefile.in) = 77d2e7cb651b9f30ebf6458fd07678416cdecbcc
SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
-SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c
-SHA1 (patch-js_src_jit-LIR.cpp) = 6c9b3bb9f2c41f7b101c49375c51418912620a15
+SHA1 (patch-js_src_jit-LIR.cpp) = 6e678d6886724dd346b8ca58ef903bd00dc8f5da
SHA1 (patch-js_src_jit_ExecutableAllocator.h) = c2389a7e6521905941270246adf155834703d8a0
-SHA1 (patch-js_src_jit_MIR.cpp) = d04ce1c7a55d8e1871472e1078cf591c8ea98588
-SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = ea58f199dbc11d7fcc04bbc1205d6ecf3a3ac3e0
+SHA1 (patch-js_src_jit_MIR.cpp) = 32586fb4437b48c62ef3dd8267f4b1796196230b
+SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = d734bea22d803f5f1019fd817cd3993da29a422b
SHA1 (patch-js_src_jsapi.cpp) = 97aaa4eea1254b675cbfd9cfae92dd614a717f49
SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c
SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59
@@ -91,7 +88,7 @@ SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 81e695c5cb20be3e864157c19ed07f9713490be5
SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62
-SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c
+SHA1 (patch-media_libcubeb_src_moz.build) = 9ace44826269a79edfb9406a7c518678396b4b57
SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = b7c21a68f09176100794148aa75eb19829417fed
@@ -99,7 +96,7 @@ SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b5980
SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de
SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933
-SHA1 (patch-media_libtheora_moz.build) = 9fbbbe76da464749ec9328b2ba1713cc849d9b42
+SHA1 (patch-media_libtheora_moz.build) = 4d03d454e13bda8321198aeb957aaabcfb4c6512
SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910
SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
@@ -121,22 +118,23 @@ SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spre
SHA1 (patch-memory_build_mozjemalloc__compat.c) = e43a0f593a524db1b325e0b6141f2630d63b9a5c
SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543
SHA1 (patch-memory_jemalloc_src_configure) = d1e27220b223266f7a7d362dca1621012f8d9d7f
-SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 44cb29dac1e8032c3f58149227bfe5ad94e8edb9
+SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = f61a8ef233963d5d9639a4ce68e8584bc7d7c1b2
SHA1 (patch-memory_volatile_VolatileBufferOSX.cpp) = ebea8a615443206376cb4264ed43b5c74e029b7d
SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749
SHA1 (patch-mfbt_Attributes.h) = 509d389e0053615aaf817d49f0cc5a12bd620aae
SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
-SHA1 (patch-mobile_android_installer_Makefile.in) = 3d6b7ea3fc6249f2f8ebc88f15f34495a0ef41d6
-SHA1 (patch-mobile_android_installer_package-manifest.in) = 5826a6585e76eecad46e8c8bf3a9c4ded61b5748
SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
-SHA1 (patch-modules_libpref_init_all.js) = a7043f9ed33aa00a57ae7c6ac76e072e32257aeb
+SHA1 (patch-modules_libpref_init_all.js) = 0a160b88816dee021617658226fb8d1e3787cc43
+SHA1 (patch-mozglue_misc_StackWalk.cpp) = 7615f5578585f5b410f51c2b2ea530c71a8d5f12
SHA1 (patch-netwerk_base_nsNetUtil.h) = e80f40b048e4628876ceb1a5ca90f7b07862d9ab
SHA1 (patch-netwerk_dns_moz.build) = 447ea9652f67cb5e48ea14a725c4cf45647eec6b
SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = bd58c580aface92714a16cc533d69541ae31deef
SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
-SHA1 (patch-rc) = affa634564e798184bbe50ba7c491d691a4a8994
-SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac
+SHA1 (patch-rc) = 3bc75b2005bb1a371231846ea605bcf55251db57
+SHA1 (patch-security_manager_ssl_nsNSSComponent.cpp) = a1f3ad34f3eb61661f4b3f27288fc4922d9c6607
+SHA1 (patch-storage_SQLiteMutex.h) = 9552e325e4e6e0f611a83a5eea2617e04236616f
+SHA1 (patch-storage_mozStorageConnection.cpp) = ee02a139dca844bad736bf8b088df267b5af1fa4
SHA1 (patch-testing_mozharness_README.md) = 1fc60563f800dd2a0ea868bbcd726cf6ecefe191
SHA1 (patch-testing_mozharness_configs_update__tests_mozilla-beta.py) = d31b9c0b38eaa44f24861a9d54ead989b4298192
SHA1 (patch-testing_mozharness_configs_update__tests_mozilla-release.py) = 6114abd1435f5dd8077b55db83e5114616ab4fe3
@@ -144,21 +142,17 @@ SHA1 (patch-testing_mozharness_configs_vcs__sync_staging__build-repos.py) = dd52
SHA1 (patch-testing_mozharness_configs_vcs__sync_staging__l10n.py) = d1d6ab7d789a97a079989cc600038d4790a0e809
SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890
+SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h) = 3b0973c96eadb7bff91eab211d3c159a9b22fa9c
SHA1 (patch-toolkit_library_moz.build) = 625d78e64959f78a5d0b8148749bb43a0abcbcf7
-SHA1 (patch-toolkit_modules_GMPInstallManager.jsm) = dfc7130a50593acad6582c5961bdb87839e017f5
-SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 1b4472b466e1b736034434ef32a6d016993ddb00
SHA1 (patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm) = 6e4ead21c1bcb1268a0530b3041ff4d5af20b743
SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6
SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c
-SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 8fb5eb1f1e548eda7151175d350eee9ec38b17b3
SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68
-SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 31a3e1b22b992d677a77d1e75ef52eb18d84abf7
-SHA1 (patch-xpcom_glue_standalone_nsXPCOMGlue.cpp) = a6ef7f490d52037d2a72d3d52d834a182a29eccb
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 2e6fbc64d78a3f035c6f9db9fffd0f1097420b58
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 6083e298140357bc5f2fa018885fed42eecb1ac4
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 4717f2a285200ccb5f580e12ffd73c51ae9e9c00
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 1395f1433d3..f4c71f7e0be 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.61 2015/08/29 12:11:22 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.62 2015/09/23 06:44:41 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --with-system-bz2
CONFIGURE_ARGS+= --with-system-graphite2
CONFIGURE_ARGS+= --with-system-harfbuzz
CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent}
-CONFIGURE_ARGS+= --enable-system-sqlite
+#CONFIGURE_ARGS+= --enable-system-sqlite
CONFIGURE_ARGS+= --disable-crashreporter
CONFIGURE_ARGS+= --disable-libnotify
CONFIGURE_ARGS+= --disable-necko-wifi
@@ -212,9 +212,9 @@ PLIST_SUBST+= DLL_SUFFIX=".so"
#.include "../../audio/libopus/buildlink3.mk"
#.include "../../audio/tremor/buildlink3.mk"
#.include "../../audio/libvorbis/buildlink3.mk"
-BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.9
-CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al
-.include "../../databases/sqlite3/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.9
+#CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al
+#.include "../../databases/sqlite3/buildlink3.mk"
BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/libffi/buildlink3.mk"
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 19fa72f19ce..75298024a8f 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
+$NetBSD: patch-aa,v 1.40 2015/09/23 06:44:42 ryoon Exp $
* The profiler does not support Darwin/PPC so don't try to enable it
on that platform.
@@ -13,24 +13,9 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 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 2015-06-18 20:55:30.000000000 +0000
+--- configure.in.orig 2015-08-24 21:53:10.000000000 +0000
+++ configure.in
-@@ -1796,7 +1796,13 @@ Linux)
- MOZ_ENABLE_PROFILER_SPS=
- esac
- ;;
--WINNT|Darwin) ;;
-+WINNT|Darwin)
-+ case "${CPU_ARCH}" in
-+ x86 | x86_64) ;;
-+ *)
-+ MOZ_ENABLE_PROFILER_SPS=
-+ esac
-+ ;;
- *)
- MOZ_ENABLE_PROFILER_SPS=
- ;;
-@@ -1900,7 +1906,7 @@ case "$host" in
+@@ -1933,7 +1933,7 @@ case "$host" in
;;
*-darwin*)
@@ -39,7 +24,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
;;
-@@ -2024,7 +2030,6 @@ case "$target" in
+@@ -2065,7 +2065,6 @@ case "$target" in
AC_DEFINE(XP_DARWIN)
_PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
else
@@ -47,7 +32,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
AC_DEFINE(XP_DARWIN)
_PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
# The ExceptionHandling framework is needed for Objective-C exception
-@@ -2643,8 +2648,7 @@ MOZ_CXX11
+@@ -2670,8 +2669,7 @@ MOZ_CXX11
AC_LANG_C
@@ -57,7 +42,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
dnl ===============================================================
if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3666,6 +3670,14 @@ if test -n "$YASM"; then
+@@ -3615,6 +3613,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@@ -72,7 +57,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -3693,11 +3705,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3642,11 +3648,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -85,7 +70,16 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
MOZ_NATIVE_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -4403,6 +4411,10 @@ cairo-gonk)
+@@ -4337,7 +4339,7 @@ cairo-cocoa)
+ MOZ_USER_DIR="Mozilla"
+ MOZ_FS_LAYOUT=bundle
+ # skip event loop instrumentation on UIKit for now
+- if test "$MOZ_WIDGET_TOOLKIT" == "cocoa"; then
++ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+ MOZ_INSTRUMENT_EVENT_LOOP=1
+ fi
+ ;;
+@@ -4376,6 +4378,10 @@ cairo-gonk)
esac
@@ -96,7 +90,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
AC_SUBST(MOZ_PDF_PRINTING)
if test "$MOZ_PDF_PRINTING"; then
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5137,6 +5149,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5108,6 +5114,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VPX=1
MOZ_VPX_ERROR_CONCEALMENT=1
@@ -106,7 +100,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
dnl enable once Signaling lands
MOZ_WEBRTC_SIGNALING=1
AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5240,6 +5255,157 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5251,6 +5260,142 @@ if test "${ac_cv_c_attribute_aligned}" !
fi
dnl ========================================================
@@ -210,21 +204,6 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
+AC_SUBST(MOZ_NATIVE_THEORA)
+
+dnl ========================================================
-+dnl Check for libspeex resampler
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-speex,
-+[ --with-system-speex Use system libspeex (located with pkgconfig)],
-+MOZ_NATIVE_SPEEX=1,
-+MOZ_NATIVE_SPEEX=)
-+
-+if test -n "$MOZ_NATIVE_SPEEX"; then
-+ PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2)
-+fi
-+
-+AC_SUBST(MOZ_NATIVE_SPEEX)
-+
-+dnl ========================================================
+dnl Check for libsoundtouch
+dnl ========================================================
+
@@ -264,7 +243,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
dnl = Disable VP8 decoder support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5608,6 +5774,67 @@ fi
+@@ -5632,6 +5777,67 @@ fi
AC_SUBST(MOZ_WEBM_ENCODER)
dnl ==================================
@@ -332,7 +311,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
dnl = Check alsa availability on Linux
dnl ==================================
-@@ -5621,12 +5848,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+@@ -5645,12 +5851,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
MOZ_ALSA=1,
MOZ_ALSA=)
@@ -356,18 +335,7 @@ $NetBSD: patch-aa,v 1.39 2015/08/19 11:37:04 ryoon Exp $
AC_SUBST(MOZ_ALSA)
dnl ========================================================
-@@ -6054,7 +6292,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
- if test "$MOZ_GAMEPAD"; then
- case "$OS_TARGET" in
- Darwin)
-- MOZ_GAMEPAD_BACKEND=cocoa
-+ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
-+ MOZ_GAMEPAD_BACKEND=cocoa
-+ fi
- ;;
- WINNT)
- MOZ_GAMEPAD_BACKEND=windows
-@@ -8073,6 +8313,49 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8131,6 +8348,49 @@ if test "$USE_FC_FREETYPE"; then
fi
dnl ========================================================
diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al
deleted file mode 100644
index cd6b9df7e35..00000000000
--- a/www/firefox/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.12 2014/04/30 15:07:18 ryoon Exp $
-
---- storage/src/mozStorageConnection.cpp.orig 2014-04-18 02:04:20.000000000 +0000
-+++ storage/src/mozStorageConnection.cpp
-@@ -584,6 +584,11 @@ Connection::initialize(nsIFile *aDatabas
-
- mDatabaseFile = aDatabaseFile;
-
-+ // XXX tnn: the configure script demands that sqlite3 is compiled with
-+ // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that,
-+ // so instead we enable secure_delete manually here.
-+ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;"));
-+
- return NS_OK;
- }
-
diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as
index cdc6d24582e..6ab7e4a6776 100644
--- a/www/firefox/patches/patch-as
+++ b/www/firefox/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.16 2015/02/16 16:16:17 bad Exp $
+$NetBSD: patch-as,v 1.17 2015/09/23 06:44:42 ryoon Exp $
Treat DragonFly like FreeBSD.
---- js/src/configure.in.orig 2015-01-23 05:59:58.000000000 +0000
-+++ js/src/configure.in 2015-02-16 11:09:33.000000000 +0000
-@@ -2180,8 +2180,7 @@
+--- js/src/configure.in.orig 2015-08-24 21:53:09.000000000 +0000
++++ js/src/configure.in
+@@ -2190,8 +2190,7 @@ AC_LANG_CPLUSPLUS
MOZ_CXX11
@@ -14,7 +14,7 @@ Treat DragonFly like FreeBSD.
dnl ===============================================================
if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -3095,7 +3094,7 @@
+@@ -3029,7 +3028,7 @@ if test "$MOZ_MEMORY"; then
*-darwin*)
AC_DEFINE(MOZ_MEMORY_DARWIN)
;;
@@ -23,7 +23,7 @@ Treat DragonFly like FreeBSD.
AC_DEFINE(MOZ_MEMORY_BSD)
;;
*-android*|*-linuxandroid*)
-@@ -3989,6 +3988,16 @@
+@@ -3879,6 +3878,16 @@ MOZ_SUBCONFIGURE_ICU()
dnl ========================================================
dnl JavaScript shell
dnl ========================================================
@@ -38,5 +38,5 @@ Treat DragonFly like FreeBSD.
+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
+fi
- MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
- MALLOC_H=
+ MOZ_CHECK_ALLOCATOR
+
diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build
index 2d330dc7284..23258053390 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.9 2015/08/11 23:48:18 ryoon Exp $
+$NetBSD: patch-config_external_moz.build,v 1.10 2015/09/23 06:44:42 ryoon Exp $
---- config/external/moz.build.orig 2015-08-07 15:54:10.000000000 +0000
+--- config/external/moz.build.orig 2015-08-24 21:53:10.000000000 +0000
+++ config/external/moz.build
@@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']:
# There's no "native brotli" yet, but probably in the future...
@@ -24,25 +24,13 @@ $NetBSD: patch-config_external_moz.build,v 1.9 2015/08/11 23:48:18 ryoon Exp $
external_dirs += ['media/libtremor']
if CONFIG['MOZ_WEBM']:
-@@ -40,15 +49,16 @@ if not CONFIG['MOZ_NATIVE_PNG']:
- if CONFIG['CPU_ARCH'] == 'arm':
- external_dirs += ['media/openmax_dl']
-
-+if not CONFIG['MOZ_NATIVE_SPEEX']:
-+ external_dirs += ['media/libspeex_resampler']
-+
-+if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
-+ external_dirs += ['media/libsoundtouch']
-+
+@@ -49,9 +58,6 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
external_dirs += [
'media/kiss_fft',
'media/libcubeb',
- 'media/libogg',
- 'media/libopus',
- 'media/libtheora',
-- 'media/libspeex_resampler',
+ 'media/libspeex_resampler',
'media/libstagefright',
-- 'media/libsoundtouch',
- ]
-
- DIRS += ['../../' + i for i in external_dirs]
+ 'media/libsoundtouch',
diff --git a/www/firefox/patches/patch-gfx_thebes_gfxWindowsPlatform.cpp b/www/firefox/patches/patch-gfx_thebes_gfxWindowsPlatform.cpp
new file mode 100644
index 00000000000..95c039d1cac
--- /dev/null
+++ b/www/firefox/patches/patch-gfx_thebes_gfxWindowsPlatform.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-gfx_thebes_gfxWindowsPlatform.cpp,v 1.1 2015/09/23 06:44:42 ryoon Exp $
+
+--- gfx/thebes/gfxWindowsPlatform.cpp.orig 2015-08-24 21:53:05.000000000 +0000
++++ gfx/thebes/gfxWindowsPlatform.cpp
+@@ -1879,6 +1879,10 @@ gfxWindowsPlatform::InitD3D11Devices()
+ return;
+ }
+
++ if (!CouldD3D11DeviceWork()) {
++ return;
++ }
++
+ bool useWARP = false;
+ bool allowWARP = false;
+
diff --git a/www/firefox/patches/patch-intl_unicharutil_util_moz.build b/www/firefox/patches/patch-intl_unicharutil_util_moz.build
index 5dea25dd9b7..8bc301620f2 100644
--- a/www/firefox/patches/patch-intl_unicharutil_util_moz.build
+++ b/www/firefox/patches/patch-intl_unicharutil_util_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.2 2015/04/05 12:54:11 ryoon Exp $
+$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.3 2015/09/23 06:44:42 ryoon Exp $
---- intl/unicharutil/util/moz.build.orig 2015-03-27 02:20:20.000000000 +0000
+--- intl/unicharutil/util/moz.build.orig 2015-08-24 21:53:08.000000000 +0000
+++ intl/unicharutil/util/moz.build
-@@ -38,5 +38,8 @@ if CONFIG['_MSC_VER']:
+@@ -42,6 +42,9 @@ if CONFIG['_MSC_VER']:
if CONFIG['ENABLE_INTL_API']:
CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
@@ -11,3 +11,4 @@ $NetBSD: patch-intl_unicharutil_util_moz.build,v 1.2 2015/04/05 12:54:11 ryoon E
+
if CONFIG['GNU_CXX']:
FAIL_ON_WARNINGS = True
+
diff --git a/www/firefox/patches/patch-js_src_Makefile.in b/www/firefox/patches/patch-js_src_Makefile.in
deleted file mode 100644
index 8b525ad3e1c..00000000000
--- a/www/firefox/patches/patch-js_src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-js_src_Makefile.in,v 1.11 2015/02/28 04:30:55 ryoon Exp $
-
---- js/src/Makefile.in.orig 2015-02-17 21:40:38.000000000 +0000
-+++ js/src/Makefile.in
-@@ -16,9 +16,6 @@ TOPLEVEL_BUILD := 1
-
- run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
-
--DIST_INSTALL = 1
--NO_EXPAND_LIBS = 1
--
- ifdef JS_HAS_CTYPES
- ifdef MOZ_NATIVE_FFI
- LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
diff --git a/www/firefox/patches/patch-js_src_gc_Statistics.cpp b/www/firefox/patches/patch-js_src_gc_Statistics.cpp
deleted file mode 100644
index baddfa8dbf6..00000000000
--- a/www/firefox/patches/patch-js_src_gc_Statistics.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_gc_Statistics.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $
-
---- js/src/gc/Statistics.cpp.orig 2015-02-05 11:52:40.000000000 +0000
-+++ js/src/gc/Statistics.cpp 2015-02-05 11:52:28.000000000 +0000
-@@ -221,8 +221,8 @@
- while (*c) {
- if (*c == ' ' || *c == '\t')
- p('_');
-- else if (isupper(*c))
-- p(tolower(*c));
-+ else if (isupper((unsigned char)*c))
-+ p(tolower((unsigned char)*c));
- else if (*c == '+')
- p("added_");
- else if (*c == '-')
diff --git a/www/firefox/patches/patch-js_src_jit-LIR.cpp b/www/firefox/patches/patch-js_src_jit-LIR.cpp
index 95038785136..a1ad6b70288 100644
--- a/www/firefox/patches/patch-js_src_jit-LIR.cpp
+++ b/www/firefox/patches/patch-js_src_jit-LIR.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-js_src_jit-LIR.cpp,v 1.2 2015/05/12 22:48:54 ryoon Exp $
+$NetBSD: patch-js_src_jit-LIR.cpp,v 1.3 2015/09/23 06:44:42 ryoon Exp $
---- js/src/jit/LIR.cpp.orig 2015-05-04 00:43:27.000000000 +0000
+--- js/src/jit/LIR.cpp.orig 2015-08-24 21:53:12.000000000 +0000
+++ js/src/jit/LIR.cpp
-@@ -323,7 +323,7 @@ LNode::printName(FILE* fp, Opcode op)
+@@ -323,7 +323,7 @@ LNode::printName(GenericPrinter& out, Op
const char* name = names[op];
size_t len = strlen(name);
for (size_t i = 0; i < len; i++)
-- fprintf(fp, "%c", tolower(name[i]));
-+ fprintf(fp, "%c", tolower(((unsigned char)name[i])));
+- out.printf("%c", tolower(name[i]));
++ out.printf("%c", tolower((unsigned char)name[i]));
}
void
diff --git a/www/firefox/patches/patch-js_src_jit_MIR.cpp b/www/firefox/patches/patch-js_src_jit_MIR.cpp
index 6cb09135589..2ad9338f612 100644
--- a/www/firefox/patches/patch-js_src_jit_MIR.cpp
+++ b/www/firefox/patches/patch-js_src_jit_MIR.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-js_src_jit_MIR.cpp,v 1.3 2015/05/12 22:48:54 ryoon Exp $
+$NetBSD: patch-js_src_jit_MIR.cpp,v 1.4 2015/09/23 06:44:42 ryoon Exp $
---- js/src/jit/MIR.cpp.orig 2015-05-04 00:43:27.000000000 +0000
+--- js/src/jit/MIR.cpp.orig 2015-08-24 21:53:12.000000000 +0000
+++ js/src/jit/MIR.cpp
-@@ -71,7 +71,7 @@ MDefinition::PrintOpcodeName(FILE* fp, M
+@@ -72,7 +72,7 @@ MDefinition::PrintOpcodeName(GenericPrin
const char* name = names[op];
size_t len = strlen(name);
for (size_t i = 0; i < len; i++)
-- fprintf(fp, "%c", tolower(name[i]));
-+ fprintf(fp, "%c", tolower(((unsigned char)name[i])));
+- out.printf("%c", tolower(name[i]));
++ out.printf("%c", tolower((unsigned char)name[i]));
}
const Value&
diff --git a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp
index 5211c8c2995..cf6e4a3cf52 100644
--- a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp
+++ b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.5 2015/05/12 22:48:54 ryoon Exp $
+$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.6 2015/09/23 06:44:42 ryoon Exp $
---- js/src/jit/arm/Architecture-arm.cpp.orig 2015-05-04 00:43:27.000000000 +0000
+--- js/src/jit/arm/Architecture-arm.cpp.orig 2015-08-24 21:53:12.000000000 +0000
+++ js/src/jit/arm/Architecture-arm.cpp
@@ -16,7 +16,7 @@
#include "jit/arm/Assembler-arm.h"
#include "jit/RegisterSets.h"
--#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR)
+-#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM)
+#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__)
// The Android NDK and B2G do not include the hwcap.h kernel header, and it is not
// defined when building the simulator, so inline the header defines we need.
diff --git a/www/firefox/patches/patch-media_libcubeb_src_moz.build b/www/firefox/patches/patch-media_libcubeb_src_moz.build
index b406fc1d876..ecd51419203 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_moz.build
+++ b/www/firefox/patches/patch-media_libcubeb_src_moz.build
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.3 2014/12/01 18:11:14 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.4 2015/09/23 06:44:42 ryoon Exp $
Don't assume cocoa toolkit just because OS_TARGET is Darwin.
---- media/libcubeb/src/moz.build.orig 2014-11-21 03:37:42.000000000 +0000
+--- media/libcubeb/src/moz.build.orig 2015-08-24 21:53:10.000000000 +0000
+++ media/libcubeb/src/moz.build
@@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']:
]
@@ -25,8 +25,8 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin.
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
'cubeb_audiounit.c',
- 'cubeb_osx_run_loop.c'
-@@ -65,6 +71,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ ]
+@@ -66,6 +72,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
FINAL_LIBRARY = 'gkmedias'
@@ -36,7 +36,7 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin.
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
CFLAGS += [
'-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
-@@ -73,7 +82,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
+@@ -74,7 +83,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
]
]
diff --git a/www/firefox/patches/patch-media_libtheora_moz.build b/www/firefox/patches/patch-media_libtheora_moz.build
index 836a7872196..8050eae122b 100644
--- a/www/firefox/patches/patch-media_libtheora_moz.build
+++ b/www/firefox/patches/patch-media_libtheora_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libtheora_moz.build,v 1.3 2015/08/11 23:48:18 ryoon Exp $
+$NetBSD: patch-media_libtheora_moz.build,v 1.4 2015/09/23 06:44:42 ryoon Exp $
---- media/libtheora/moz.build.orig 2015-08-07 15:54:12.000000000 +0000
+--- media/libtheora/moz.build.orig 2015-08-24 21:53:11.000000000 +0000
+++ media/libtheora/moz.build
@@ -21,6 +21,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
# The encoder is currently not included.
@@ -12,9 +12,3 @@ $NetBSD: patch-media_libtheora_moz.build,v 1.3 2015/08/11 23:48:18 ryoon Exp $
# Suppress warnings in third-party code.
if CONFIG['GNU_CC']:
CFLAGS += ['-Wno-type-limits']
-@@ -94,3 +97,5 @@ if CONFIG['GNU_AS']:
- if CONFIG['OS_TARGET'] == 'Android':
- DEFINES['__linux__'] = True
-
-+if CONFIG['MOZ_NATIVE_OGG']:
-+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
diff --git a/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp b/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp
index 2760cfe68f1..4d942301d9a 100644
--- a/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp
+++ b/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.4 2015/01/16 22:42:09 ryoon Exp $
+$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.5 2015/09/23 06:44:42 ryoon Exp $
---- memory/mozalloc/mozalloc_abort.cpp.orig 2015-01-09 04:38:22.000000000 +0000
+--- memory/mozalloc/mozalloc_abort.cpp.orig 2015-08-24 21:53:14.000000000 +0000
+++ memory/mozalloc/mozalloc_abort.cpp
-@@ -63,7 +63,11 @@ void fillAbortMessage(char (&msg)[N], ui
- // Define abort() here, so that it is used instead of the system abort(). This
- // lets us control the behavior when aborting, in order to get better results
- // on *NIX platforms. See mozalloc_abort for details.
+@@ -68,7 +68,11 @@ void fillAbortMessage(char (&msg)[N], ui
+ //
+ // That segmentation fault will be interpreted as another bug by ASan and as a
+ // result, ASan will just exit(1) instead of aborting.
+#if defined(SOLARIS)
+void std::abort(void)
+#else
diff --git a/www/firefox/patches/patch-mobile_android_installer_Makefile.in b/www/firefox/patches/patch-mobile_android_installer_Makefile.in
deleted file mode 100644
index e153380badc..00000000000
--- a/www/firefox/patches/patch-mobile_android_installer_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mobile_android_installer_Makefile.in,v 1.3 2015/02/28 04:30:55 ryoon Exp $
-
---- mobile/android/installer/Makefile.in.orig 2015-02-17 21:40:48.000000000 +0000
-+++ mobile/android/installer/Makefile.in
-@@ -55,6 +55,10 @@ BINPATH = bin
- endif
- DEFINES += -DBINPATH=$(BINPATH)
-
-+ifdef MOZ_DEBUG
-+DEFINES += -DMOZ_DEBUG=1
-+endif
-+
- ifdef ENABLE_MARIONETTE
- DEFINES += -DENABLE_MARIONETTE=1
- endif
diff --git a/www/firefox/patches/patch-mobile_android_installer_package-manifest.in b/www/firefox/patches/patch-mobile_android_installer_package-manifest.in
deleted file mode 100644
index 589493edfab..00000000000
--- a/www/firefox/patches/patch-mobile_android_installer_package-manifest.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mobile_android_installer_package-manifest.in,v 1.3 2015/02/28 04:30:55 ryoon Exp $
-
---- mobile/android/installer/package-manifest.in.orig 2015-02-17 21:40:48.000000000 +0000
-+++ mobile/android/installer/package-manifest.in
-@@ -440,7 +440,7 @@
- @BINPATH@/components/dom_webspeechsynth.xpt
- #endif
-
--#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
- #endif
diff --git a/www/firefox/patches/patch-modules_libpref_init_all.js b/www/firefox/patches/patch-modules_libpref_init_all.js
index ca7977e39f8..ba520529754 100644
--- a/www/firefox/patches/patch-modules_libpref_init_all.js
+++ b/www/firefox/patches/patch-modules_libpref_init_all.js
@@ -1,4 +1,6 @@
-$NetBSD: patch-modules_libpref_init_all.js,v 1.1 2015/08/30 09:29:15 ryoon Exp $
+$NetBSD: patch-modules_libpref_init_all.js,v 1.2 2015/09/23 06:44:42 ryoon Exp $
+
+* Improve stability under NetBSD.
--- modules/libpref/init/all.js.orig 2015-08-26 09:39:08.000000000 +0000
+++ modules/libpref/init/all.js
diff --git a/www/firefox/patches/patch-mozglue_misc_StackWalk.cpp b/www/firefox/patches/patch-mozglue_misc_StackWalk.cpp
new file mode 100644
index 00000000000..e73f5ae8d08
--- /dev/null
+++ b/www/firefox/patches/patch-mozglue_misc_StackWalk.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozglue_misc_StackWalk.cpp,v 1.1 2015/09/23 06:44:42 ryoon Exp $
+
+--- mozglue/misc/StackWalk.cpp.orig 2015-08-24 21:53:17.000000000 +0000
++++ mozglue/misc/StackWalk.cpp
+@@ -898,7 +898,7 @@ FramePointerStackWalk(MozWalkStackCallba
+ (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);
+ bp += 3;
diff --git a/www/firefox/patches/patch-rc b/www/firefox/patches/patch-rc
index b70e8616bf0..8e56491bf0b 100644
--- a/www/firefox/patches/patch-rc
+++ b/www/firefox/patches/patch-rc
@@ -1,16 +1,16 @@
-$NetBSD: patch-rc,v 1.6 2015/05/12 22:48:54 ryoon Exp $
+$NetBSD: patch-rc,v 1.7 2015/09/23 06:44:42 ryoon Exp $
---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2015-05-04 00:43:19.000000000 +0000
+--- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2015-08-24 21:53:06.000000000 +0000
+++ browser/branding/unofficial/locales/en-US/brand.dtd
@@ -2,8 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
--<!ENTITY brandShorterName "Mozilla Developer Preview">
--<!ENTITY brandShortName "Mozilla Developer Preview">
--<!ENTITY brandFullName "Mozilla Developer Preview">
+-<!ENTITY brandShorterName "Nightly">
+-<!ENTITY brandShortName "Nightly">
+-<!ENTITY brandFullName "Nightly">
+<!ENTITY brandShorterName "Browser">
+<!ENTITY brandShortName "Browser">
+<!ENTITY brandFullName "Browser">
- <!ENTITY vendorShortName "mozilla.org">
+ <!ENTITY vendorShortName "Mozilla">
<!ENTITY trademarkInfo.part1 " ">
diff --git a/www/firefox/patches/patch-security_manager_ssl_nsNSSComponent.cpp b/www/firefox/patches/patch-security_manager_ssl_nsNSSComponent.cpp
new file mode 100644
index 00000000000..a2a2e53e44a
--- /dev/null
+++ b/www/firefox/patches/patch-security_manager_ssl_nsNSSComponent.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-security_manager_ssl_nsNSSComponent.cpp,v 1.1 2015/09/23 06:44:42 ryoon Exp $
+
+--- security/manager/ssl/nsNSSComponent.cpp.orig 2015-08-24 21:53:20.000000000 +0000
++++ security/manager/ssl/nsNSSComponent.cpp
+@@ -43,6 +43,7 @@
+ #include "nss.h"
+ #include "pkix/pkixnss.h"
+ #include "ssl.h"
++#define NSS_ENABLE_ECC 1
+ #include "sslproto.h"
+ #include "secmod.h"
+ #include "secerr.h"
diff --git a/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp
deleted file mode 100644
index 7ef098cca3c..00000000000
--- a/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-security_manager_ssl_src_nsNSSComponent.cpp,v 1.5 2014/10/15 13:07:07 ryoon Exp $
-
---- security/manager/ssl/src/nsNSSComponent.cpp.orig 2014-10-11 09:06:44.000000000 +0000
-+++ security/manager/ssl/src/nsNSSComponent.cpp
-@@ -53,6 +53,7 @@
- #include "nss.h"
- #include "pkix/pkixnss.h"
- #include "ssl.h"
-+#define NSS_ENABLE_ECC 1
- #include "sslproto.h"
- #include "secmod.h"
- #include "secerr.h"
diff --git a/www/firefox/patches/patch-bg b/www/firefox/patches/patch-storage_SQLiteMutex.h
index 99ab39b404f..9ceee29509f 100644
--- a/www/firefox/patches/patch-bg
+++ b/www/firefox/patches/patch-storage_SQLiteMutex.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.4 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-storage_SQLiteMutex.h,v 1.1 2015/09/23 06:44:42 ryoon Exp $
---- storage/src/SQLiteMutex.h.orig 2013-10-25 22:27:40.000000000 +0000
-+++ storage/src/SQLiteMutex.h
-@@ -108,15 +108,19 @@ public:
+--- storage/SQLiteMutex.h.orig 2015-08-24 21:53:07.000000000 +0000
++++ storage/SQLiteMutex.h
+@@ -107,15 +107,19 @@ public:
void assertCurrentThreadOwns()
{
NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
diff --git a/www/firefox/patches/patch-storage_mozStorageConnection.cpp b/www/firefox/patches/patch-storage_mozStorageConnection.cpp
new file mode 100644
index 00000000000..6bdceb7c818
--- /dev/null
+++ b/www/firefox/patches/patch-storage_mozStorageConnection.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-storage_mozStorageConnection.cpp,v 1.1 2015/09/23 06:44:42 ryoon Exp $
+
+--- storage/mozStorageConnection.cpp.orig 2015-08-24 21:53:07.000000000 +0000
++++ storage/mozStorageConnection.cpp
+@@ -671,6 +671,13 @@ Connection::initialize(nsIFile *aDatabas
+ rv = initializeInternal();
+ NS_ENSURE_SUCCESS(rv, rv);
+
++ mDatabaseFile = aDatabaseFile;
++
++ // XXX tnn: the configure script demands that sqlite3 is compiled with
++ // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that,
++ // so instead we enable secure_delete manually here.
++ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;"));
++
+ return NS_OK;
+ }
+
diff --git a/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
new file mode 100644
index 00000000000..e05d9ef6acc
--- /dev/null
+++ b/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h,v 1.1 2015/09/23 06:44:42 ryoon Exp $
+
+--- toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2015-09-11 00:23:02.000000000 +0000
++++ toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h
+@@ -67,7 +67,7 @@
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+ #elif defined(sparc)
+ #define GOOGLE_PROTOBUF_ARCH_SPARC 1
+-#ifdef SOLARIS_64BIT_ENABLED
++#if (defined(sun) && defined(SOLARIS_64BIT_ENABLED)) || __LP64__
+ #define GOOGLE_PROTOBUF_ARCH_64_BIT 1
+ #else
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
diff --git a/www/firefox/patches/patch-toolkit_modules_GMPInstallManager.jsm b/www/firefox/patches/patch-toolkit_modules_GMPInstallManager.jsm
deleted file mode 100644
index da7eed1e6d4..00000000000
--- a/www/firefox/patches/patch-toolkit_modules_GMPInstallManager.jsm
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-toolkit_modules_GMPInstallManager.jsm,v 1.4 2015/08/11 23:48:18 ryoon Exp $
-
---- toolkit/modules/GMPInstallManager.jsm.orig 2015-08-07 15:54:20.000000000 +0000
-+++ toolkit/modules/GMPInstallManager.jsm
-@@ -884,9 +884,7 @@ GMPDownloader.prototype = {
- let gmpAddon = this._gmpAddon;
- let installToDirPath = Cc["@mozilla.org/file/local;1"].
- createInstance(Ci.nsIFile);
-- let path = OS.Path.join(OS.Constants.Path.profileDir,
-- gmpAddon.id,
-- gmpAddon.version);
-+ let path = OS.Path.join(OS.Constants.Path.profileDir, gmpAddon.id);
- installToDirPath.initWithPath(path);
- log.info("install to directory path: " + installToDirPath.path);
- let gmpInstaller = new GMPExtractor(zipPath, installToDirPath.path);
-@@ -895,10 +893,12 @@ GMPDownloader.prototype = {
- // Success, set the prefs
- let now = Math.round(Date.now() / 1000);
- GMPPrefs.set(GMPPrefs.KEY_PLUGIN_LAST_UPDATE, now, gmpAddon.id);
-- // Setting the version pref signals installation completion to consumers,
-- // if you need to set other prefs etc. do it before this.
-+ // Setting the path pref signals installation completion to consumers,
-+ // so set the version and potential other information they use first.
- GMPPrefs.set(GMPPrefs.KEY_PLUGIN_VERSION, gmpAddon.version,
- gmpAddon.id);
-+ GMPPrefs.set(GMPPrefs.KEY_PLUGIN_PATH,
-+ installToDirPath.path, gmpAddon.id);
- // Reset the trial create pref, so that Gecko knows to do a test
- // run before reporting that the GMP works to content.
- GMPPrefs.reset(GMPPrefs.KEY_PLUGIN_TRIAL_CREATE, gmpAddon.version,
diff --git a/www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm b/www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm
deleted file mode 100644
index 836aff66e4c..00000000000
--- a/www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-toolkit_modules_GMPUtils.jsm,v 1.1 2015/05/12 22:48:54 ryoon Exp $
-
---- toolkit/modules/GMPUtils.jsm.orig 2015-05-04 00:43:33.000000000 +0000
-+++ toolkit/modules/GMPUtils.jsm
-@@ -74,6 +74,7 @@ this.GMPPrefs = {
- KEY_EME_ENABLED: "media.eme.enabled",
- KEY_PLUGIN_ENABLED: "media.{0}.enabled",
- KEY_PLUGIN_LAST_UPDATE: "media.{0}.lastUpdate",
-+ KEY_PLUGIN_PATH: "media.{0}.path",
- KEY_PLUGIN_VERSION: "media.{0}.version",
- KEY_PLUGIN_AUTOUPDATE: "media.{0}.autoupdate",
- KEY_PLUGIN_FORCEVISIBLE: "media.{0}.forcevisible",
diff --git a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp
deleted file mode 100644
index e81f8176549..00000000000
--- a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.11 2015/05/12 22:48:54 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 2015-05-04 00:43:35.000000000 +0000
-+++ xpcom/base/nsStackWalk.cpp
-@@ -34,12 +34,12 @@ static CriticalAddress gCriticalAddress;
- #define _GNU_SOURCE
- #endif
-
--#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
-+#if defined(HAVE_DLOPEN) || defined(XP_DARWIN)
- #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 \
-@@ -47,7 +47,7 @@ static CriticalAddress gCriticalAddress;
- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
- defined(HAVE__UNWIND_BACKTRACE)))
-
--#if NSSTACKWALK_SUPPORTS_MACOSX
-+#if NSSTACKWALK_SUPPORTS_DARWIN
- #include <pthread.h>
- #include <CoreServices/CoreServices.h>
-
-@@ -830,7 +830,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode
- }
-
- // i386 or PPC Linux stackwalking code
--#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_MACOSX)
-+#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_DARWIN)
-
- #include <stdlib.h>
- #include <string.h>
-@@ -901,7 +901,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);
- bp += 3;
-@@ -931,7 +931,7 @@ FramePointerStackWalk(NS_WalkStackCallba
- }
-
- #define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__))
--#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_MACOSX || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
-+#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_DARWIN || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code
-
- XPCOM_API(nsresult)
- NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
diff --git a/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp b/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp
deleted file mode 100644
index 89f902fcbeb..00000000000
--- a/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-xpcom_build_XPCOMInit.cpp,v 1.2 2015/05/12 22:48:54 ryoon Exp $
-
---- xpcom/build/XPCOMInit.cpp.orig 2015-05-04 00:43:36.000000000 +0000
-+++ xpcom/build/XPCOMInit.cpp
-@@ -141,7 +141,9 @@ extern nsresult nsStringInputStreamConst
- #include "mozilla/VisualEventTracer.h"
- #endif
-
-+#ifndef MOZ_OGG_NO_MEM_REPORTING
- #include "ogg/ogg.h"
-+#endif
- #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
- #if defined(HAVE_STDINT_H)
- // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in
-@@ -669,11 +671,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul
- // this oddness.
- mozilla::SetICUMemoryFunctions();
-
-+#ifndef MOZ_OGG_NO_MEM_REPORTING
- // Do the same for libogg.
- ogg_set_mem_functions(OggReporter::CountingMalloc,
- OggReporter::CountingCalloc,
- OggReporter::CountingRealloc,
- OggReporter::CountingFree);
-+#endif
-
- #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
- // And for VPX.
diff --git a/www/firefox/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp b/www/firefox/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp
deleted file mode 100644
index 17ffc7ebe30..00000000000
--- a/www/firefox/patches/patch-xpcom_glue_standalone_nsXPCOMGlue.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xpcom_glue_standalone_nsXPCOMGlue.cpp,v 1.3 2015/01/30 07:32:24 pho Exp $
-
-Fix inconsistent use of XP_DARWIN and XP_MACOSX: LEADING_UNDERSCORE
-should be empty when we are going to load XPCOM using dlopen(3), not
-NSAddImage().
-
---- xpcom/glue/standalone/nsXPCOMGlue.cpp.orig 2015-01-30 05:17:58.000000000 +0000
-+++ xpcom/glue/standalone/nsXPCOMGlue.cpp
-@@ -30,7 +30,7 @@ static bool do_preload = false;
- #endif
-
- #if defined(SUNOS4) || defined(NEXTSTEP) || \
-- defined(XP_DARWIN) || \
-+ defined(XP_MACOSX) || \
- (defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)
- #define LEADING_UNDERSCORE "_"
- #else
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in
index 568cb2766b3..78fc6f7f6fa 100644
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in
+++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in
@@ -1,11 +1,15 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.1 2014/10/15 13:43:32 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.2 2015/09/23 06:44:42 ryoon Exp $
---- xpcom/reflect/xptcall/md/unix/Makefile.in.orig 2014-10-11 09:06:50.000000000 +0000
+--- xpcom/reflect/xptcall/md/unix/Makefile.in.orig 2015-08-24 21:53:22.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/Makefile.in
-@@ -56,6 +56,39 @@ endif
- # SPARC
- ######################################################################
- #
+@@ -42,6 +42,43 @@ ifeq ($(OS_ARCH),AIX)
+ CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS))
+ endif
+
++######################################################################
++# SPARC
++######################################################################
++#
+# Linux/SPARC
+#
+ifeq ($(OS_ARCH),Linux)
@@ -38,7 +42,7 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.1 2014/10/15 13:43:
+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_netbsd.s
+endif
-+#
- # Solaris/SPARC
- #
- ifeq ($(OS_ARCH),SunOS)
++
+ include $(topsrcdir)/config/rules.mk
+
+ ifeq ($(OS_ARCH),Linux)
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
index e6100860a1f..44521c50ee3 100644
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
+++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build
@@ -1,6 +1,6 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.3 2015/04/05 12:54:12 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.4 2015/09/23 06:44:42 ryoon Exp $
---- xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-03-27 02:20:33.000000000 +0000
+--- xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-08-24 21:53:22.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/moz.build
@@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
'xptcinvoke_darwin.cpp',
@@ -9,9 +9,9 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.3 2015/04/05 12:54:12
- if CONFIG['OS_TEST'] == 'powerpc':
+ if CONFIG['OS_TEST'] == 'ppc':
SOURCES += [
+ '!xptcstubs_asm_ppc_darwin.s',
'xptcinvoke_asm_ppc_rhapsody.s',
- ]
-@@ -26,7 +26,7 @@ if CONFIG['OS_ARCH'] == 'GNU':
+@@ -24,7 +24,7 @@ if CONFIG['OS_ARCH'] == 'GNU':
'xptcstubs_gcc_x86_unix.cpp'
]