Fri Jul 3 10:25:40 2015 UTC ()
Update to 39.0

Changelog:
New Share Hello URLs with social networks
New Project Silk: Smoother animation and scrolling (Mac OS X)
New Support for 'switch' role in ARIA 1.1 (web accessibility)
New SafeBrowsing malware detection lookups enabled for downloads (Mac OS X and Linux)
New Support for new Unicode 8.0 skin tone emoji
Changed Removed support for insecure SSLv3 for network communications
Changed Disable use of RC4 except for temporarily whitelisted hosts
Changed The malware detection service for downloads now covers common Mac file types (Bug 1138721)
Changed of displaying dashed lines is improved (Mac OS X) (Bug 1123019)
HTML5 List-style-type now accepts a string value
HTML5 Enable the Fetch API for network requests from dedicated, shared and service workers
HTML5 Cascading of CSS transitions and animations now matches the current spec
HTML5 Implement <link rel="preconnect">allowing anticipation of a future connection without revealing any information
HTML5 Added support for CSS Scroll Snap Points
Developer Drag and drop enabled for nodes in Inspector markup view
Developer Webconsole input history persists even after closing the toolbox
Developer Cubic bezier tooltip now shows a gallery of timing-function presets for use with CSS animations
Developer localhost is now available offline for WebSocket connections
Fixed Improve performance for IPv6 fallback to IPv4
Fixed Fix incomplete downloads being marked as complete by detecting broken HTTP1.1 transfers
Fixed The Security state indicator on a page now correctly ignores loads caused by previous pages
Fixed Fixed an issue where a Hello conversation window would sometimes fail to open
Fixed A regression that could lead to Flash not displaying has been fixed
Fixed Update to NSS 3.19.2
Fixed Various security fixes

Fixed in Firefox 39
    2015-71 NSS incorrectly permits skipping of ServerKeyExchange
    2015-70 NSS accepts export-length DHE keys with regular DHE cipher suites
    2015-69 Privilege escalation in PDF.js
    2015-68 OS X crash reports may contain entered key press information
    2015-67 Key pinning is ignored when overridable errors are encountered
    2015-66 Vulnerabilities found through code inspection
    2015-65 Use-after-free in workers while using XMLHttpRequest
    2015-64 ECDSA signature validation fails to handle some signatures correctly
    2015-63 Use-after-free in Content Policy due to microtask execution error
    2015-62 Out-of-bound read while computing an oscillator rendering range in Web Audio
    2015-61 Type confusion in Indexed Database Manager
    2015-60 Local files or privileged URLs in pages can be opened into new tabs
    2015-59 Miscellaneous memory safety hazards (rv:39.0 / rv:31.8 / rv:38.1)


(ryoon)
diff -r1.215 -r1.216 pkgsrc/www/firefox/Makefile
diff -r1.97 -r1.98 pkgsrc/www/firefox/PLIST
diff -r1.206 -r1.207 pkgsrc/www/firefox/distinfo
diff -r1.57 -r1.58 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.25 -r1.26 pkgsrc/www/firefox/options.mk
diff -r1.37 -r1.38 pkgsrc/www/firefox/patches/patch-aa
diff -r1.2 -r0 pkgsrc/www/firefox/patches/patch-accessible_atk_Platform.cpp
diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/patch-b2g_installer_package-manifest.in
diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/patch-mfbt_Attributes.h
diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/patch-widget_gtk_gtk3drawing.c
diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp
diff -r1.13 -r1.14 pkgsrc/www/firefox/patches/patch-config_system-headers
diff -r1.1 -r1.2 pkgsrc/www/firefox/patches/patch-dom_media_gmp_GMPParent.cpp
diff -r1.1 -r1.2 pkgsrc/www/firefox/patches/patch-ipc_glue_moz.build
diff -r1.3 -r0 pkgsrc/www/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp
diff -r1.3 -r0 pkgsrc/www/firefox/patches/patch-widget_gtk_gtk2drawing.c
diff -r1.3 -r0 pkgsrc/www/firefox/patches/patch-widget_gtk_gtkdrawing.h
diff -r1.3 -r1.4 pkgsrc/www/firefox/patches/patch-js_src_shell_jsoptparse.cpp
diff -r1.10 -r1.11 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
diff -r1.2 -r1.3 pkgsrc/www/firefox/patches/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm
cvs diff -r1.215 -r1.216 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2015/06/30 09:57:42 1.215
+++ pkgsrc/www/firefox/Makefile 2015/07/03 10:25:40 1.216
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.215 2015/06/30 09:57:42 ryoon Exp $ 1# $NetBSD: Makefile,v 1.216 2015/07/03 10:25:40 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 38.0 4MOZ_BRANCH= 39.0
5MOZ_BRANCH_MINOR= .5 5MOZ_BRANCH_MINOR=
6PKGREVISION= 1 
7 6
8DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
9PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
10CATEGORIES= www 9CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
13EXTRACT_SUFX= .tar.bz2 12EXTRACT_SUFX= .tar.bz2
14 13
15WRKSRC= ${WRKDIR}/mozilla-release 14WRKSRC= ${WRKDIR}/mozilla-release
16#WRKSRC= ${WRKDIR}/mozilla-beta 15#WRKSRC= ${WRKDIR}/mozilla-beta
17 16
18MAINTAINER= ryoon@NetBSD.org 17MAINTAINER= ryoon@NetBSD.org
19HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 18HOMEPAGE= http://www.mozilla.com/en-US/firefox/
cvs diff -r1.97 -r1.98 pkgsrc/www/firefox/PLIST (expand / switch to unified diff)

--- pkgsrc/www/firefox/PLIST 2015/06/03 03:22:31 1.97
+++ pkgsrc/www/firefox/PLIST 2015/07/03 10:25:40 1.98
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.97 2015/06/03 03:22:31 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.98 2015/07/03 10:25:40 ryoon Exp $
2bin/firefox 2bin/firefox
3lib/firefox/application.ini 3lib/firefox/application.ini
4lib/firefox/browser/blocklist.xml 4lib/firefox/browser/blocklist.xml
5lib/firefox/browser/chrome.manifest 5lib/firefox/browser/chrome.manifest
6${PLIST.nobranding}lib/firefox/browser/chrome/browser/content/branding/about-background.png 6${PLIST.nobranding}lib/firefox/browser/chrome/browser/content/branding/about-background.png
7lib/firefox/browser/chrome/browser/content/branding/about-logo.png 7lib/firefox/browser/chrome/browser/content/branding/about-logo.png
8lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png 8lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png
9lib/firefox/browser/chrome/browser/content/branding/about-wordmark.svg 9lib/firefox/browser/chrome/browser/content/branding/about-wordmark.svg
10lib/firefox/browser/chrome/browser/content/branding/about.png 10lib/firefox/browser/chrome/browser/content/branding/about.png
11lib/firefox/browser/chrome/browser/content/branding/aboutDialog.css 11lib/firefox/browser/chrome/browser/content/branding/aboutDialog.css
12lib/firefox/browser/chrome/browser/content/branding/icon128.png 12lib/firefox/browser/chrome/browser/content/branding/icon128.png
13lib/firefox/browser/chrome/browser/content/branding/icon16.png 13lib/firefox/browser/chrome/browser/content/branding/icon16.png
14lib/firefox/browser/chrome/browser/content/branding/icon32.png 14lib/firefox/browser/chrome/browser/content/branding/icon32.png
@@ -127,26 +127,28 @@ lib/firefox/browser/chrome/browser/conte @@ -127,26 +127,28 @@ lib/firefox/browser/chrome/browser/conte
127lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/connection-footer.xhtml 127lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/connection-footer.xhtml
128lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/device.js 128lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/device.js
129lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/device.xhtml 129lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/device.xhtml
130lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/help.xhtml 130lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/help.xhtml
131lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/index.js 131lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/index.js
132lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/index.xul 132lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/index.xul
133lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/manifest-editor.js 133lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/manifest-editor.js
134lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects.js 134lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects.js
135lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects.xhtml 135lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects.xhtml
136lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/template.js 136lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/template.js
137lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/utils.js 137lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/utils.js
138lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.js 138lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.js
139lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.xul 139lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.xul
 140lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger/callslist.js
 141lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger/snapshotslist.js
140lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/activeline.js 142lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/activeline.js
141lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/brace-fold.js 143lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/brace-fold.js
142lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/clike.js 144lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/clike.js
143lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/closebrackets.js 145lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/closebrackets.js
144lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.css 146lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.css
145lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.js 147lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.js
146lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/comment-fold.js 148lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/comment-fold.js
147lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/comment.js 149lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/comment.js
148lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/css.js 150lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/css.js
149lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.css 151lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.css
150lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.js 152lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.js
151lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/emacs.js 153lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/emacs.js
152lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/foldcode.js 154lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/foldcode.js
@@ -683,26 +685,28 @@ lib/firefox/browser/chrome/browser/skin/ @@ -683,26 +685,28 @@ lib/firefox/browser/chrome/browser/skin/
683lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over.png 685lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over.png
684lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over@2x.png 686lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over@2x.png
685lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints.png 687lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints.png
686lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png 688lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png
687lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger.css 689lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger.css
688lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-bottom@2x.png 690lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-bottom@2x.png
689lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-side@2x.png 691lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-side@2x.png
690lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dropmarker.svg 692lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dropmarker.svg
691lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-breakpoint.png 693lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-breakpoint.png
692lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location.png 694lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location.png
693lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location@2x.png 695lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location@2x.png
694lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-error.png 696lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-error.png
695lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/eyedropper.css 697lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/eyedropper.css
 698lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/fast-forward.png
 699lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/fast-forward@2x.png
696lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-close.svg 700lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-close.svg
697lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-open.svg 701lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-open.svg
698lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-globe.svg 702lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-globe.svg
699lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-store.svg 703lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-store.svg
700lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filters.svg 704lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filters.svg
701lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars-light.css 705lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars-light.css
702lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars.css 706lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars.css
703lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/font-inspector.css 707lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/font-inspector.css
704lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/inspector.css 708lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/inspector.css
705lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-ltr.svg 709lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-ltr.svg
706lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-rtl.svg 710lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-rtl.svg
707lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.svg 711lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.svg
708lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.svg 712lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.svg
@@ -731,26 +735,28 @@ lib/firefox/browser/chrome/browser/skin/ @@ -731,26 +735,28 @@ lib/firefox/browser/chrome/browser/skin/
731lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer.png 735lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer.png
732lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png 736lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png
733lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer.png 737lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer.png
734lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer@2x.png 738lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer@2x.png
735lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer.png 739lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer.png
736lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer@2x.png 740lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer@2x.png
737lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-home.png 741lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-home.png
738lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate.png 742lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate.png
739lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate@2x.png 743lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate@2x.png
740lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot.png 744lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot.png
741lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot@2x.png 745lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot@2x.png
742lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch.png 746lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch.png
743lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch@2x.png 747lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch@2x.png
 748lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/rewind.png
 749lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/rewind@2x.png
744lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/ruleview.css 750lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/ruleview.css
745lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/scratchpad.css 751lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/scratchpad.css
746lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.css 752lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.css
747lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/splitview.css 753lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/splitview.css
748lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/storage.css 754lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/storage.css
749lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css 755lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css
750lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/timeline-filter.svg 756lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/timeline-filter.svg
751lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/timeline.css 757lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/timeline.css
752lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools.png 758lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools.png
753lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools@2x.png 759lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools@2x.png
754lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger-paused.svg 760lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger-paused.svg
755lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger.svg 761lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger.svg
756lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-inspector.svg 762lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-inspector.svg
@@ -858,26 +864,27 @@ lib/firefox/browser/chrome/browser/skin/ @@ -858,26 +864,27 @@ lib/firefox/browser/chrome/browser/skin/
858lib/firefox/browser/chrome/browser/skin/classic/browser/places/star-icons.png 864lib/firefox/browser/chrome/browser/skin/classic/browser/places/star-icons.png
859lib/firefox/browser/chrome/browser/skin/classic/browser/places/starred48.png 865lib/firefox/browser/chrome/browser/skin/classic/browser/places/starred48.png
860lib/firefox/browser/chrome/browser/skin/classic/browser/places/tag.png 866lib/firefox/browser/chrome/browser/skin/classic/browser/places/tag.png
861lib/firefox/browser/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png 867lib/firefox/browser/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png
862lib/firefox/browser/chrome/browser/skin/classic/browser/places/unsortedBookmarks.png 868lib/firefox/browser/chrome/browser/skin/classic/browser/places/unsortedBookmarks.png
863lib/firefox/browser/chrome/browser/skin/classic/browser/places/unstarred48.png 869lib/firefox/browser/chrome/browser/skin/classic/browser/places/unstarred48.png
864lib/firefox/browser/chrome/browser/skin/classic/browser/pointerLock-16.png 870lib/firefox/browser/chrome/browser/skin/classic/browser/pointerLock-16.png
865lib/firefox/browser/chrome/browser/skin/classic/browser/pointerLock-64.png 871lib/firefox/browser/chrome/browser/skin/classic/browser/pointerLock-64.png
866lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options-sync.png 872lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options-sync.png
867lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options.png 873lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options.png
868lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css 874lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css
869lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png 875lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
870lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css 876lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css
 877lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/default-profile-image.svg
871lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css 878lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
872lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico 879lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
873lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg 880lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
874lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css 881lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
875lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css 882lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css
876lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/mail.png 883lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/mail.png
877lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css 884lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
878lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/search.css 885lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/search.css
879lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png 886lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png
880lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour.png 887lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour.png
881lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour@2x.png 888lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour@2x.png
882lib/firefox/browser/chrome/browser/skin/classic/browser/readerMode.svg 889lib/firefox/browser/chrome/browser/skin/classic/browser/readerMode.svg
883lib/firefox/browser/chrome/browser/skin/classic/browser/readinglist/icons.svg 890lib/firefox/browser/chrome/browser/skin/classic/browser/readinglist/icons.svg
@@ -1385,42 +1392,45 @@ lib/firefox/browser/chrome/webide/conten @@ -1385,42 +1392,45 @@ lib/firefox/browser/chrome/webide/conten
1385lib/firefox/browser/chrome/webide/content/devicepreferences.xhtml 1392lib/firefox/browser/chrome/webide/content/devicepreferences.xhtml
1386lib/firefox/browser/chrome/webide/content/devicesettings.js 1393lib/firefox/browser/chrome/webide/content/devicesettings.js
1387lib/firefox/browser/chrome/webide/content/devicesettings.xhtml 1394lib/firefox/browser/chrome/webide/content/devicesettings.xhtml
1388lib/firefox/browser/chrome/webide/content/logs.js 1395lib/firefox/browser/chrome/webide/content/logs.js
1389lib/firefox/browser/chrome/webide/content/logs.xhtml 1396lib/firefox/browser/chrome/webide/content/logs.xhtml
1390lib/firefox/browser/chrome/webide/content/monitor.js 1397lib/firefox/browser/chrome/webide/content/monitor.js
1391lib/firefox/browser/chrome/webide/content/monitor.xhtml 1398lib/firefox/browser/chrome/webide/content/monitor.xhtml
1392lib/firefox/browser/chrome/webide/content/newapp.js 1399lib/firefox/browser/chrome/webide/content/newapp.js
1393lib/firefox/browser/chrome/webide/content/newapp.xul 1400lib/firefox/browser/chrome/webide/content/newapp.xul
1394lib/firefox/browser/chrome/webide/content/permissionstable.js 1401lib/firefox/browser/chrome/webide/content/permissionstable.js
1395lib/firefox/browser/chrome/webide/content/permissionstable.xhtml 1402lib/firefox/browser/chrome/webide/content/permissionstable.xhtml
1396lib/firefox/browser/chrome/webide/content/prefs.js 1403lib/firefox/browser/chrome/webide/content/prefs.js
1397lib/firefox/browser/chrome/webide/content/prefs.xhtml 1404lib/firefox/browser/chrome/webide/content/prefs.xhtml
 1405lib/firefox/browser/chrome/webide/content/project-listing.js
 1406lib/firefox/browser/chrome/webide/content/project-listing.xhtml
 1407lib/firefox/browser/chrome/webide/content/project-panel.js
1398lib/firefox/browser/chrome/webide/content/runtimedetails.js 1408lib/firefox/browser/chrome/webide/content/runtimedetails.js
1399lib/firefox/browser/chrome/webide/content/runtimedetails.xhtml 1409lib/firefox/browser/chrome/webide/content/runtimedetails.xhtml
1400lib/firefox/browser/chrome/webide/content/webide.js 1410lib/firefox/browser/chrome/webide/content/webide.js
1401lib/firefox/browser/chrome/webide/content/webide.xul 1411lib/firefox/browser/chrome/webide/content/webide.xul
1402lib/firefox/browser/chrome/webide/content/wifi-auth.js 1412lib/firefox/browser/chrome/webide/content/wifi-auth.js
1403lib/firefox/browser/chrome/webide/content/wifi-auth.xhtml 1413lib/firefox/browser/chrome/webide/content/wifi-auth.xhtml
1404lib/firefox/browser/chrome/webide/skin/addons.css 1414lib/firefox/browser/chrome/webide/skin/addons.css
1405lib/firefox/browser/chrome/webide/skin/config-view.css 1415lib/firefox/browser/chrome/webide/skin/config-view.css
1406lib/firefox/browser/chrome/webide/skin/deck.css 1416lib/firefox/browser/chrome/webide/skin/deck.css
1407lib/firefox/browser/chrome/webide/skin/details.css 1417lib/firefox/browser/chrome/webide/skin/details.css
1408lib/firefox/browser/chrome/webide/skin/icons.png 1418lib/firefox/browser/chrome/webide/skin/icons.png
1409lib/firefox/browser/chrome/webide/skin/logs.css 1419lib/firefox/browser/chrome/webide/skin/logs.css
1410lib/firefox/browser/chrome/webide/skin/monitor.css 1420lib/firefox/browser/chrome/webide/skin/monitor.css
1411lib/firefox/browser/chrome/webide/skin/newapp.css 1421lib/firefox/browser/chrome/webide/skin/newapp.css
1412lib/firefox/browser/chrome/webide/skin/permissionstable.css 1422lib/firefox/browser/chrome/webide/skin/permissionstable.css
1413lib/firefox/browser/chrome/webide/skin/prefs.css 1423lib/firefox/browser/chrome/webide/skin/project-listing.css
1414lib/firefox/browser/chrome/webide/skin/runtimedetails.css 1424lib/firefox/browser/chrome/webide/skin/runtimedetails.css
1415lib/firefox/browser/chrome/webide/skin/throbber.svg 1425lib/firefox/browser/chrome/webide/skin/throbber.svg
1416lib/firefox/browser/chrome/webide/skin/webide.css 1426lib/firefox/browser/chrome/webide/skin/webide.css
1417lib/firefox/browser/chrome/webide/skin/wifi-auth.css 1427lib/firefox/browser/chrome/webide/skin/wifi-auth.css
1418lib/firefox/browser/components/ChromeProfileMigrator.js 1428lib/firefox/browser/components/ChromeProfileMigrator.js
1419lib/firefox/browser/components/ExperimentsService.js 1429lib/firefox/browser/components/ExperimentsService.js
1420lib/firefox/browser/components/FeedConverter.js 1430lib/firefox/browser/components/FeedConverter.js
1421lib/firefox/browser/components/FeedWriter.js 1431lib/firefox/browser/components/FeedWriter.js
1422lib/firefox/browser/components/FirefoxProfileMigrator.js 1432lib/firefox/browser/components/FirefoxProfileMigrator.js
1423lib/firefox/browser/components/ProfileMigrator.js 1433lib/firefox/browser/components/ProfileMigrator.js
1424lib/firefox/browser/components/SelfSupportService.js 1434lib/firefox/browser/components/SelfSupportService.js
1425lib/firefox/browser/components/WebContentConverter.js 1435lib/firefox/browser/components/WebContentConverter.js
1426lib/firefox/browser/components/components.manifest 1436lib/firefox/browser/components/components.manifest
@@ -1571,41 +1581,43 @@ lib/firefox/browser/modules/devtools/pro @@ -1571,41 +1581,43 @@ lib/firefox/browser/modules/devtools/pro
1571lib/firefox/browser/modules/devtools/projecteditor/tree.js 1581lib/firefox/browser/modules/devtools/projecteditor/tree.js
1572lib/firefox/browser/modules/devtools/resize-commands.js 1582lib/firefox/browser/modules/devtools/resize-commands.js
1573lib/firefox/browser/modules/devtools/responsivedesign-child.js 1583lib/firefox/browser/modules/devtools/responsivedesign-child.js
1574lib/firefox/browser/modules/devtools/responsivedesign.jsm 1584lib/firefox/browser/modules/devtools/responsivedesign.jsm
1575lib/firefox/browser/modules/devtools/scratchpad-manager.jsm 1585lib/firefox/browser/modules/devtools/scratchpad-manager.jsm
1576lib/firefox/browser/modules/devtools/scratchpad/scratchpad-commands.js 1586lib/firefox/browser/modules/devtools/scratchpad/scratchpad-commands.js
1577lib/firefox/browser/modules/devtools/scratchpad/scratchpad-panel.js 1587lib/firefox/browser/modules/devtools/scratchpad/scratchpad-panel.js
1578lib/firefox/browser/modules/devtools/shadereditor/panel.js 1588lib/firefox/browser/modules/devtools/shadereditor/panel.js
1579lib/firefox/browser/modules/devtools/shared/autocomplete-popup.js 1589lib/firefox/browser/modules/devtools/shared/autocomplete-popup.js
1580lib/firefox/browser/modules/devtools/shared/d3.js 1590lib/firefox/browser/modules/devtools/shared/d3.js
1581lib/firefox/browser/modules/devtools/shared/devices.js 1591lib/firefox/browser/modules/devtools/shared/devices.js
1582lib/firefox/browser/modules/devtools/shared/doorhanger.js 1592lib/firefox/browser/modules/devtools/shared/doorhanger.js
1583lib/firefox/browser/modules/devtools/shared/frame-script-utils.js 1593lib/firefox/browser/modules/devtools/shared/frame-script-utils.js
 1594lib/firefox/browser/modules/devtools/shared/getjson.js
1584lib/firefox/browser/modules/devtools/shared/inplace-editor.js 1595lib/firefox/browser/modules/devtools/shared/inplace-editor.js
1585lib/firefox/browser/modules/devtools/shared/observable-object.js 1596lib/firefox/browser/modules/devtools/shared/observable-object.js
1586lib/firefox/browser/modules/devtools/shared/options-view.js 1597lib/firefox/browser/modules/devtools/shared/options-view.js
1587lib/firefox/browser/modules/devtools/shared/profiler/global.js 1598lib/firefox/browser/modules/devtools/shared/profiler/global.js
1588lib/firefox/browser/modules/devtools/shared/profiler/tree-model.js 1599lib/firefox/browser/modules/devtools/shared/profiler/tree-model.js
1589lib/firefox/browser/modules/devtools/shared/profiler/tree-view.js 1600lib/firefox/browser/modules/devtools/shared/profiler/tree-view.js
1590lib/firefox/browser/modules/devtools/shared/telemetry.js 1601lib/firefox/browser/modules/devtools/shared/telemetry.js
1591lib/firefox/browser/modules/devtools/shared/theme-switching.js 1602lib/firefox/browser/modules/devtools/shared/theme-switching.js
1592lib/firefox/browser/modules/devtools/shared/theme.js 1603lib/firefox/browser/modules/devtools/shared/theme.js
1593lib/firefox/browser/modules/devtools/shared/timeline/global.js 1604lib/firefox/browser/modules/devtools/shared/timeline/global.js
1594lib/firefox/browser/modules/devtools/shared/timeline/marker-details.js 1605lib/firefox/browser/modules/devtools/shared/timeline/marker-details.js
1595lib/firefox/browser/modules/devtools/shared/timeline/markers-overview.js 1606lib/firefox/browser/modules/devtools/shared/timeline/markers-overview.js
1596lib/firefox/browser/modules/devtools/shared/timeline/memory-overview.js 1607lib/firefox/browser/modules/devtools/shared/timeline/memory-overview.js
1597lib/firefox/browser/modules/devtools/shared/timeline/waterfall.js 1608lib/firefox/browser/modules/devtools/shared/timeline/waterfall.js
1598lib/firefox/browser/modules/devtools/shared/undo.js 1609lib/firefox/browser/modules/devtools/shared/undo.js
 1610lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierPresets.js
1599lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierWidget.js 1611lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierWidget.js
1600lib/firefox/browser/modules/devtools/shared/widgets/FastListWidget.js 1612lib/firefox/browser/modules/devtools/shared/widgets/FastListWidget.js
1601lib/firefox/browser/modules/devtools/shared/widgets/Spectrum.js 1613lib/firefox/browser/modules/devtools/shared/widgets/Spectrum.js
1602lib/firefox/browser/modules/devtools/shared/widgets/TableWidget.js 1614lib/firefox/browser/modules/devtools/shared/widgets/TableWidget.js
1603lib/firefox/browser/modules/devtools/shared/widgets/Tooltip.js 1615lib/firefox/browser/modules/devtools/shared/widgets/Tooltip.js
1604lib/firefox/browser/modules/devtools/shared/widgets/TreeWidget.js 1616lib/firefox/browser/modules/devtools/shared/widgets/TreeWidget.js
1605lib/firefox/browser/modules/devtools/sourceeditor/autocomplete.js 1617lib/firefox/browser/modules/devtools/sourceeditor/autocomplete.js
1606lib/firefox/browser/modules/devtools/sourceeditor/css-autocompleter.js 1618lib/firefox/browser/modules/devtools/sourceeditor/css-autocompleter.js
1607lib/firefox/browser/modules/devtools/sourceeditor/css-tokenizer.js 1619lib/firefox/browser/modules/devtools/sourceeditor/css-tokenizer.js
1608lib/firefox/browser/modules/devtools/sourceeditor/debugger.js 1620lib/firefox/browser/modules/devtools/sourceeditor/debugger.js
1609lib/firefox/browser/modules/devtools/sourceeditor/editor.js 1621lib/firefox/browser/modules/devtools/sourceeditor/editor.js
1610lib/firefox/browser/modules/devtools/storage/panel.js 1622lib/firefox/browser/modules/devtools/storage/panel.js
1611lib/firefox/browser/modules/devtools/storage/ui.js 1623lib/firefox/browser/modules/devtools/storage/ui.js
@@ -1628,27 +1640,27 @@ lib/firefox/browser/modules/devtools/til @@ -1628,27 +1640,27 @@ lib/firefox/browser/modules/devtools/til
1628lib/firefox/browser/modules/devtools/tilt/tilt.js 1640lib/firefox/browser/modules/devtools/tilt/tilt.js
1629lib/firefox/browser/modules/devtools/timeline/panel.js 1641lib/firefox/browser/modules/devtools/timeline/panel.js
1630lib/firefox/browser/modules/devtools/webaudioeditor/panel.js 1642lib/firefox/browser/modules/devtools/webaudioeditor/panel.js
1631lib/firefox/browser/modules/devtools/webconsole/console-commands.js 1643lib/firefox/browser/modules/devtools/webconsole/console-commands.js
1632lib/firefox/browser/modules/devtools/webconsole/console-output.js 1644lib/firefox/browser/modules/devtools/webconsole/console-output.js
1633lib/firefox/browser/modules/devtools/webconsole/hudservice.js 1645lib/firefox/browser/modules/devtools/webconsole/hudservice.js
1634lib/firefox/browser/modules/devtools/webconsole/network-panel.js 1646lib/firefox/browser/modules/devtools/webconsole/network-panel.js
1635lib/firefox/browser/modules/devtools/webconsole/panel.js 1647lib/firefox/browser/modules/devtools/webconsole/panel.js
1636lib/firefox/browser/modules/devtools/webconsole/webconsole.js 1648lib/firefox/browser/modules/devtools/webconsole/webconsole.js
1637lib/firefox/browser/modules/devtools/webide/addons.js 1649lib/firefox/browser/modules/devtools/webide/addons.js
1638lib/firefox/browser/modules/devtools/webide/app-manager.js 1650lib/firefox/browser/modules/devtools/webide/app-manager.js
1639lib/firefox/browser/modules/devtools/webide/build.js 1651lib/firefox/browser/modules/devtools/webide/build.js
1640lib/firefox/browser/modules/devtools/webide/config-view.js 1652lib/firefox/browser/modules/devtools/webide/config-view.js
1641lib/firefox/browser/modules/devtools/webide/remote-resources.js 1653lib/firefox/browser/modules/devtools/webide/project-list.js
1642lib/firefox/browser/modules/devtools/webide/runtimes.js 1654lib/firefox/browser/modules/devtools/webide/runtimes.js
1643lib/firefox/browser/modules/devtools/webide/simulator-process.js 1655lib/firefox/browser/modules/devtools/webide/simulator-process.js
1644lib/firefox/browser/modules/devtools/webide/simulators.js 1656lib/firefox/browser/modules/devtools/webide/simulators.js
1645lib/firefox/browser/modules/devtools/webide/tab-store.js 1657lib/firefox/browser/modules/devtools/webide/tab-store.js
1646lib/firefox/browser/modules/devtools/webide/utils.js 1658lib/firefox/browser/modules/devtools/webide/utils.js
1647lib/firefox/browser/modules/distribution.js 1659lib/firefox/browser/modules/distribution.js
1648lib/firefox/browser/modules/experiments/Experiments.jsm 1660lib/firefox/browser/modules/experiments/Experiments.jsm
1649lib/firefox/browser/modules/loop/CardDavImporter.jsm 1661lib/firefox/browser/modules/loop/CardDavImporter.jsm
1650lib/firefox/browser/modules/loop/GoogleImporter.jsm 1662lib/firefox/browser/modules/loop/GoogleImporter.jsm
1651lib/firefox/browser/modules/loop/LoopCalls.jsm 1663lib/firefox/browser/modules/loop/LoopCalls.jsm
1652lib/firefox/browser/modules/loop/LoopContacts.jsm 1664lib/firefox/browser/modules/loop/LoopContacts.jsm
1653lib/firefox/browser/modules/loop/LoopRooms.jsm 1665lib/firefox/browser/modules/loop/LoopRooms.jsm
1654lib/firefox/browser/modules/loop/LoopStorage.jsm 1666lib/firefox/browser/modules/loop/LoopStorage.jsm
@@ -1719,26 +1731,27 @@ lib/firefox/chrome/en-US/locale/en-US/gl @@ -1719,26 +1731,27 @@ lib/firefox/chrome/en-US/locale/en-US/gl
1719lib/firefox/chrome/en-US/locale/en-US/global-platform/win/intl.properties 1731lib/firefox/chrome/en-US/locale/en-US/global-platform/win/intl.properties
1720lib/firefox/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties 1732lib/firefox/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
1721lib/firefox/chrome/en-US/locale/en-US/global-region/region.properties 1733lib/firefox/chrome/en-US/locale/en-US/global-region/region.properties
1722lib/firefox/chrome/en-US/locale/en-US/global/AccessFu.properties 1734lib/firefox/chrome/en-US/locale/en-US/global/AccessFu.properties
1723lib/firefox/chrome/en-US/locale/en-US/global/about.dtd 1735lib/firefox/chrome/en-US/locale/en-US/global/about.dtd
1724lib/firefox/chrome/en-US/locale/en-US/global/aboutAbout.dtd 1736lib/firefox/chrome/en-US/locale/en-US/global/aboutAbout.dtd
1725lib/firefox/chrome/en-US/locale/en-US/global/aboutNetworking.dtd 1737lib/firefox/chrome/en-US/locale/en-US/global/aboutNetworking.dtd
1726lib/firefox/chrome/en-US/locale/en-US/global/aboutReader.properties 1738lib/firefox/chrome/en-US/locale/en-US/global/aboutReader.properties
1727lib/firefox/chrome/en-US/locale/en-US/global/aboutRights.dtd 1739lib/firefox/chrome/en-US/locale/en-US/global/aboutRights.dtd
1728lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.dtd 1740lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.dtd
1729lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.properties 1741lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.properties
1730lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.dtd 1742lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.dtd
1731lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.properties 1743lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.properties
 1744lib/firefox/chrome/en-US/locale/en-US/global/aboutWebrtc.properties
1732lib/firefox/chrome/en-US/locale/en-US/global/appPicker.dtd 1745lib/firefox/chrome/en-US/locale/en-US/global/appPicker.dtd
1733lib/firefox/chrome/en-US/locale/en-US/global/appstrings.properties 1746lib/firefox/chrome/en-US/locale/en-US/global/appstrings.properties
1734lib/firefox/chrome/en-US/locale/en-US/global/autocomplete.properties 1747lib/firefox/chrome/en-US/locale/en-US/global/autocomplete.properties
1735lib/firefox/chrome/en-US/locale/en-US/global/brand.dtd 1748lib/firefox/chrome/en-US/locale/en-US/global/brand.dtd
1736lib/firefox/chrome/en-US/locale/en-US/global/browser.properties 1749lib/firefox/chrome/en-US/locale/en-US/global/browser.properties
1737lib/firefox/chrome/en-US/locale/en-US/global/charsetMenu.dtd 1750lib/firefox/chrome/en-US/locale/en-US/global/charsetMenu.dtd
1738lib/firefox/chrome/en-US/locale/en-US/global/charsetMenu.properties 1751lib/firefox/chrome/en-US/locale/en-US/global/charsetMenu.properties
1739lib/firefox/chrome/en-US/locale/en-US/global/commonDialog.dtd 1752lib/firefox/chrome/en-US/locale/en-US/global/commonDialog.dtd
1740lib/firefox/chrome/en-US/locale/en-US/global/commonDialogs.properties 1753lib/firefox/chrome/en-US/locale/en-US/global/commonDialogs.properties
1741lib/firefox/chrome/en-US/locale/en-US/global/config.dtd 1754lib/firefox/chrome/en-US/locale/en-US/global/config.dtd
1742lib/firefox/chrome/en-US/locale/en-US/global/config.properties 1755lib/firefox/chrome/en-US/locale/en-US/global/config.properties
1743lib/firefox/chrome/en-US/locale/en-US/global/console.dtd 1756lib/firefox/chrome/en-US/locale/en-US/global/console.dtd
1744lib/firefox/chrome/en-US/locale/en-US/global/console.properties 1757lib/firefox/chrome/en-US/locale/en-US/global/console.properties
@@ -1852,34 +1865,41 @@ lib/firefox/chrome/en-US/locale/en-US/pi @@ -1852,34 +1865,41 @@ lib/firefox/chrome/en-US/locale/en-US/pi
1852lib/firefox/chrome/en-US/locale/en-US/pippki/certManager.dtd 1865lib/firefox/chrome/en-US/locale/en-US/pippki/certManager.dtd
1853lib/firefox/chrome/en-US/locale/en-US/pippki/deviceManager.dtd 1866lib/firefox/chrome/en-US/locale/en-US/pippki/deviceManager.dtd
1854lib/firefox/chrome/en-US/locale/en-US/pippki/pippki.dtd 1867lib/firefox/chrome/en-US/locale/en-US/pippki/pippki.dtd
1855lib/firefox/chrome/en-US/locale/en-US/pippki/pippki.properties 1868lib/firefox/chrome/en-US/locale/en-US/pippki/pippki.properties
1856lib/firefox/chrome/en-US/locale/en-US/places/places.properties 1869lib/firefox/chrome/en-US/locale/en-US/places/places.properties
1857lib/firefox/chrome/en-US/locale/en-US/services/errors.properties 1870lib/firefox/chrome/en-US/locale/en-US/services/errors.properties
1858lib/firefox/chrome/en-US/locale/en-US/services/sync.properties 1871lib/firefox/chrome/en-US/locale/en-US/services/sync.properties
1859lib/firefox/chrome/marionette/content/ChromePowers.js 1872lib/firefox/chrome/marionette/content/ChromePowers.js
1860lib/firefox/chrome/marionette/content/ChromeUtils.js 1873lib/firefox/chrome/marionette/content/ChromeUtils.js
1861lib/firefox/chrome/marionette/content/EventUtils.js 1874lib/firefox/chrome/marionette/content/EventUtils.js
1862lib/firefox/chrome/marionette/content/MozillaLogger.js 1875lib/firefox/chrome/marionette/content/MozillaLogger.js
1863lib/firefox/chrome/marionette/content/SpecialPowersObserver.js 1876lib/firefox/chrome/marionette/content/SpecialPowersObserver.js
1864lib/firefox/chrome/marionette/content/SpecialPowersObserverAPI.js 1877lib/firefox/chrome/marionette/content/SpecialPowersObserverAPI.js
 1878lib/firefox/chrome/marionette/content/actions.js
1865lib/firefox/chrome/marionette/content/atoms.js 1879lib/firefox/chrome/marionette/content/atoms.js
1866lib/firefox/chrome/marionette/content/marionette-common.js 1880lib/firefox/chrome/marionette/content/command.js
1867lib/firefox/chrome/marionette/content/marionette-elements.js 1881lib/firefox/chrome/marionette/content/common.js
1868lib/firefox/chrome/marionette/content/marionette-frame-manager.js 1882lib/firefox/chrome/marionette/content/dispatcher.js
1869lib/firefox/chrome/marionette/content/marionette-listener.js 1883lib/firefox/chrome/marionette/content/driver.js
1870lib/firefox/chrome/marionette/content/marionette-sendkeys.js 1884lib/firefox/chrome/marionette/content/elements.js
1871lib/firefox/chrome/marionette/content/marionette-server.js 1885lib/firefox/chrome/marionette/content/emulator.js
1872lib/firefox/chrome/marionette/content/marionette-simpletest.js 1886lib/firefox/chrome/marionette/content/error.js
 1887lib/firefox/chrome/marionette/content/frame-manager.js
 1888lib/firefox/chrome/marionette/content/listener.js
 1889lib/firefox/chrome/marionette/content/modal.js
 1890lib/firefox/chrome/marionette/content/sendkeys.js
 1891lib/firefox/chrome/marionette/content/server.js
 1892lib/firefox/chrome/marionette/content/simpletest.js
1873lib/firefox/chrome/marionette/content/specialpowers.js 1893lib/firefox/chrome/marionette/content/specialpowers.js
1874lib/firefox/chrome/marionette/content/specialpowersAPI.js 1894lib/firefox/chrome/marionette/content/specialpowersAPI.js
1875lib/firefox/chrome/marionette/modules/Assert.jsm 1895lib/firefox/chrome/marionette/modules/Assert.jsm
1876lib/firefox/chrome/marionette/modules/MockColorPicker.jsm 1896lib/firefox/chrome/marionette/modules/MockColorPicker.jsm
1877lib/firefox/chrome/marionette/modules/MockFilePicker.jsm 1897lib/firefox/chrome/marionette/modules/MockFilePicker.jsm
1878lib/firefox/chrome/marionette/modules/MockPaymentsUIGlue.jsm 1898lib/firefox/chrome/marionette/modules/MockPaymentsUIGlue.jsm
1879lib/firefox/chrome/marionette/modules/MockPermissionPrompt.jsm 1899lib/firefox/chrome/marionette/modules/MockPermissionPrompt.jsm
1880lib/firefox/chrome/pippki/content/pippki/CAOverlay.xul 1900lib/firefox/chrome/pippki/content/pippki/CAOverlay.xul
1881lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul 1901lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul
1882lib/firefox/chrome/pippki/content/pippki/OrphanOverlay.xul 1902lib/firefox/chrome/pippki/content/pippki/OrphanOverlay.xul
1883lib/firefox/chrome/pippki/content/pippki/OthersOverlay.xul 1903lib/firefox/chrome/pippki/content/pippki/OthersOverlay.xul
1884lib/firefox/chrome/pippki/content/pippki/WebSitesOverlay.xul 1904lib/firefox/chrome/pippki/content/pippki/WebSitesOverlay.xul
1885lib/firefox/chrome/pippki/content/pippki/certDump.xul 1905lib/firefox/chrome/pippki/content/pippki/certDump.xul
@@ -1893,51 +1913,48 @@ lib/firefox/chrome/pippki/content/pippki @@ -1893,51 +1913,48 @@ lib/firefox/chrome/pippki/content/pippki
1893lib/firefox/chrome/pippki/content/pippki/choosetoken.xul 1913lib/firefox/chrome/pippki/content/pippki/choosetoken.xul
1894lib/firefox/chrome/pippki/content/pippki/clientauthask.js 1914lib/firefox/chrome/pippki/content/pippki/clientauthask.js
1895lib/firefox/chrome/pippki/content/pippki/clientauthask.xul 1915lib/firefox/chrome/pippki/content/pippki/clientauthask.xul
1896lib/firefox/chrome/pippki/content/pippki/createCertInfo.js 1916lib/firefox/chrome/pippki/content/pippki/createCertInfo.js
1897lib/firefox/chrome/pippki/content/pippki/createCertInfo.xul 1917lib/firefox/chrome/pippki/content/pippki/createCertInfo.xul
1898lib/firefox/chrome/pippki/content/pippki/deletecert.js 1918lib/firefox/chrome/pippki/content/pippki/deletecert.js
1899lib/firefox/chrome/pippki/content/pippki/deletecert.xul 1919lib/firefox/chrome/pippki/content/pippki/deletecert.xul
1900lib/firefox/chrome/pippki/content/pippki/device_manager.js 1920lib/firefox/chrome/pippki/content/pippki/device_manager.js
1901lib/firefox/chrome/pippki/content/pippki/device_manager.xul 1921lib/firefox/chrome/pippki/content/pippki/device_manager.xul
1902lib/firefox/chrome/pippki/content/pippki/downloadcert.js 1922lib/firefox/chrome/pippki/content/pippki/downloadcert.js
1903lib/firefox/chrome/pippki/content/pippki/downloadcert.xul 1923lib/firefox/chrome/pippki/content/pippki/downloadcert.xul
1904lib/firefox/chrome/pippki/content/pippki/editcacert.xul 1924lib/firefox/chrome/pippki/content/pippki/editcacert.xul
1905lib/firefox/chrome/pippki/content/pippki/editcerts.js 1925lib/firefox/chrome/pippki/content/pippki/editcerts.js
1906lib/firefox/chrome/pippki/content/pippki/editemailcert.xul 
1907lib/firefox/chrome/pippki/content/pippki/escrowWarn.js 
1908lib/firefox/chrome/pippki/content/pippki/escrowWarn.xul 
1909lib/firefox/chrome/pippki/content/pippki/exceptionDialog.js 1926lib/firefox/chrome/pippki/content/pippki/exceptionDialog.js
1910lib/firefox/chrome/pippki/content/pippki/exceptionDialog.xul 1927lib/firefox/chrome/pippki/content/pippki/exceptionDialog.xul
1911lib/firefox/chrome/pippki/content/pippki/getpassword.xul 
1912lib/firefox/chrome/pippki/content/pippki/load_device.xul 1928lib/firefox/chrome/pippki/content/pippki/load_device.xul
1913lib/firefox/chrome/pippki/content/pippki/password.js 1929lib/firefox/chrome/pippki/content/pippki/password.js
1914lib/firefox/chrome/pippki/content/pippki/pippki.js 1930lib/firefox/chrome/pippki/content/pippki/pippki.js
1915lib/firefox/chrome/pippki/content/pippki/protectedAuth.js 1931lib/firefox/chrome/pippki/content/pippki/protectedAuth.js
1916lib/firefox/chrome/pippki/content/pippki/protectedAuth.xul 1932lib/firefox/chrome/pippki/content/pippki/protectedAuth.xul
1917lib/firefox/chrome/pippki/content/pippki/resetpassword.js 1933lib/firefox/chrome/pippki/content/pippki/resetpassword.js
1918lib/firefox/chrome/pippki/content/pippki/resetpassword.xul 1934lib/firefox/chrome/pippki/content/pippki/resetpassword.xul
1919lib/firefox/chrome/pippki/content/pippki/setp12password.xul 1935lib/firefox/chrome/pippki/content/pippki/setp12password.xul
1920lib/firefox/chrome/pippki/content/pippki/viewCertDetails.js 1936lib/firefox/chrome/pippki/content/pippki/viewCertDetails.js
1921lib/firefox/chrome/pippki/content/pippki/viewCertDetails.xul 1937lib/firefox/chrome/pippki/content/pippki/viewCertDetails.xul
1922lib/firefox/chrome/recording/content/recording.js 1938lib/firefox/chrome/recording/content/recording.js
1923lib/firefox/chrome/recording/content/recording.xul 1939lib/firefox/chrome/recording/content/recording.xul
1924lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.js 1940lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.js
1925lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.xul 1941lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.xul
1926lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.js 1942lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.js
1927lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.xhtml 1943lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.xhtml
1928lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js 1944lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js
1929lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js 1945lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js
1930lib/firefox/chrome/toolkit/content/global/BrowserElementPanning.js 1946lib/firefox/chrome/toolkit/content/global/BrowserElementPanning.js
 1947lib/firefox/chrome/toolkit/content/global/BrowserElementPanningAPZDisabled.js
1931lib/firefox/chrome/toolkit/content/global/XPCNativeWrapper.js 1948lib/firefox/chrome/toolkit/content/global/XPCNativeWrapper.js
1932lib/firefox/chrome/toolkit/content/global/about.js 1949lib/firefox/chrome/toolkit/content/global/about.js
1933lib/firefox/chrome/toolkit/content/global/about.xhtml 1950lib/firefox/chrome/toolkit/content/global/about.xhtml
1934lib/firefox/chrome/toolkit/content/global/aboutAbout.js 1951lib/firefox/chrome/toolkit/content/global/aboutAbout.js
1935lib/firefox/chrome/toolkit/content/global/aboutAbout.xhtml 1952lib/firefox/chrome/toolkit/content/global/aboutAbout.xhtml
1936lib/firefox/chrome/toolkit/content/global/aboutCache.js 1953lib/firefox/chrome/toolkit/content/global/aboutCache.js
1937lib/firefox/chrome/toolkit/content/global/aboutCompartments.js 1954lib/firefox/chrome/toolkit/content/global/aboutCompartments.js
1938lib/firefox/chrome/toolkit/content/global/aboutCompartments.xhtml 1955lib/firefox/chrome/toolkit/content/global/aboutCompartments.xhtml
1939lib/firefox/chrome/toolkit/content/global/aboutMemory.css 1956lib/firefox/chrome/toolkit/content/global/aboutMemory.css
1940lib/firefox/chrome/toolkit/content/global/aboutMemory.js 1957lib/firefox/chrome/toolkit/content/global/aboutMemory.js
1941lib/firefox/chrome/toolkit/content/global/aboutMemory.xhtml 1958lib/firefox/chrome/toolkit/content/global/aboutMemory.xhtml
1942lib/firefox/chrome/toolkit/content/global/aboutNetworking.js 1959lib/firefox/chrome/toolkit/content/global/aboutNetworking.js
1943lib/firefox/chrome/toolkit/content/global/aboutNetworking.xhtml 1960lib/firefox/chrome/toolkit/content/global/aboutNetworking.xhtml
@@ -2051,26 +2068,27 @@ lib/firefox/chrome/toolkit/content/globa @@ -2051,26 +2068,27 @@ lib/firefox/chrome/toolkit/content/globa
2051lib/firefox/chrome/toolkit/content/global/preload.js 2068lib/firefox/chrome/toolkit/content/global/preload.js
2052lib/firefox/chrome/toolkit/content/global/printPageSetup.js 2069lib/firefox/chrome/toolkit/content/global/printPageSetup.js
2053lib/firefox/chrome/toolkit/content/global/printPageSetup.xul 2070lib/firefox/chrome/toolkit/content/global/printPageSetup.xul
2054lib/firefox/chrome/toolkit/content/global/printPreviewBindings.xml 2071lib/firefox/chrome/toolkit/content/global/printPreviewBindings.xml
2055lib/firefox/chrome/toolkit/content/global/printPreviewProgress.js 2072lib/firefox/chrome/toolkit/content/global/printPreviewProgress.js
2056lib/firefox/chrome/toolkit/content/global/printPreviewProgress.xul 2073lib/firefox/chrome/toolkit/content/global/printPreviewProgress.xul
2057lib/firefox/chrome/toolkit/content/global/printProgress.js 2074lib/firefox/chrome/toolkit/content/global/printProgress.js
2058lib/firefox/chrome/toolkit/content/global/printProgress.xul 2075lib/firefox/chrome/toolkit/content/global/printProgress.xul
2059lib/firefox/chrome/toolkit/content/global/printUtils.js 2076lib/firefox/chrome/toolkit/content/global/printUtils.js
2060lib/firefox/chrome/toolkit/content/global/printdialog.js 2077lib/firefox/chrome/toolkit/content/global/printdialog.js
2061lib/firefox/chrome/toolkit/content/global/printdialog.xul 2078lib/firefox/chrome/toolkit/content/global/printdialog.xul
2062lib/firefox/chrome/toolkit/content/global/printjoboptions.js 2079lib/firefox/chrome/toolkit/content/global/printjoboptions.js
2063lib/firefox/chrome/toolkit/content/global/printjoboptions.xul 2080lib/firefox/chrome/toolkit/content/global/printjoboptions.xul
 2081lib/firefox/chrome/toolkit/content/global/process-content.js
2064lib/firefox/chrome/toolkit/content/global/reader/aboutReader.html 2082lib/firefox/chrome/toolkit/content/global/reader/aboutReader.html
2065lib/firefox/chrome/toolkit/content/global/reader/aboutReader.js 2083lib/firefox/chrome/toolkit/content/global/reader/aboutReader.js
2066lib/firefox/chrome/toolkit/content/global/remote-test-ipc.js 2084lib/firefox/chrome/toolkit/content/global/remote-test-ipc.js
2067lib/firefox/chrome/toolkit/content/global/resetProfile.css 2085lib/firefox/chrome/toolkit/content/global/resetProfile.css
2068lib/firefox/chrome/toolkit/content/global/resetProfile.js 2086lib/firefox/chrome/toolkit/content/global/resetProfile.js
2069lib/firefox/chrome/toolkit/content/global/resetProfile.xul 2087lib/firefox/chrome/toolkit/content/global/resetProfile.xul
2070lib/firefox/chrome/toolkit/content/global/resetProfileProgress.xul 2088lib/firefox/chrome/toolkit/content/global/resetProfileProgress.xul
2071lib/firefox/chrome/toolkit/content/global/select-child.js 2089lib/firefox/chrome/toolkit/content/global/select-child.js
2072lib/firefox/chrome/toolkit/content/global/selectDialog.js 2090lib/firefox/chrome/toolkit/content/global/selectDialog.js
2073lib/firefox/chrome/toolkit/content/global/selectDialog.xul 2091lib/firefox/chrome/toolkit/content/global/selectDialog.xul
2074lib/firefox/chrome/toolkit/content/global/strres.js 2092lib/firefox/chrome/toolkit/content/global/strres.js
2075lib/firefox/chrome/toolkit/content/global/svg/svgBindings.xml 2093lib/firefox/chrome/toolkit/content/global/svg/svgBindings.xml
2076lib/firefox/chrome/toolkit/content/global/tabprompts.css 2094lib/firefox/chrome/toolkit/content/global/tabprompts.css
@@ -2456,42 +2474,44 @@ lib/firefox/chrome/toolkit/skin/classic/ @@ -2456,42 +2474,44 @@ lib/firefox/chrome/toolkit/skin/classic/
2456lib/firefox/chrome/toolkit/skin/classic/mozapps/profile/profileicon.png 2474lib/firefox/chrome/toolkit/skin/classic/mozapps/profile/profileicon.png
2457lib/firefox/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png 2475lib/firefox/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
2458lib/firefox/chrome/toolkit/skin/classic/mozapps/update/updates.css 2476lib/firefox/chrome/toolkit/skin/classic/mozapps/update/updates.css
2459lib/firefox/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css 2477lib/firefox/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
2460lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css 2478lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
2461lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png 2479lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
2462lib/firefox/components/ActivityMessageConfigurator.js 2480lib/firefox/components/ActivityMessageConfigurator.js
2463lib/firefox/components/ActivityProxy.js 2481lib/firefox/components/ActivityProxy.js
2464lib/firefox/components/ActivityRequestHandler.js 2482lib/firefox/components/ActivityRequestHandler.js
2465lib/firefox/components/ActivityWrapper.js 2483lib/firefox/components/ActivityWrapper.js
2466lib/firefox/components/AlarmsManager.js 2484lib/firefox/components/AlarmsManager.js
2467lib/firefox/components/AppsService.js 2485lib/firefox/components/AppsService.js
2468lib/firefox/components/BrowserElementParent.js 2486lib/firefox/components/BrowserElementParent.js
 2487lib/firefox/components/CSSUnprefixingService.js
2469lib/firefox/components/ChromeNotifications.js 2488lib/firefox/components/ChromeNotifications.js
2470lib/firefox/components/ColorAnalyzer.js 2489lib/firefox/components/ColorAnalyzer.js
2471lib/firefox/components/ConsoleAPIStorage.js 2490lib/firefox/components/ConsoleAPIStorage.js
2472lib/firefox/components/ContactManager.js 2491lib/firefox/components/ContactManager.js
2473lib/firefox/components/ContentProcessSingleton.js 2492lib/firefox/components/ContentProcessSingleton.js
2474lib/firefox/components/DataReportingService.js 2493lib/firefox/components/DataReportingService.js
2475lib/firefox/components/DataStoreImpl.js 2494lib/firefox/components/DataStoreImpl.js
2476lib/firefox/components/DownloadLegacy.js 2495lib/firefox/components/DownloadLegacy.js
2477lib/firefox/components/FeedProcessor.js 2496lib/firefox/components/FeedProcessor.js
2478lib/firefox/components/FormAutofillContentService.js 2497lib/firefox/components/FormAutofillContentService.js
2479lib/firefox/components/FormAutofillStartup.js 2498lib/firefox/components/FormAutofillStartup.js
2480lib/firefox/components/FormHistoryStartup.js 2499lib/firefox/components/FormHistoryStartup.js
2481lib/firefox/components/MainProcessSingleton.js 2500lib/firefox/components/MainProcessSingleton.js
2482lib/firefox/components/MozKeyboard.js 2501lib/firefox/components/MozKeyboard.js
2483lib/firefox/components/NetworkGeolocationProvider.js 2502lib/firefox/components/NetworkGeolocationProvider.js
2484lib/firefox/components/NotificationStorage.js 2503lib/firefox/components/NotificationStorage.js
 2504lib/firefox/components/PACGenerator.js
2485lib/firefox/components/PageThumbsProtocol.js 2505lib/firefox/components/PageThumbsProtocol.js
2486lib/firefox/components/Payment.js 2506lib/firefox/components/Payment.js
2487lib/firefox/components/PaymentFlowInfo.js 2507lib/firefox/components/PaymentFlowInfo.js
2488lib/firefox/components/PermissionSettings.js 2508lib/firefox/components/PermissionSettings.js
2489lib/firefox/components/PhoneNumberService.js 2509lib/firefox/components/PhoneNumberService.js
2490lib/firefox/components/PlacesCategoriesStarter.js 2510lib/firefox/components/PlacesCategoriesStarter.js
2491lib/firefox/components/PresentationDeviceInfoManager.js 2511lib/firefox/components/PresentationDeviceInfoManager.js
2492lib/firefox/components/Push.js 2512lib/firefox/components/Push.js
2493lib/firefox/components/PushServiceLauncher.js 2513lib/firefox/components/PushServiceLauncher.js
2494lib/firefox/components/RequestSyncManager.js 2514lib/firefox/components/RequestSyncManager.js
2495lib/firefox/components/RequestSyncScheduler.js 2515lib/firefox/components/RequestSyncScheduler.js
2496lib/firefox/components/SettingsManager.js 2516lib/firefox/components/SettingsManager.js
2497lib/firefox/components/SiteSpecificUserAgent.js 2517lib/firefox/components/SiteSpecificUserAgent.js
@@ -2518,34 +2538,32 @@ lib/firefox/components/crypto-SDR.js @@ -2518,34 +2538,32 @@ lib/firefox/components/crypto-SDR.js
2518lib/firefox/components/htmlMenuBuilder.js 2538lib/firefox/components/htmlMenuBuilder.js
2519lib/firefox/components/interfaces.xpt 2539lib/firefox/components/interfaces.xpt
2520lib/firefox/components/jsconsole-clhandler.js 2540lib/firefox/components/jsconsole-clhandler.js
2521${PLIST.gnome}lib/firefox/components/libdbusservice.so 2541${PLIST.gnome}lib/firefox/components/libdbusservice.so
2522lib/firefox/components/libmozgnome.so 2542lib/firefox/components/libmozgnome.so
2523lib/firefox/components/marionettecomponent.js 2543lib/firefox/components/marionettecomponent.js
2524lib/firefox/components/messageWakeupService.js 2544lib/firefox/components/messageWakeupService.js
2525lib/firefox/components/multiprocessShims.js 2545lib/firefox/components/multiprocessShims.js
2526lib/firefox/components/nsAsyncShutdown.js 2546lib/firefox/components/nsAsyncShutdown.js
2527lib/firefox/components/nsBlocklistService.js 2547lib/firefox/components/nsBlocklistService.js
2528lib/firefox/components/nsContentDispatchChooser.js 2548lib/firefox/components/nsContentDispatchChooser.js
2529lib/firefox/components/nsContentPrefService.js 2549lib/firefox/components/nsContentPrefService.js
2530lib/firefox/components/nsCrashMonitor.js 2550lib/firefox/components/nsCrashMonitor.js
2531lib/firefox/components/nsDOMIdentity.js 
2532lib/firefox/components/nsDefaultCLH.js 2551lib/firefox/components/nsDefaultCLH.js
2533lib/firefox/components/nsFilePicker.js 2552lib/firefox/components/nsFilePicker.js
2534lib/firefox/components/nsFormAutoComplete.js 2553lib/firefox/components/nsFormAutoComplete.js
2535lib/firefox/components/nsFormHistory.js 2554lib/firefox/components/nsFormHistory.js
2536lib/firefox/components/nsHandlerService.js 2555lib/firefox/components/nsHandlerService.js
2537lib/firefox/components/nsHelperAppDlg.js 2556lib/firefox/components/nsHelperAppDlg.js
2538lib/firefox/components/nsIDService.js 
2539lib/firefox/components/nsINIProcessor.js 2557lib/firefox/components/nsINIProcessor.js
2540lib/firefox/components/nsInputListAutoComplete.js 2558lib/firefox/components/nsInputListAutoComplete.js
2541lib/firefox/components/nsLivemarkService.js 2559lib/firefox/components/nsLivemarkService.js
2542lib/firefox/components/nsLoginInfo.js 2560lib/firefox/components/nsLoginInfo.js
2543lib/firefox/components/nsLoginManager.js 2561lib/firefox/components/nsLoginManager.js
2544lib/firefox/components/nsLoginManagerPrompter.js 2562lib/firefox/components/nsLoginManagerPrompter.js
2545lib/firefox/components/nsPlacesAutoComplete.js 2563lib/firefox/components/nsPlacesAutoComplete.js
2546lib/firefox/components/nsPlacesExpiration.js 2564lib/firefox/components/nsPlacesExpiration.js
2547lib/firefox/components/nsPrompter.js 2565lib/firefox/components/nsPrompter.js
2548lib/firefox/components/nsSearchService.js 2566lib/firefox/components/nsSearchService.js
2549lib/firefox/components/nsSearchSuggestions.js 2567lib/firefox/components/nsSearchSuggestions.js
2550lib/firefox/components/nsSidebar.js 2568lib/firefox/components/nsSidebar.js
2551lib/firefox/components/nsTaggingService.js 2569lib/firefox/components/nsTaggingService.js
@@ -2606,28 +2624,30 @@ lib/firefox/hyphenation/hyph_ru.dic @@ -2606,28 +2624,30 @@ lib/firefox/hyphenation/hyph_ru.dic
2606lib/firefox/hyphenation/hyph_sh.dic 2624lib/firefox/hyphenation/hyph_sh.dic
2607lib/firefox/hyphenation/hyph_sl.dic 2625lib/firefox/hyphenation/hyph_sl.dic
2608lib/firefox/hyphenation/hyph_sv.dic 2626lib/firefox/hyphenation/hyph_sv.dic
2609lib/firefox/hyphenation/hyph_tr.dic 2627lib/firefox/hyphenation/hyph_tr.dic
2610lib/firefox/hyphenation/hyph_uk.dic 2628lib/firefox/hyphenation/hyph_uk.dic
2611lib/firefox/libmozalloc.so 2629lib/firefox/libmozalloc.so
2612${PLIST.mozglue}lib/firefox/libmozglue.so 2630${PLIST.mozglue}lib/firefox/libmozglue.so
2613lib/firefox/libmozjs.so 2631lib/firefox/libmozjs.so
2614lib/firefox/libxul.so 2632lib/firefox/libxul.so
2615lib/firefox/modules/AboutReader.jsm 2633lib/firefox/modules/AboutReader.jsm
2616lib/firefox/modules/ActivitiesService.jsm 2634lib/firefox/modules/ActivitiesService.jsm
2617lib/firefox/modules/ActivitiesServiceFilter.jsm 2635lib/firefox/modules/ActivitiesServiceFilter.jsm
2618lib/firefox/modules/AddonManager.jsm 2636lib/firefox/modules/AddonManager.jsm
 2637lib/firefox/modules/AddonWatcher.jsm
2619lib/firefox/modules/AlarmDB.jsm 2638lib/firefox/modules/AlarmDB.jsm
2620lib/firefox/modules/AlarmService.jsm 2639lib/firefox/modules/AlarmService.jsm
 2640lib/firefox/modules/AppConstants.jsm
2621lib/firefox/modules/AppDownloadManager.jsm 2641lib/firefox/modules/AppDownloadManager.jsm
2622lib/firefox/modules/AppsServiceChild.jsm 2642lib/firefox/modules/AppsServiceChild.jsm
2623lib/firefox/modules/AppsUtils.jsm 2643lib/firefox/modules/AppsUtils.jsm
2624lib/firefox/modules/AsyncShutdown.jsm 2644lib/firefox/modules/AsyncShutdown.jsm
2625lib/firefox/modules/AsyncSpellCheckTestHelper.jsm 2645lib/firefox/modules/AsyncSpellCheckTestHelper.jsm
2626lib/firefox/modules/AutoCompleteE10S.jsm 2646lib/firefox/modules/AutoCompleteE10S.jsm
2627lib/firefox/modules/BackgroundPageThumbs.jsm 2647lib/firefox/modules/BackgroundPageThumbs.jsm
2628lib/firefox/modules/Battery.jsm 2648lib/firefox/modules/Battery.jsm
2629lib/firefox/modules/BinarySearch.jsm 2649lib/firefox/modules/BinarySearch.jsm
2630lib/firefox/modules/BookmarkHTMLUtils.jsm 2650lib/firefox/modules/BookmarkHTMLUtils.jsm
2631lib/firefox/modules/BookmarkJSONUtils.jsm 2651lib/firefox/modules/BookmarkJSONUtils.jsm
2632lib/firefox/modules/Bookmarks.jsm 2652lib/firefox/modules/Bookmarks.jsm
2633lib/firefox/modules/BrowserElementPromptService.jsm 2653lib/firefox/modules/BrowserElementPromptService.jsm
@@ -2647,27 +2667,26 @@ lib/firefox/modules/ClusterLib.js @@ -2647,27 +2667,26 @@ lib/firefox/modules/ClusterLib.js
2647lib/firefox/modules/ColorAnalyzer_worker.js 2667lib/firefox/modules/ColorAnalyzer_worker.js
2648lib/firefox/modules/ColorConversion.js 2668lib/firefox/modules/ColorConversion.js
2649lib/firefox/modules/CommonDialog.jsm 2669lib/firefox/modules/CommonDialog.jsm
2650lib/firefox/modules/ContactDB.jsm 2670lib/firefox/modules/ContactDB.jsm
2651lib/firefox/modules/ContactService.jsm 2671lib/firefox/modules/ContactService.jsm
2652lib/firefox/modules/ContentPrefInstance.jsm 2672lib/firefox/modules/ContentPrefInstance.jsm
2653lib/firefox/modules/ContentPrefService2.jsm 2673lib/firefox/modules/ContentPrefService2.jsm
2654lib/firefox/modules/ContentPrefServiceChild.jsm 2674lib/firefox/modules/ContentPrefServiceChild.jsm
2655lib/firefox/modules/ContentPrefServiceParent.jsm 2675lib/firefox/modules/ContentPrefServiceParent.jsm
2656lib/firefox/modules/ContentPrefStore.jsm 2676lib/firefox/modules/ContentPrefStore.jsm
2657lib/firefox/modules/ContentPrefUtils.jsm 2677lib/firefox/modules/ContentPrefUtils.jsm
2658lib/firefox/modules/CrashMonitor.jsm 2678lib/firefox/modules/CrashMonitor.jsm
2659lib/firefox/modules/Credentials.jsm 2679lib/firefox/modules/Credentials.jsm
2660lib/firefox/modules/DOMIdentity.jsm 
2661lib/firefox/modules/DOMRequestHelper.jsm 2680lib/firefox/modules/DOMRequestHelper.jsm
2662lib/firefox/modules/DataStoreChangeNotifier.jsm 2681lib/firefox/modules/DataStoreChangeNotifier.jsm
2663lib/firefox/modules/DataStoreCursorImpl.jsm 2682lib/firefox/modules/DataStoreCursorImpl.jsm
2664lib/firefox/modules/DataStoreDB.jsm 2683lib/firefox/modules/DataStoreDB.jsm
2665lib/firefox/modules/DeferredSave.jsm 2684lib/firefox/modules/DeferredSave.jsm
2666lib/firefox/modules/DeferredTask.jsm 2685lib/firefox/modules/DeferredTask.jsm
2667lib/firefox/modules/Deprecated.jsm 2686lib/firefox/modules/Deprecated.jsm
2668lib/firefox/modules/Dict.jsm 2687lib/firefox/modules/Dict.jsm
2669lib/firefox/modules/DownloadCore.jsm 2688lib/firefox/modules/DownloadCore.jsm
2670lib/firefox/modules/DownloadImport.jsm 2689lib/firefox/modules/DownloadImport.jsm
2671lib/firefox/modules/DownloadIntegration.jsm 2690lib/firefox/modules/DownloadIntegration.jsm
2672lib/firefox/modules/DownloadLastDir.jsm 2691lib/firefox/modules/DownloadLastDir.jsm
2673lib/firefox/modules/DownloadList.jsm 2692lib/firefox/modules/DownloadList.jsm
@@ -2682,61 +2701,65 @@ lib/firefox/modules/Finder.jsm @@ -2682,61 +2701,65 @@ lib/firefox/modules/Finder.jsm
2682lib/firefox/modules/ForgetAboutSite.jsm 2701lib/firefox/modules/ForgetAboutSite.jsm
2683lib/firefox/modules/FormAutofill.jsm 2702lib/firefox/modules/FormAutofill.jsm
2684lib/firefox/modules/FormAutofillIntegration.jsm 2703lib/firefox/modules/FormAutofillIntegration.jsm
2685lib/firefox/modules/FormData.jsm 2704lib/firefox/modules/FormData.jsm
2686lib/firefox/modules/FormHistory.jsm 2705lib/firefox/modules/FormHistory.jsm
2687lib/firefox/modules/FrameWorker.jsm 2706lib/firefox/modules/FrameWorker.jsm
2688lib/firefox/modules/FrameWorkerContent.js 2707lib/firefox/modules/FrameWorkerContent.js
2689lib/firefox/modules/FreeSpaceWatcher.jsm 2708lib/firefox/modules/FreeSpaceWatcher.jsm
2690lib/firefox/modules/FxAccounts.jsm 2709lib/firefox/modules/FxAccounts.jsm
2691lib/firefox/modules/FxAccountsClient.jsm 2710lib/firefox/modules/FxAccountsClient.jsm
2692lib/firefox/modules/FxAccountsCommon.js 2711lib/firefox/modules/FxAccountsCommon.js
2693lib/firefox/modules/FxAccountsOAuthClient.jsm 2712lib/firefox/modules/FxAccountsOAuthClient.jsm
2694lib/firefox/modules/FxAccountsOAuthGrantClient.jsm 2713lib/firefox/modules/FxAccountsOAuthGrantClient.jsm
 2714lib/firefox/modules/FxAccountsProfile.jsm
 2715lib/firefox/modules/FxAccountsProfileChannel.jsm
2695lib/firefox/modules/FxAccountsProfileClient.jsm 2716lib/firefox/modules/FxAccountsProfileClient.jsm
2696lib/firefox/modules/GMPInstallManager.jsm 2717lib/firefox/modules/GMPInstallManager.jsm
2697lib/firefox/modules/GMPUtils.jsm 2718lib/firefox/modules/GMPUtils.jsm
2698lib/firefox/modules/Geometry.jsm 2719lib/firefox/modules/Geometry.jsm
2699lib/firefox/modules/HealthReport.jsm 2720lib/firefox/modules/HealthReport.jsm
2700lib/firefox/modules/History.jsm 2721lib/firefox/modules/History.jsm
2701lib/firefox/modules/Http.jsm 2722lib/firefox/modules/Http.jsm
2702lib/firefox/modules/ISO8601DateUtils.jsm 2723lib/firefox/modules/ISO8601DateUtils.jsm
2703lib/firefox/modules/ImportExport.jsm 2724lib/firefox/modules/ImportExport.jsm
2704lib/firefox/modules/IndexedDBHelper.jsm 2725lib/firefox/modules/IndexedDBHelper.jsm
2705lib/firefox/modules/InlineSpellChecker.jsm 2726lib/firefox/modules/InlineSpellChecker.jsm
2706lib/firefox/modules/InlineSpellCheckerContent.jsm 2727lib/firefox/modules/InlineSpellCheckerContent.jsm
2707lib/firefox/modules/InsecurePasswordUtils.jsm 2728lib/firefox/modules/InsecurePasswordUtils.jsm
2708lib/firefox/modules/InterAppCommService.jsm 2729lib/firefox/modules/InterAppCommService.jsm
2709lib/firefox/modules/Keyboard.jsm 2730lib/firefox/modules/Keyboard.jsm
2710lib/firefox/modules/Langpacks.jsm 2731lib/firefox/modules/Langpacks.jsm
2711lib/firefox/modules/LightweightThemeConsumer.jsm 2732lib/firefox/modules/LightweightThemeConsumer.jsm
2712lib/firefox/modules/LightweightThemeManager.jsm 2733lib/firefox/modules/LightweightThemeManager.jsm
2713lib/firefox/modules/LoadContextInfo.jsm 2734lib/firefox/modules/LoadContextInfo.jsm
2714lib/firefox/modules/Log.jsm 2735lib/firefox/modules/Log.jsm
2715lib/firefox/modules/LoginHelper.jsm 2736lib/firefox/modules/LoginHelper.jsm
2716lib/firefox/modules/LoginImport.jsm 2737lib/firefox/modules/LoginImport.jsm
2717lib/firefox/modules/LoginManagerContent.jsm 2738lib/firefox/modules/LoginManagerContent.jsm
2718lib/firefox/modules/LoginManagerParent.jsm 2739lib/firefox/modules/LoginManagerParent.jsm
 2740lib/firefox/modules/LoginRecipes.jsm
2719lib/firefox/modules/LoginStore.jsm 2741lib/firefox/modules/LoginStore.jsm
2720lib/firefox/modules/ManifestProcessor.jsm 2742lib/firefox/modules/ManifestProcessor.jsm
2721lib/firefox/modules/MessagePortBase.jsm 2743lib/firefox/modules/MessagePortBase.jsm
2722lib/firefox/modules/MessagePortWorker.js 2744lib/firefox/modules/MessagePortWorker.js
2723lib/firefox/modules/Metrics.jsm 2745lib/firefox/modules/Metrics.jsm
2724lib/firefox/modules/Microformats.js 2746lib/firefox/modules/Microformats.js
2725lib/firefox/modules/MozSocialAPI.jsm 2747lib/firefox/modules/MozSocialAPI.jsm
2726lib/firefox/modules/NativeApp.jsm 2748lib/firefox/modules/NativeApp.jsm
2727lib/firefox/modules/NetUtil.jsm 2749lib/firefox/modules/NetUtil.jsm
2728lib/firefox/modules/NewTabUtils.jsm 2750lib/firefox/modules/NewTabUtils.jsm
2729lib/firefox/modules/NotificationDB.jsm 2751lib/firefox/modules/NotificationDB.jsm
 2752lib/firefox/modules/ObjectUtils.jsm
2730lib/firefox/modules/OfflineCacheInstaller.jsm 2753lib/firefox/modules/OfflineCacheInstaller.jsm
2731lib/firefox/modules/OperatorApps.jsm 2754lib/firefox/modules/OperatorApps.jsm
2732lib/firefox/modules/PageMenu.jsm 2755lib/firefox/modules/PageMenu.jsm
2733lib/firefox/modules/PageMetadata.jsm 2756lib/firefox/modules/PageMetadata.jsm
2734lib/firefox/modules/PageThumbUtils.jsm 2757lib/firefox/modules/PageThumbUtils.jsm
2735lib/firefox/modules/PageThumbs.jsm 2758lib/firefox/modules/PageThumbs.jsm
2736lib/firefox/modules/PageThumbsWorker.js 2759lib/firefox/modules/PageThumbsWorker.js
2737lib/firefox/modules/Payment.jsm 2760lib/firefox/modules/Payment.jsm
2738lib/firefox/modules/PerfMeasurement.jsm 2761lib/firefox/modules/PerfMeasurement.jsm
2739lib/firefox/modules/PermissionSettings.jsm 2762lib/firefox/modules/PermissionSettings.jsm
2740lib/firefox/modules/PermissionsInstaller.jsm 2763lib/firefox/modules/PermissionsInstaller.jsm
2741lib/firefox/modules/PermissionsTable.jsm 2764lib/firefox/modules/PermissionsTable.jsm
2742lib/firefox/modules/PermissionsUtils.jsm 2765lib/firefox/modules/PermissionsUtils.jsm
@@ -2745,37 +2768,39 @@ lib/firefox/modules/PhoneNumberMetaData. @@ -2745,37 +2768,39 @@ lib/firefox/modules/PhoneNumberMetaData.
2745lib/firefox/modules/PhoneNumberNormalizer.jsm 2768lib/firefox/modules/PhoneNumberNormalizer.jsm
2746lib/firefox/modules/PhoneNumberUtils.jsm 2769lib/firefox/modules/PhoneNumberUtils.jsm
2747lib/firefox/modules/PlacesBackups.jsm 2770lib/firefox/modules/PlacesBackups.jsm
2748lib/firefox/modules/PlacesDBUtils.jsm 2771lib/firefox/modules/PlacesDBUtils.jsm
2749lib/firefox/modules/PlacesSearchAutocompleteProvider.jsm 2772lib/firefox/modules/PlacesSearchAutocompleteProvider.jsm
2750lib/firefox/modules/PlacesTransactions.jsm 2773lib/firefox/modules/PlacesTransactions.jsm
2751lib/firefox/modules/PlacesUtils.jsm 2774lib/firefox/modules/PlacesUtils.jsm
2752lib/firefox/modules/PluralForm.jsm 2775lib/firefox/modules/PluralForm.jsm
2753lib/firefox/modules/PopupNotifications.jsm 2776lib/firefox/modules/PopupNotifications.jsm
2754lib/firefox/modules/Preferences.jsm 2777lib/firefox/modules/Preferences.jsm
2755lib/firefox/modules/Prefetcher.jsm 2778lib/firefox/modules/Prefetcher.jsm
2756lib/firefox/modules/PresentationDeviceInfoManager.jsm 2779lib/firefox/modules/PresentationDeviceInfoManager.jsm
2757lib/firefox/modules/PrivateBrowsingUtils.jsm 2780lib/firefox/modules/PrivateBrowsingUtils.jsm
 2781lib/firefox/modules/ProfileAge.jsm
2758lib/firefox/modules/Promise-backend.js 2782lib/firefox/modules/Promise-backend.js
2759lib/firefox/modules/Promise.jsm 2783lib/firefox/modules/Promise.jsm
2760lib/firefox/modules/PromiseUtils.jsm 2784lib/firefox/modules/PromiseUtils.jsm
2761lib/firefox/modules/PromiseWorker.jsm 2785lib/firefox/modules/PromiseWorker.jsm
2762lib/firefox/modules/PropertyListUtils.jsm 2786lib/firefox/modules/PropertyListUtils.jsm
2763lib/firefox/modules/PushService.jsm 2787lib/firefox/modules/PushService.jsm
2764lib/firefox/modules/ReaderMode.jsm 2788lib/firefox/modules/ReaderMode.jsm
2765lib/firefox/modules/RemoteAddonsChild.jsm 2789lib/firefox/modules/RemoteAddonsChild.jsm
2766lib/firefox/modules/RemoteAddonsParent.jsm 2790lib/firefox/modules/RemoteAddonsParent.jsm
2767lib/firefox/modules/RemoteController.jsm 2791lib/firefox/modules/RemoteController.jsm
2768lib/firefox/modules/RemoteFinder.jsm 2792lib/firefox/modules/RemoteFinder.jsm
 2793lib/firefox/modules/RemotePageManager.jsm
2769lib/firefox/modules/RemoteSecurityUI.jsm 2794lib/firefox/modules/RemoteSecurityUI.jsm
2770lib/firefox/modules/RemoteWebNavigation.jsm 2795lib/firefox/modules/RemoteWebNavigation.jsm
2771lib/firefox/modules/RemoteWebProgress.jsm 2796lib/firefox/modules/RemoteWebProgress.jsm
2772lib/firefox/modules/RequestAutocompleteUI.jsm 2797lib/firefox/modules/RequestAutocompleteUI.jsm
2773lib/firefox/modules/RequestSyncApp.jsm 2798lib/firefox/modules/RequestSyncApp.jsm
2774lib/firefox/modules/RequestSyncService.jsm 2799lib/firefox/modules/RequestSyncService.jsm
2775lib/firefox/modules/RequestSyncTask.jsm 2800lib/firefox/modules/RequestSyncTask.jsm
2776lib/firefox/modules/ResetProfile.jsm 2801lib/firefox/modules/ResetProfile.jsm
2777lib/firefox/modules/ResourceStatsDB.jsm 2802lib/firefox/modules/ResourceStatsDB.jsm
2778lib/firefox/modules/ResourceStatsService.jsm 2803lib/firefox/modules/ResourceStatsService.jsm
2779lib/firefox/modules/RokuApp.jsm 2804lib/firefox/modules/RokuApp.jsm
2780lib/firefox/modules/SafeBrowsing.jsm 2805lib/firefox/modules/SafeBrowsing.jsm
2781lib/firefox/modules/ScriptPreloader.jsm 2806lib/firefox/modules/ScriptPreloader.jsm
@@ -2787,26 +2812,27 @@ lib/firefox/modules/SelectParentHelper.j @@ -2787,26 +2812,27 @@ lib/firefox/modules/SelectParentHelper.j
2787lib/firefox/modules/Services.jsm 2812lib/firefox/modules/Services.jsm
2788lib/firefox/modules/SettingsDB.jsm 2813lib/firefox/modules/SettingsDB.jsm
2789lib/firefox/modules/SettingsRequestManager.jsm 2814lib/firefox/modules/SettingsRequestManager.jsm
2790lib/firefox/modules/SharedPromptUtils.jsm 2815lib/firefox/modules/SharedPromptUtils.jsm
2791lib/firefox/modules/ShortcutUtils.jsm 2816lib/firefox/modules/ShortcutUtils.jsm
2792lib/firefox/modules/SimpleServiceDiscovery.jsm 2817lib/firefox/modules/SimpleServiceDiscovery.jsm
2793lib/firefox/modules/Sntp.jsm 2818lib/firefox/modules/Sntp.jsm
2794lib/firefox/modules/SocialService.jsm 2819lib/firefox/modules/SocialService.jsm
2795lib/firefox/modules/SpatialNavigation.jsm 2820lib/firefox/modules/SpatialNavigation.jsm
2796lib/firefox/modules/Sqlite.jsm 2821lib/firefox/modules/Sqlite.jsm
2797lib/firefox/modules/StoreTrustAnchor.jsm 2822lib/firefox/modules/StoreTrustAnchor.jsm
2798lib/firefox/modules/SystemMessagePermissionsChecker.jsm 2823lib/firefox/modules/SystemMessagePermissionsChecker.jsm
2799lib/firefox/modules/Task.jsm 2824lib/firefox/modules/Task.jsm
 2825lib/firefox/modules/TelemetryEnvironment.jsm
2800lib/firefox/modules/TelemetryFile.jsm 2826lib/firefox/modules/TelemetryFile.jsm
2801lib/firefox/modules/TelemetryLog.jsm 2827lib/firefox/modules/TelemetryLog.jsm
2802lib/firefox/modules/TelemetryPing.jsm 2828lib/firefox/modules/TelemetryPing.jsm
2803lib/firefox/modules/TelemetrySession.jsm 2829lib/firefox/modules/TelemetrySession.jsm
2804lib/firefox/modules/TelemetryStopwatch.jsm 2830lib/firefox/modules/TelemetryStopwatch.jsm
2805lib/firefox/modules/TelemetryTimestamps.jsm 2831lib/firefox/modules/TelemetryTimestamps.jsm
2806lib/firefox/modules/ThirdPartyCookieProbe.jsm 2832lib/firefox/modules/ThirdPartyCookieProbe.jsm
2807lib/firefox/modules/Timer.jsm 2833lib/firefox/modules/Timer.jsm
2808lib/firefox/modules/Troubleshoot.jsm 2834lib/firefox/modules/Troubleshoot.jsm
2809lib/firefox/modules/TrustedHostedAppsUtils.jsm 2835lib/firefox/modules/TrustedHostedAppsUtils.jsm
2810lib/firefox/modules/UITelemetry.jsm 2836lib/firefox/modules/UITelemetry.jsm
2811lib/firefox/modules/UpdateChannel.jsm 2837lib/firefox/modules/UpdateChannel.jsm
2812lib/firefox/modules/UserAgentOverrides.jsm 2838lib/firefox/modules/UserAgentOverrides.jsm
@@ -2837,69 +2863,72 @@ lib/firefox/modules/addons/AddonReposito @@ -2837,69 +2863,72 @@ lib/firefox/modules/addons/AddonReposito
2837lib/firefox/modules/addons/AddonUpdateChecker.jsm 2863lib/firefox/modules/addons/AddonUpdateChecker.jsm
2838lib/firefox/modules/addons/Content.js 2864lib/firefox/modules/addons/Content.js
2839lib/firefox/modules/addons/GMPProvider.jsm 2865lib/firefox/modules/addons/GMPProvider.jsm
2840lib/firefox/modules/addons/LightweightThemeImageOptimizer.jsm 2866lib/firefox/modules/addons/LightweightThemeImageOptimizer.jsm
2841lib/firefox/modules/addons/PluginProvider.jsm 2867lib/firefox/modules/addons/PluginProvider.jsm
2842lib/firefox/modules/addons/SpellCheckDictionaryBootstrap.js 2868lib/firefox/modules/addons/SpellCheckDictionaryBootstrap.js
2843lib/firefox/modules/addons/XPIProvider.jsm 2869lib/firefox/modules/addons/XPIProvider.jsm
2844lib/firefox/modules/addons/XPIProviderUtils.js 2870lib/firefox/modules/addons/XPIProviderUtils.js
2845lib/firefox/modules/commonjs/dev/debuggee.js 2871lib/firefox/modules/commonjs/dev/debuggee.js
2846lib/firefox/modules/commonjs/dev/frame-script.js 2872lib/firefox/modules/commonjs/dev/frame-script.js
2847lib/firefox/modules/commonjs/dev/panel.js 2873lib/firefox/modules/commonjs/dev/panel.js
2848lib/firefox/modules/commonjs/dev/panel/view.js 2874lib/firefox/modules/commonjs/dev/panel/view.js
2849lib/firefox/modules/commonjs/dev/ports.js 2875lib/firefox/modules/commonjs/dev/ports.js
 2876lib/firefox/modules/commonjs/dev/theme.js
 2877lib/firefox/modules/commonjs/dev/theme/hooks.js
2850lib/firefox/modules/commonjs/dev/toolbox.js 2878lib/firefox/modules/commonjs/dev/toolbox.js
2851lib/firefox/modules/commonjs/dev/utils.js 2879lib/firefox/modules/commonjs/dev/utils.js
2852lib/firefox/modules/commonjs/dev/volcan.js 2880lib/firefox/modules/commonjs/dev/volcan.js
2853lib/firefox/modules/commonjs/diffpatcher/diff.js 2881lib/firefox/modules/commonjs/diffpatcher/diff.js
2854lib/firefox/modules/commonjs/diffpatcher/index.js 2882lib/firefox/modules/commonjs/diffpatcher/index.js
2855lib/firefox/modules/commonjs/diffpatcher/patch.js 2883lib/firefox/modules/commonjs/diffpatcher/patch.js
2856lib/firefox/modules/commonjs/diffpatcher/rebase.js 2884lib/firefox/modules/commonjs/diffpatcher/rebase.js
2857lib/firefox/modules/commonjs/diffpatcher/test/common.js 2885lib/firefox/modules/commonjs/diffpatcher/test/common.js
2858lib/firefox/modules/commonjs/diffpatcher/test/diff.js 2886lib/firefox/modules/commonjs/diffpatcher/test/diff.js
2859lib/firefox/modules/commonjs/diffpatcher/test/index.js 2887lib/firefox/modules/commonjs/diffpatcher/test/index.js
2860lib/firefox/modules/commonjs/diffpatcher/test/patch.js 2888lib/firefox/modules/commonjs/diffpatcher/test/patch.js
2861lib/firefox/modules/commonjs/diffpatcher/test/tap.js 2889lib/firefox/modules/commonjs/diffpatcher/test/tap.js
2862lib/firefox/modules/commonjs/framescript/FrameScriptManager.jsm 2890lib/firefox/modules/commonjs/framescript/FrameScriptManager.jsm
2863lib/firefox/modules/commonjs/framescript/LoaderHelper.jsm 2891lib/firefox/modules/commonjs/framescript/content.jsm
2864lib/firefox/modules/commonjs/framescript/context-menu.js 2892lib/firefox/modules/commonjs/framescript/context-menu.js
2865lib/firefox/modules/commonjs/framescript/contextmenu-events.js 
2866lib/firefox/modules/commonjs/framescript/manager.js 2893lib/firefox/modules/commonjs/framescript/manager.js
2867lib/firefox/modules/commonjs/framescript/tab-events.js 
2868lib/firefox/modules/commonjs/framescript/util.js 2894lib/firefox/modules/commonjs/framescript/util.js
2869lib/firefox/modules/commonjs/index.js 2895lib/firefox/modules/commonjs/index.js
2870lib/firefox/modules/commonjs/method/core.js 2896lib/firefox/modules/commonjs/method/core.js
2871lib/firefox/modules/commonjs/method/test/browser.js 2897lib/firefox/modules/commonjs/method/test/browser.js
2872lib/firefox/modules/commonjs/method/test/common.js 2898lib/firefox/modules/commonjs/method/test/common.js
2873lib/firefox/modules/commonjs/node/os.js 2899lib/firefox/modules/commonjs/node/os.js
2874lib/firefox/modules/commonjs/sdk/addon/bootstrap.js 2900lib/firefox/modules/commonjs/sdk/addon/bootstrap.js
2875lib/firefox/modules/commonjs/sdk/addon/events.js 2901lib/firefox/modules/commonjs/sdk/addon/events.js
2876lib/firefox/modules/commonjs/sdk/addon/host.js 2902lib/firefox/modules/commonjs/sdk/addon/host.js
2877lib/firefox/modules/commonjs/sdk/addon/installer.js 2903lib/firefox/modules/commonjs/sdk/addon/installer.js
2878lib/firefox/modules/commonjs/sdk/addon/manager.js 2904lib/firefox/modules/commonjs/sdk/addon/manager.js
2879lib/firefox/modules/commonjs/sdk/addon/runner.js 2905lib/firefox/modules/commonjs/sdk/addon/runner.js
2880lib/firefox/modules/commonjs/sdk/addon/window.js 2906lib/firefox/modules/commonjs/sdk/addon/window.js
2881lib/firefox/modules/commonjs/sdk/base64.js 2907lib/firefox/modules/commonjs/sdk/base64.js
2882lib/firefox/modules/commonjs/sdk/browser/events.js 2908lib/firefox/modules/commonjs/sdk/browser/events.js
2883lib/firefox/modules/commonjs/sdk/clipboard.js 2909lib/firefox/modules/commonjs/sdk/clipboard.js
2884lib/firefox/modules/commonjs/sdk/console/plain-text.js 2910lib/firefox/modules/commonjs/sdk/console/plain-text.js
2885lib/firefox/modules/commonjs/sdk/console/traceback.js 2911lib/firefox/modules/commonjs/sdk/console/traceback.js
2886lib/firefox/modules/commonjs/sdk/content/content-worker.js 2912lib/firefox/modules/commonjs/sdk/content/content-worker.js
2887lib/firefox/modules/commonjs/sdk/content/content.js 2913lib/firefox/modules/commonjs/sdk/content/content.js
2888lib/firefox/modules/commonjs/sdk/content/context-menu.js 2914lib/firefox/modules/commonjs/sdk/content/context-menu.js
2889lib/firefox/modules/commonjs/sdk/content/events.js 2915lib/firefox/modules/commonjs/sdk/content/events.js
 2916lib/firefox/modules/commonjs/sdk/content/l10n-html.js
2890lib/firefox/modules/commonjs/sdk/content/loader.js 2917lib/firefox/modules/commonjs/sdk/content/loader.js
2891lib/firefox/modules/commonjs/sdk/content/mod.js 2918lib/firefox/modules/commonjs/sdk/content/mod.js
 2919lib/firefox/modules/commonjs/sdk/content/page-mod.js
2892lib/firefox/modules/commonjs/sdk/content/sandbox.js 2920lib/firefox/modules/commonjs/sdk/content/sandbox.js
 2921lib/firefox/modules/commonjs/sdk/content/tab-events.js
2893lib/firefox/modules/commonjs/sdk/content/thumbnail.js 2922lib/firefox/modules/commonjs/sdk/content/thumbnail.js
2894lib/firefox/modules/commonjs/sdk/content/utils.js 2923lib/firefox/modules/commonjs/sdk/content/utils.js
2895lib/firefox/modules/commonjs/sdk/content/worker-child.js 2924lib/firefox/modules/commonjs/sdk/content/worker-child.js
2896lib/firefox/modules/commonjs/sdk/content/worker.js 2925lib/firefox/modules/commonjs/sdk/content/worker.js
2897lib/firefox/modules/commonjs/sdk/context-menu.js 2926lib/firefox/modules/commonjs/sdk/context-menu.js
2898lib/firefox/modules/commonjs/sdk/context-menu/context.js 2927lib/firefox/modules/commonjs/sdk/context-menu/context.js
2899lib/firefox/modules/commonjs/sdk/context-menu/core.js 2928lib/firefox/modules/commonjs/sdk/context-menu/core.js
2900lib/firefox/modules/commonjs/sdk/context-menu/readers.js 2929lib/firefox/modules/commonjs/sdk/context-menu/readers.js
2901lib/firefox/modules/commonjs/sdk/context-menu@2.js 2930lib/firefox/modules/commonjs/sdk/context-menu@2.js
2902lib/firefox/modules/commonjs/sdk/core/disposable.js 2931lib/firefox/modules/commonjs/sdk/core/disposable.js
2903lib/firefox/modules/commonjs/sdk/core/heritage.js 2932lib/firefox/modules/commonjs/sdk/core/heritage.js
2904lib/firefox/modules/commonjs/sdk/core/namespace.js 2933lib/firefox/modules/commonjs/sdk/core/namespace.js
2905lib/firefox/modules/commonjs/sdk/core/observer.js 2934lib/firefox/modules/commonjs/sdk/core/observer.js
@@ -2986,26 +3015,30 @@ lib/firefox/modules/commonjs/sdk/places/ @@ -2986,26 +3015,30 @@ lib/firefox/modules/commonjs/sdk/places/
2986lib/firefox/modules/commonjs/sdk/places/history.js 3015lib/firefox/modules/commonjs/sdk/places/history.js
2987lib/firefox/modules/commonjs/sdk/places/host/host-bookmarks.js 3016lib/firefox/modules/commonjs/sdk/places/host/host-bookmarks.js
2988lib/firefox/modules/commonjs/sdk/places/host/host-query.js 3017lib/firefox/modules/commonjs/sdk/places/host/host-query.js
2989lib/firefox/modules/commonjs/sdk/places/host/host-tags.js 3018lib/firefox/modules/commonjs/sdk/places/host/host-tags.js
2990lib/firefox/modules/commonjs/sdk/places/utils.js 3019lib/firefox/modules/commonjs/sdk/places/utils.js
2991lib/firefox/modules/commonjs/sdk/platform/xpcom.js 3020lib/firefox/modules/commonjs/sdk/platform/xpcom.js
2992lib/firefox/modules/commonjs/sdk/preferences/event-target.js 3021lib/firefox/modules/commonjs/sdk/preferences/event-target.js
2993lib/firefox/modules/commonjs/sdk/preferences/native-options.js 3022lib/firefox/modules/commonjs/sdk/preferences/native-options.js
2994lib/firefox/modules/commonjs/sdk/preferences/service.js 3023lib/firefox/modules/commonjs/sdk/preferences/service.js
2995lib/firefox/modules/commonjs/sdk/preferences/utils.js 3024lib/firefox/modules/commonjs/sdk/preferences/utils.js
2996lib/firefox/modules/commonjs/sdk/private-browsing.js 3025lib/firefox/modules/commonjs/sdk/private-browsing.js
2997lib/firefox/modules/commonjs/sdk/private-browsing/utils.js 3026lib/firefox/modules/commonjs/sdk/private-browsing/utils.js
2998lib/firefox/modules/commonjs/sdk/querystring.js 3027lib/firefox/modules/commonjs/sdk/querystring.js
 3028lib/firefox/modules/commonjs/sdk/remote/child.js
 3029lib/firefox/modules/commonjs/sdk/remote/core.js
 3030lib/firefox/modules/commonjs/sdk/remote/parent.js
 3031lib/firefox/modules/commonjs/sdk/remote/utils.js
2999lib/firefox/modules/commonjs/sdk/request.js 3032lib/firefox/modules/commonjs/sdk/request.js
3000lib/firefox/modules/commonjs/sdk/selection.js 3033lib/firefox/modules/commonjs/sdk/selection.js
3001lib/firefox/modules/commonjs/sdk/self.js 3034lib/firefox/modules/commonjs/sdk/self.js
3002lib/firefox/modules/commonjs/sdk/simple-prefs.js 3035lib/firefox/modules/commonjs/sdk/simple-prefs.js
3003lib/firefox/modules/commonjs/sdk/simple-storage.js 3036lib/firefox/modules/commonjs/sdk/simple-storage.js
3004lib/firefox/modules/commonjs/sdk/stylesheet/style.js 3037lib/firefox/modules/commonjs/sdk/stylesheet/style.js
3005lib/firefox/modules/commonjs/sdk/stylesheet/utils.js 3038lib/firefox/modules/commonjs/sdk/stylesheet/utils.js
3006lib/firefox/modules/commonjs/sdk/system.js 3039lib/firefox/modules/commonjs/sdk/system.js
3007lib/firefox/modules/commonjs/sdk/system/child_process.js 3040lib/firefox/modules/commonjs/sdk/system/child_process.js
3008lib/firefox/modules/commonjs/sdk/system/child_process/subprocess.js 3041lib/firefox/modules/commonjs/sdk/system/child_process/subprocess.js
3009lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_unix.js 3042lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_unix.js
3010lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_win.js 3043lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_win.js
3011lib/firefox/modules/commonjs/sdk/system/environment.js 3044lib/firefox/modules/commonjs/sdk/system/environment.js
@@ -3227,26 +3260,27 @@ lib/firefox/modules/devtools/pretty-fast @@ -3227,26 +3260,27 @@ lib/firefox/modules/devtools/pretty-fast
3227lib/firefox/modules/devtools/qrcode/decoder/index.js 3260lib/firefox/modules/devtools/qrcode/decoder/index.js
3228lib/firefox/modules/devtools/qrcode/encoder/index.js 3261lib/firefox/modules/devtools/qrcode/encoder/index.js
3229lib/firefox/modules/devtools/qrcode/index.js 3262lib/firefox/modules/devtools/qrcode/index.js
3230lib/firefox/modules/devtools/security/auth.js 3263lib/firefox/modules/devtools/security/auth.js
3231lib/firefox/modules/devtools/security/cert.js 3264lib/firefox/modules/devtools/security/cert.js
3232lib/firefox/modules/devtools/security/prompt.js 3265lib/firefox/modules/devtools/security/prompt.js
3233lib/firefox/modules/devtools/security/socket.js 3266lib/firefox/modules/devtools/security/socket.js
3234lib/firefox/modules/devtools/server/actors/actor-registry.js 3267lib/firefox/modules/devtools/server/actors/actor-registry.js
3235lib/firefox/modules/devtools/server/actors/animation.js 3268lib/firefox/modules/devtools/server/actors/animation.js
3236lib/firefox/modules/devtools/server/actors/call-watcher.js 3269lib/firefox/modules/devtools/server/actors/call-watcher.js
3237lib/firefox/modules/devtools/server/actors/canvas.js 3270lib/firefox/modules/devtools/server/actors/canvas.js
3238lib/firefox/modules/devtools/server/actors/child-process.js 3271lib/firefox/modules/devtools/server/actors/child-process.js
3239lib/firefox/modules/devtools/server/actors/childtab.js 3272lib/firefox/modules/devtools/server/actors/childtab.js
 3273lib/firefox/modules/devtools/server/actors/chrome.js
3240lib/firefox/modules/devtools/server/actors/common.js 3274lib/firefox/modules/devtools/server/actors/common.js
3241lib/firefox/modules/devtools/server/actors/csscoverage.js 3275lib/firefox/modules/devtools/server/actors/csscoverage.js
3242lib/firefox/modules/devtools/server/actors/device.js 3276lib/firefox/modules/devtools/server/actors/device.js
3243lib/firefox/modules/devtools/server/actors/director-manager.js 3277lib/firefox/modules/devtools/server/actors/director-manager.js
3244lib/firefox/modules/devtools/server/actors/director-registry.js 3278lib/firefox/modules/devtools/server/actors/director-registry.js
3245lib/firefox/modules/devtools/server/actors/eventlooplag.js 3279lib/firefox/modules/devtools/server/actors/eventlooplag.js
3246lib/firefox/modules/devtools/server/actors/framerate.js 3280lib/firefox/modules/devtools/server/actors/framerate.js
3247lib/firefox/modules/devtools/server/actors/gcli.js 3281lib/firefox/modules/devtools/server/actors/gcli.js
3248lib/firefox/modules/devtools/server/actors/highlighter.css 3282lib/firefox/modules/devtools/server/actors/highlighter.css
3249lib/firefox/modules/devtools/server/actors/highlighter.js 3283lib/firefox/modules/devtools/server/actors/highlighter.js
3250lib/firefox/modules/devtools/server/actors/inspector.js 3284lib/firefox/modules/devtools/server/actors/inspector.js
3251lib/firefox/modules/devtools/server/actors/layout.js 3285lib/firefox/modules/devtools/server/actors/layout.js
3252lib/firefox/modules/devtools/server/actors/memory.js 3286lib/firefox/modules/devtools/server/actors/memory.js
@@ -3255,27 +3289,29 @@ lib/firefox/modules/devtools/server/acto @@ -3255,27 +3289,29 @@ lib/firefox/modules/devtools/server/acto
3255lib/firefox/modules/devtools/server/actors/pretty-print-worker.js 3289lib/firefox/modules/devtools/server/actors/pretty-print-worker.js
3256lib/firefox/modules/devtools/server/actors/profiler.js 3290lib/firefox/modules/devtools/server/actors/profiler.js
3257lib/firefox/modules/devtools/server/actors/root.js 3291lib/firefox/modules/devtools/server/actors/root.js
3258lib/firefox/modules/devtools/server/actors/script.js 3292lib/firefox/modules/devtools/server/actors/script.js
3259lib/firefox/modules/devtools/server/actors/settings.js 3293lib/firefox/modules/devtools/server/actors/settings.js
3260lib/firefox/modules/devtools/server/actors/storage.js 3294lib/firefox/modules/devtools/server/actors/storage.js
3261lib/firefox/modules/devtools/server/actors/string.js 3295lib/firefox/modules/devtools/server/actors/string.js
3262lib/firefox/modules/devtools/server/actors/styleeditor.js 3296lib/firefox/modules/devtools/server/actors/styleeditor.js
3263lib/firefox/modules/devtools/server/actors/styles.js 3297lib/firefox/modules/devtools/server/actors/styles.js
3264lib/firefox/modules/devtools/server/actors/stylesheets.js 3298lib/firefox/modules/devtools/server/actors/stylesheets.js
3265lib/firefox/modules/devtools/server/actors/timeline.js 3299lib/firefox/modules/devtools/server/actors/timeline.js
3266lib/firefox/modules/devtools/server/actors/tracer.js 3300lib/firefox/modules/devtools/server/actors/tracer.js
3267lib/firefox/modules/devtools/server/actors/utils/ScriptStore.js 3301lib/firefox/modules/devtools/server/actors/utils/ScriptStore.js
 3302lib/firefox/modules/devtools/server/actors/utils/TabSources.js
3268lib/firefox/modules/devtools/server/actors/utils/actor-registry-utils.js 3303lib/firefox/modules/devtools/server/actors/utils/actor-registry-utils.js
 3304lib/firefox/modules/devtools/server/actors/utils/audionodes.json
3269lib/firefox/modules/devtools/server/actors/utils/automation-timeline.js 3305lib/firefox/modules/devtools/server/actors/utils/automation-timeline.js
3270lib/firefox/modules/devtools/server/actors/utils/make-debugger.js 3306lib/firefox/modules/devtools/server/actors/utils/make-debugger.js
3271lib/firefox/modules/devtools/server/actors/utils/map-uri-to-addon-id.js 3307lib/firefox/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
3272lib/firefox/modules/devtools/server/actors/utils/stack.js 3308lib/firefox/modules/devtools/server/actors/utils/stack.js
3273lib/firefox/modules/devtools/server/actors/webapps.js 3309lib/firefox/modules/devtools/server/actors/webapps.js
3274lib/firefox/modules/devtools/server/actors/webaudio.js 3310lib/firefox/modules/devtools/server/actors/webaudio.js
3275lib/firefox/modules/devtools/server/actors/webbrowser.js 3311lib/firefox/modules/devtools/server/actors/webbrowser.js
3276lib/firefox/modules/devtools/server/actors/webconsole.js 3312lib/firefox/modules/devtools/server/actors/webconsole.js
3277lib/firefox/modules/devtools/server/actors/webgl.js 3313lib/firefox/modules/devtools/server/actors/webgl.js
3278lib/firefox/modules/devtools/server/child.js 3314lib/firefox/modules/devtools/server/child.js
3279lib/firefox/modules/devtools/server/content-globals.js 3315lib/firefox/modules/devtools/server/content-globals.js
3280lib/firefox/modules/devtools/server/main.js 3316lib/firefox/modules/devtools/server/main.js
3281lib/firefox/modules/devtools/server/protocol.js 3317lib/firefox/modules/devtools/server/protocol.js
@@ -3428,26 +3464,38 @@ lib/firefox/res/table-add-column-before- @@ -3428,26 +3464,38 @@ lib/firefox/res/table-add-column-before-
3428lib/firefox/res/table-add-column-before.gif 3464lib/firefox/res/table-add-column-before.gif
3429lib/firefox/res/table-add-row-after-active.gif 3465lib/firefox/res/table-add-row-after-active.gif
3430lib/firefox/res/table-add-row-after-hover.gif 3466lib/firefox/res/table-add-row-after-hover.gif
3431lib/firefox/res/table-add-row-after.gif 3467lib/firefox/res/table-add-row-after.gif
3432lib/firefox/res/table-add-row-before-active.gif 3468lib/firefox/res/table-add-row-before-active.gif
3433lib/firefox/res/table-add-row-before-hover.gif 3469lib/firefox/res/table-add-row-before-hover.gif
3434lib/firefox/res/table-add-row-before.gif 3470lib/firefox/res/table-add-row-before.gif
3435lib/firefox/res/table-remove-column-active.gif 3471lib/firefox/res/table-remove-column-active.gif
3436lib/firefox/res/table-remove-column-hover.gif 3472lib/firefox/res/table-remove-column-hover.gif
3437lib/firefox/res/table-remove-column.gif 3473lib/firefox/res/table-remove-column.gif
3438lib/firefox/res/table-remove-row-active.gif 3474lib/firefox/res/table-remove-row-active.gif
3439lib/firefox/res/table-remove-row-hover.gif 3475lib/firefox/res/table-remove-row-hover.gif
3440lib/firefox/res/table-remove-row.gif 3476lib/firefox/res/table-remove-row.gif
 3477lib/firefox/res/text_caret.png
 3478lib/firefox/res/text_caret@1.5x.png
 3479lib/firefox/res/text_caret@2.25x.png
 3480lib/firefox/res/text_caret@2x.png
 3481lib/firefox/res/text_caret_tilt_left.png
 3482lib/firefox/res/text_caret_tilt_left@1.5x.png
 3483lib/firefox/res/text_caret_tilt_left@2.25x.png
 3484lib/firefox/res/text_caret_tilt_left@2x.png
 3485lib/firefox/res/text_caret_tilt_right.png
 3486lib/firefox/res/text_caret_tilt_right@1.5x.png
 3487lib/firefox/res/text_caret_tilt_right@2.25x.png
 3488lib/firefox/res/text_caret_tilt_right@2x.png
3441lib/firefox/run-mozilla.sh 3489lib/firefox/run-mozilla.sh
3442lib/firefox/webapprt-stub 3490lib/firefox/webapprt-stub
3443lib/firefox/webapprt/chrome.manifest 3491lib/firefox/webapprt/chrome.manifest
3444lib/firefox/webapprt/chrome/chrome.manifest 3492lib/firefox/webapprt/chrome/chrome.manifest
3445lib/firefox/webapprt/chrome/en-US/locale/webapprt/appstrings.properties 3493lib/firefox/webapprt/chrome/en-US/locale/webapprt/appstrings.properties
3446lib/firefox/webapprt/chrome/en-US/locale/webapprt/dom.properties 3494lib/firefox/webapprt/chrome/en-US/locale/webapprt/dom.properties
3447lib/firefox/webapprt/chrome/en-US/locale/webapprt/downloads/downloads.dtd 3495lib/firefox/webapprt/chrome/en-US/locale/webapprt/downloads/downloads.dtd
3448lib/firefox/webapprt/chrome/en-US/locale/webapprt/getUserMediaDialog.dtd 3496lib/firefox/webapprt/chrome/en-US/locale/webapprt/getUserMediaDialog.dtd
3449lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.dtd 3497lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.dtd
3450lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.properties 3498lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.properties
3451lib/firefox/webapprt/chrome/webapprt/content/dbg-webapp-actors.js 3499lib/firefox/webapprt/chrome/webapprt/content/dbg-webapp-actors.js
3452lib/firefox/webapprt/chrome/webapprt/content/downloads/download.xml 3500lib/firefox/webapprt/chrome/webapprt/content/downloads/download.xml
3453lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.css 3501lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.css
cvs diff -r1.206 -r1.207 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2015/06/03 03:22:31 1.206
+++ pkgsrc/www/firefox/distinfo 2015/07/03 10:25:40 1.207
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1$NetBSD: distinfo,v 1.206 2015/06/03 03:22:31 ryoon Exp $ 1$NetBSD: distinfo,v 1.207 2015/07/03 10:25:40 ryoon Exp $
2 2
3SHA1 (firefox-38.0.5.source.tar.bz2) = 74da3e225d5b542e784549be63475802c45e1b02 3SHA1 (firefox-39.0.source.tar.bz2) = 32785daee7ddb9da8d7509ef095258fc58fe838e
4RMD160 (firefox-38.0.5.source.tar.bz2) = 5fbefc368222b2a9629fc141eae2be0d2384d7ad 4RMD160 (firefox-39.0.source.tar.bz2) = 21a001d8d73d54de14ec479af2becca3353c445b
5Size (firefox-38.0.5.source.tar.bz2) = 180318459 bytes 5Size (firefox-39.0.source.tar.bz2) = 182881881 bytes
6SHA1 (patch-aa) = e9e8400fa86ae8d6910b49e3a98127122e714f1a 6SHA1 (patch-aa) = d460082b7bfa0d96db95ddb904208019195e3b55
7SHA1 (patch-accessible_atk_Platform.cpp) = c2deb81b300de44c4500328589185bbd4b6b02fb 
8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 7SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 8SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
10SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a 9SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a
11SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0 10SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0
12SHA1 (patch-b2g_installer_package-manifest.in) = cdb43eece164b43b49a9c0f1a47de4e7db56ed76 11SHA1 (patch-b2g_installer_package-manifest.in) = daf8468729a96875d346643d4f9df54a39a4bdd7
13SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 12SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
14SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 13SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
15SHA1 (patch-browser_app_nsBrowserApp.cpp) = b7dd345b88dd03716f725c790364d06475aaf6bb 14SHA1 (patch-browser_app_nsBrowserApp.cpp) = b7dd345b88dd03716f725c790364d06475aaf6bb
16SHA1 (patch-browser_installer_package-manifest.in) = aee56636fc83ea6441c5303ef0297971b41516d1 15SHA1 (patch-browser_installer_package-manifest.in) = aee56636fc83ea6441c5303ef0297971b41516d1
17SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07 16SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07
18SHA1 (patch-build_autoconf_nss.m4) = 970fcd9aeede2347651c516d5211c4555dd28a4d 17SHA1 (patch-build_autoconf_nss.m4) = 970fcd9aeede2347651c516d5211c4555dd28a4d
19SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f 18SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f
20SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c 19SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c
21SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3 20SHA1 (patch-config_Makefile.in) = 0a072de112e0e5cc4b929a7094498fcf003e27b3
22SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075 21SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075
23SHA1 (patch-config_external_moz.build) = ee5fe1672333a7d71e61a23f3739ffefcca692d5 22SHA1 (patch-config_external_moz.build) = ee5fe1672333a7d71e61a23f3739ffefcca692d5
24SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd 23SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd
25SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 24SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
26SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b 25SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
27SHA1 (patch-config_system-headers) = 79f48d468edb4a5acdedb0c6d8d79c193cd140b2 26SHA1 (patch-config_system-headers) = da0f1754eebac0d4a8234345b8d201e0e8fe774f
28SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 27SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
29SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46 28SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46
30SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6 29SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6
31SHA1 (patch-dom_media_gmp_GMPChild.cpp) = 534a2c921a2d4d5b71d5ab75b8484ee792329460 30SHA1 (patch-dom_media_gmp_GMPChild.cpp) = 534a2c921a2d4d5b71d5ab75b8484ee792329460
32SHA1 (patch-dom_media_gmp_GMPParent.cpp) = 8129d70855cd7d04dc9d909c689db3cdbafb5914 31SHA1 (patch-dom_media_gmp_GMPParent.cpp) = a51a6197cd7be0b751180babe65fb65f93bdbad6
33SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 4685a646a76282619d7c42fac43500e0065f067d 32SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 4685a646a76282619d7c42fac43500e0065f067d
34SHA1 (patch-dom_media_moz.build) = a89695c9557f59e00b42c60742f27a82de0f77fb 33SHA1 (patch-dom_media_moz.build) = a89695c9557f59e00b42c60742f27a82de0f77fb
35SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 6219ce1b3f2893c1d53453fcb5568d081b72e106 34SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 6219ce1b3f2893c1d53453fcb5568d081b72e106
36SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e 35SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
37SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 0d10aa4c913d431fb8fa5f995f6e40cb364f069e 36SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 0d10aa4c913d431fb8fa5f995f6e40cb364f069e
38SHA1 (patch-dom_system_OSFileConstants.cpp) = 4fe5d4ecf6116c7163ee6d2322db8b1b783fe5ec 37SHA1 (patch-dom_system_OSFileConstants.cpp) = 4fe5d4ecf6116c7163ee6d2322db8b1b783fe5ec
39SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 747354373bcaf2c76bdff71677f354d47837704b 38SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 747354373bcaf2c76bdff71677f354d47837704b
40SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = b987dad1bd4513b8a04fb280bd1c5280a03af746 39SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = b987dad1bd4513b8a04fb280bd1c5280a03af746
41SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce 40SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
42SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9 41SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9
43SHA1 (patch-gfx_skia_generate__mozbuild.py) = e0bf45842ae74f896678b1c29d97606165cf5914 42SHA1 (patch-gfx_skia_generate__mozbuild.py) = e0bf45842ae74f896678b1c29d97606165cf5914
44SHA1 (patch-gfx_skia_moz.build) = ce83717ec6e386d52af75a0f5592fa866b83b3bc 43SHA1 (patch-gfx_skia_moz.build) = ce83717ec6e386d52af75a0f5592fa866b83b3bc
45SHA1 (patch-gfx_thebes_moz.build) = f64917350eaf693866b0e7196cb7f1cc9e9470fc 44SHA1 (patch-gfx_thebes_moz.build) = f64917350eaf693866b0e7196cb7f1cc9e9470fc
@@ -57,51 +56,50 @@ SHA1 (patch-ipc_chromium_src_base_messag @@ -57,51 +56,50 @@ SHA1 (patch-ipc_chromium_src_base_messag
57SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97 56SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97
58SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ff1371ffb84abf2d2adcf25e66502943992d5109 57SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ff1371ffb84abf2d2adcf25e66502943992d5109
59SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d 58SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d
60SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = efe1c242efded89b7a69a83429bc30843f330367 59SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = efe1c242efded89b7a69a83429bc30843f330367
61SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 6b2611cc902f17e726aabcf4fb5fff2c71852408 60SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 6b2611cc902f17e726aabcf4fb5fff2c71852408
62SHA1 (patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h) = 8c61a35e99e7f54e4b2bf5931c59eb2b7a04127a 61SHA1 (patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h) = 8c61a35e99e7f54e4b2bf5931c59eb2b7a04127a
63SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 27890c56194e483fc0758ed767ca5795cc5112eb 62SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 27890c56194e483fc0758ed767ca5795cc5112eb
64SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 337a0b4a5d51d68c7699b79c7591b953ea23ca67 63SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 337a0b4a5d51d68c7699b79c7591b953ea23ca67
65SHA1 (patch-ipc_chromium_src_build_build__config.h) = af5a10df7d8fe9715f0e43cd6be14f8f20c53517 64SHA1 (patch-ipc_chromium_src_build_build__config.h) = af5a10df7d8fe9715f0e43cd6be14f8f20c53517
66SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b144a225bacf41833e059cb400 65SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b144a225bacf41833e059cb400
67SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 45f2f22b4f567ffddd4458f635179b5201e87e64 66SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 45f2f22b4f567ffddd4458f635179b5201e87e64
68SHA1 (patch-ipc_glue_ScopedXREEmbed.cpp) = 97c39f25527dac4c22b38ce446ca2cd4cef08fd0 67SHA1 (patch-ipc_glue_ScopedXREEmbed.cpp) = 97c39f25527dac4c22b38ce446ca2cd4cef08fd0
69SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0 68SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0
70SHA1 (patch-ipc_glue_moz.build) = 2682ca9de9606e50602a124e287dded2b9f2859b 69SHA1 (patch-ipc_glue_moz.build) = 5c3f99ede7ab2d8ad58e92b31576971de87cb528
71SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8 70SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8
72SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105 71SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
73SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2 72SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2
74SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475 73SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
75SHA1 (patch-js_public_CallArgs.h) = fde9a73b8a694c4c7415848aa25e14ccefe547dd 74SHA1 (patch-js_public_CallArgs.h) = fde9a73b8a694c4c7415848aa25e14ccefe547dd
76SHA1 (patch-js_src_Makefile.in) = 77d2e7cb651b9f30ebf6458fd07678416cdecbcc 75SHA1 (patch-js_src_Makefile.in) = 77d2e7cb651b9f30ebf6458fd07678416cdecbcc
77SHA1 (patch-js_src_asmjs_AsmJSSignalHandlers.cpp) = 976cc3099901d36a70cca4333fca13d5b8885b26 
78SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0 76SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
79SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc 77SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
80SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c 78SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c
81SHA1 (patch-js_src_jit-LIR.cpp) = 6c9b3bb9f2c41f7b101c49375c51418912620a15 79SHA1 (patch-js_src_jit-LIR.cpp) = 6c9b3bb9f2c41f7b101c49375c51418912620a15
82SHA1 (patch-js_src_jit_ExecutableAllocator.h) = c2389a7e6521905941270246adf155834703d8a0 80SHA1 (patch-js_src_jit_ExecutableAllocator.h) = c2389a7e6521905941270246adf155834703d8a0
83SHA1 (patch-js_src_jit_MIR.cpp) = d04ce1c7a55d8e1871472e1078cf591c8ea98588 81SHA1 (patch-js_src_jit_MIR.cpp) = d04ce1c7a55d8e1871472e1078cf591c8ea98588
84SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = ea58f199dbc11d7fcc04bbc1205d6ecf3a3ac3e0 82SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = ea58f199dbc11d7fcc04bbc1205d6ecf3a3ac3e0
85SHA1 (patch-js_src_jsapi.cpp) = 97aaa4eea1254b675cbfd9cfae92dd614a717f49 83SHA1 (patch-js_src_jsapi.cpp) = 97aaa4eea1254b675cbfd9cfae92dd614a717f49
86SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c 84SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c
87SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59 85SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59
88SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 86SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
89SHA1 (patch-js_src_shell_jsoptparse.cpp) = 178415aa652ccbd5278629b5154d20c4d7bfffd0 87SHA1 (patch-js_src_shell_jsoptparse.cpp) = 2502ae2b4e6103788c2a888b6cb19cedf9d2976f
90SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde 88SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
91SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926 89SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
92SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af 90SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
93SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db 91SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
94SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f8ab0c958e00b2ae52ac73ebcad5bf8a9fe2f2d1 92SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 81e695c5cb20be3e864157c19ed07f9713490be5
95SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62 93SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62
96SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c 94SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c
97SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a 95SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
98SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696 96SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
99SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = b7c21a68f09176100794148aa75eb19829417fed 97SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = b7c21a68f09176100794148aa75eb19829417fed
100SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b59809a7292d41bdb352bc425dc46273f1c0c270 98SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b59809a7292d41bdb352bc425dc46273f1c0c270
101SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de 99SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de
102SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718 100SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
103SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933 101SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933
104SHA1 (patch-media_libtheora_moz.build) = 69476f02c0d79929b1d92719706ac68ffd102826 102SHA1 (patch-media_libtheora_moz.build) = 69476f02c0d79929b1d92719706ac68ffd102826
105SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af 103SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
106SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910 104SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910
107SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53 105SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
@@ -116,51 +114,49 @@ SHA1 (patch-media_webrtc_trunk_webrtc_mo @@ -116,51 +114,49 @@ SHA1 (patch-media_webrtc_trunk_webrtc_mo
116SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi) = 54c05a12758c377b0f80143048280a7738e7038d 114SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi) = 54c05a12758c377b0f80143048280a7738e7038d
117SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc) = 53481a80b410afe962146f08eafe8ff38ac6a241 115SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc) = 53481a80b410afe962146f08eafe8ff38ac6a241
118SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h) = b972e59204760eb885a9a0432ec977f604208a53 116SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h) = b972e59204760eb885a9a0432ec977f604208a53
119SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1 117SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1
120SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ffc1d956e826a0005b76285596ba24a2f4a3806c 118SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ffc1d956e826a0005b76285596ba24a2f4a3806c
121SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 4a293e0d788a3a3acfbbf4cf19a6f9a7235b83d0 119SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 4a293e0d788a3a3acfbbf4cf19a6f9a7235b83d0
122SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = c09f0d234f70d48403b3b12866647c4cbc752396 120SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = c09f0d234f70d48403b3b12866647c4cbc752396
123SHA1 (patch-memory_build_mozjemalloc__compat.c) = e43a0f593a524db1b325e0b6141f2630d63b9a5c 121SHA1 (patch-memory_build_mozjemalloc__compat.c) = e43a0f593a524db1b325e0b6141f2630d63b9a5c
124SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543 122SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543
125SHA1 (patch-memory_jemalloc_src_configure) = d1e27220b223266f7a7d362dca1621012f8d9d7f 123SHA1 (patch-memory_jemalloc_src_configure) = d1e27220b223266f7a7d362dca1621012f8d9d7f
126SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 44cb29dac1e8032c3f58149227bfe5ad94e8edb9 124SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 44cb29dac1e8032c3f58149227bfe5ad94e8edb9
127SHA1 (patch-memory_volatile_VolatileBufferOSX.cpp) = ebea8a615443206376cb4264ed43b5c74e029b7d 125SHA1 (patch-memory_volatile_VolatileBufferOSX.cpp) = ebea8a615443206376cb4264ed43b5c74e029b7d
128SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749 126SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749
129SHA1 (patch-mfbt_Attributes.h) = b3f54a35476e99ba3191ee99feafc86de21d8334 127SHA1 (patch-mfbt_Attributes.h) = 509d389e0053615aaf817d49f0cc5a12bd620aae
130SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503 128SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
131SHA1 (patch-mobile_android_installer_Makefile.in) = 3d6b7ea3fc6249f2f8ebc88f15f34495a0ef41d6 129SHA1 (patch-mobile_android_installer_Makefile.in) = 3d6b7ea3fc6249f2f8ebc88f15f34495a0ef41d6
132SHA1 (patch-mobile_android_installer_package-manifest.in) = 5826a6585e76eecad46e8c8bf3a9c4ded61b5748 130SHA1 (patch-mobile_android_installer_package-manifest.in) = 5826a6585e76eecad46e8c8bf3a9c4ded61b5748
133SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a 131SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
134SHA1 (patch-netwerk_base_nsNetUtil.h) = e80f40b048e4628876ceb1a5ca90f7b07862d9ab 132SHA1 (patch-netwerk_base_nsNetUtil.h) = e80f40b048e4628876ceb1a5ca90f7b07862d9ab
135SHA1 (patch-netwerk_dns_moz.build) = 447ea9652f67cb5e48ea14a725c4cf45647eec6b 133SHA1 (patch-netwerk_dns_moz.build) = 447ea9652f67cb5e48ea14a725c4cf45647eec6b
136SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 40f4a64657ea2dd0ddc6434cafcd181763ac31b6 134SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 40f4a64657ea2dd0ddc6434cafcd181763ac31b6
137SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4 135SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
138SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a 136SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
139SHA1 (patch-rc) = affa634564e798184bbe50ba7c491d691a4a8994 137SHA1 (patch-rc) = affa634564e798184bbe50ba7c491d691a4a8994
140SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac 138SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac
141SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130 139SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
142SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890 140SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890
143SHA1 (patch-toolkit_library_moz.build) = 625d78e64959f78a5d0b8148749bb43a0abcbcf7 141SHA1 (patch-toolkit_library_moz.build) = 625d78e64959f78a5d0b8148749bb43a0abcbcf7
144SHA1 (patch-toolkit_modules_GMPInstallManager.jsm) = 7aaf694c6466c2ab2beac3e9e9ca80461bc13c7f 142SHA1 (patch-toolkit_modules_GMPInstallManager.jsm) = 7aaf694c6466c2ab2beac3e9e9ca80461bc13c7f
145SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 1b4472b466e1b736034434ef32a6d016993ddb00 143SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 1b4472b466e1b736034434ef32a6d016993ddb00
146SHA1 (patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm) = ca69c55505470082c2651313852b49b2d0002cc8 144SHA1 (patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm) = 6e4ead21c1bcb1268a0530b3041ff4d5af20b743
147SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6 145SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6
148SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 146SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
149SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c 147SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c
150SHA1 (patch-widget_gtk_gtk2drawing.c) = dd63fd368a86aef1b9568ae625904ffd9542a874 148SHA1 (patch-widget_gtk_gtk3drawing.c) = 8f8e9b28b5ab98009cf60b236dc79d580cb6bd73
151SHA1 (patch-widget_gtk_gtk3drawing.c) = 7224a3ef02ef98b6013ffeafcf6819c726bacbe6 149SHA1 (patch-widget_gtk_nsNativeThemeGTK.cpp) = 340e5e9d1cd4f248af6908408188371a731d5474
152SHA1 (patch-widget_gtk_gtkdrawing.h) = ca582ba4f09c4a31600dcb630a7997ed5db7a7b4 
153SHA1 (patch-widget_gtk_nsNativeThemeGTK.cpp) = 959ddb6501d2b3bff94ca3ff5fbdbfe8ce71879c 
154SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 8fb5eb1f1e548eda7151175d350eee9ec38b17b3 150SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 8fb5eb1f1e548eda7151175d350eee9ec38b17b3
155SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438 151SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
156SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68 152SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68
157SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 31a3e1b22b992d677a77d1e75ef52eb18d84abf7 153SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 31a3e1b22b992d677a77d1e75ef52eb18d84abf7
158SHA1 (patch-xpcom_glue_standalone_nsXPCOMGlue.cpp) = a6ef7f490d52037d2a72d3d52d834a182a29eccb 154SHA1 (patch-xpcom_glue_standalone_nsXPCOMGlue.cpp) = a6ef7f490d52037d2a72d3d52d834a182a29eccb
159SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511 155SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511
160SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 2e6fbc64d78a3f035c6f9db9fffd0f1097420b58 156SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 2e6fbc64d78a3f035c6f9db9fffd0f1097420b58
161SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d 157SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d
162SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3 158SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3
163SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c 159SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c
164SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cb72e1bc9a38e3f123539d7bb2aca6793f2b574 160SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cb72e1bc9a38e3f123539d7bb2aca6793f2b574
165SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e 161SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e
166SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 71a33723a557a6153405f6baec8404b25f841608 162SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 71a33723a557a6153405f6baec8404b25f841608
cvs diff -r1.57 -r1.58 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2015/06/26 11:16:41 1.57
+++ pkgsrc/www/firefox/mozilla-common.mk 2015/07/03 10:25:40 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.57 2015/06/26 11:16:41 szptvlfn Exp $ 1# $NetBSD: mozilla-common.mk,v 1.58 2015/07/03 10:25:40 ryoon Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8GNU_CONFIGURE= yes 8GNU_CONFIGURE= yes
9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
10USE_LANGUAGES+= c99 c++ 10USE_LANGUAGES+= c99 c++
11UNLIMIT_RESOURCES+= datasize 11UNLIMIT_RESOURCES+= datasize
12 12
13test: 13test:
14 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 14 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
@@ -23,26 +23,27 @@ USE_TOOLS+= bsdtar @@ -23,26 +23,27 @@ USE_TOOLS+= bsdtar
23# GCC 4.6 is required to support nullptr. 23# GCC 4.6 is required to support nullptr.
24GCC_REQD+= 4.8 24GCC_REQD+= 4.8
25.if ${MACHINE_ARCH} == "i386" 25.if ${MACHINE_ARCH} == "i386"
26# Fix for PR pkg/48152. 26# Fix for PR pkg/48152.
27CPPFLAGS+= -march=i486 27CPPFLAGS+= -march=i486
28# This is required for SSE2 code under i386. 28# This is required for SSE2 code under i386.
29CPPFLAGS+= -mstackrealign 29CPPFLAGS+= -mstackrealign
30.endif 30.endif
31 31
32CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 32CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
33CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 33CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
34CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh 34CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
35CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure 35CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
 36CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
36 37
37CONFIGURE_ARGS+= --disable-tests 38CONFIGURE_ARGS+= --disable-tests
38CONFIGURE_ARGS+= --disable-pedantic 39CONFIGURE_ARGS+= --disable-pedantic
39CONFIGURE_ARGS+= --enable-crypto 40CONFIGURE_ARGS+= --enable-crypto
40CONFIGURE_ARGS+= --with-pthreads 41CONFIGURE_ARGS+= --with-pthreads
41CONFIGURE_ARGS+= --disable-javaxpcom 42CONFIGURE_ARGS+= --disable-javaxpcom
42CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 43CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
43CONFIGURE_ARGS+= --enable-gstreamer=1.0 44CONFIGURE_ARGS+= --enable-gstreamer=1.0
44#CONFIGURE_ARGS+= --disable-gstreamer 45#CONFIGURE_ARGS+= --disable-gstreamer
45CONFIGURE_ARGS+= --enable-svg 46CONFIGURE_ARGS+= --enable-svg
46CONFIGURE_ARGS+= --enable-mathml 47CONFIGURE_ARGS+= --enable-mathml
47CONFIGURE_ARGS+= --enable-pango 48CONFIGURE_ARGS+= --enable-pango
48CONFIGURE_ARGS+= --enable-system-cairo 49CONFIGURE_ARGS+= --enable-system-cairo
cvs diff -r1.25 -r1.26 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2015/04/15 12:36:23 1.25
+++ pkgsrc/www/firefox/options.mk 2015/07/03 10:25:40 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.25 2015/04/15 12:36:23 ryoon Exp $ 1# $NetBSD: options.mk,v 1.26 2015/07/03 10:25:40 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4PKG_SUPPORTED_OPTIONS= official-mozilla-branding 4PKG_SUPPORTED_OPTIONS= official-mozilla-branding
5PKG_SUPPORTED_OPTIONS+= alsa debug debug-info mozilla-jemalloc gnome pulseaudio webrtc 5PKG_SUPPORTED_OPTIONS+= alsa debug debug-info mozilla-jemalloc gnome pulseaudio webrtc
6PLIST_VARS+= gnome jemalloc debug 6PLIST_VARS+= gnome jemalloc debug
7 7
8.if ${OPSYS} == "Linux" 8.if ${OPSYS} == "Linux"
9PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc 9PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc
10.else 10.else
11PKG_SUGGESTED_OPTIONS+= pulseaudio 11PKG_SUGGESTED_OPTIONS+= pulseaudio
12.endif 12.endif
13 13
14# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set. 14# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
@@ -17,27 +17,27 @@ PKG_SUGGESTED_OPTIONS+= webrtc @@ -17,27 +17,27 @@ PKG_SUGGESTED_OPTIONS+= webrtc
17.endif 17.endif
18 18
19.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
20 20
21.if !empty(PKG_OPTIONS:Malsa) 21.if !empty(PKG_OPTIONS:Malsa)
22CONFIGURE_ARGS+= --enable-alsa 22CONFIGURE_ARGS+= --enable-alsa
23.include "../../audio/alsa-lib/buildlink3.mk" 23.include "../../audio/alsa-lib/buildlink3.mk"
24.else 24.else
25CONFIGURE_ARGS+= --disable-alsa 25CONFIGURE_ARGS+= --disable-alsa
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mgnome) 28.if !empty(PKG_OPTIONS:Mgnome)
29.include "../../devel/libgnomeui/buildlink3.mk" 29.include "../../devel/libgnomeui/buildlink3.mk"
30.include "../../sysutils/gnome-vfs/buildlink3.mk" 30#.include "../../sysutils/gnome-vfs/buildlink3.mk"
31.include "../../sysutils/libnotify/buildlink3.mk" 31.include "../../sysutils/libnotify/buildlink3.mk"
32CONFIGURE_ARGS+= --enable-gio --enable-dbus --enable-gnomeui 32CONFIGURE_ARGS+= --enable-gio --enable-dbus --enable-gnomeui
33CONFIGURE_ARGS+= --enable-libnotify 33CONFIGURE_ARGS+= --enable-libnotify
34CONFIGURE_ARGS+= --enable-extensions=gio 34CONFIGURE_ARGS+= --enable-extensions=gio
35PLIST.gnome= yes 35PLIST.gnome= yes
36.else 36.else
37CONFIGURE_ARGS+= --disable-gio --disable-dbus --disable-gnomeui 37CONFIGURE_ARGS+= --disable-gio --disable-dbus --disable-gnomeui
38CONFIGURE_ARGS+= --disable-libnotify 38CONFIGURE_ARGS+= --disable-libnotify
39.endif 39.endif
40 40
41.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 41.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
42PLIST.jemalloc= yes 42PLIST.jemalloc= yes
43CONFIGURE_ARGS+= --enable-jemalloc 43CONFIGURE_ARGS+= --enable-jemalloc
cvs diff -r1.37 -r1.38 pkgsrc/www/firefox/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-aa 2015/05/12 22:48:54 1.37
+++ pkgsrc/www/firefox/patches/Attic/patch-aa 2015/07/03 10:25:40 1.38
@@ -1,131 +1,122 @@ @@ -1,131 +1,122 @@
1$NetBSD: patch-aa,v 1.37 2015/05/12 22:48:54 ryoon Exp $ 1$NetBSD: patch-aa,v 1.38 2015/07/03 10:25:40 ryoon Exp $
2 2
3* The profiler does not support Darwin/PPC so don't try to enable it 3* The profiler does not support Darwin/PPC so don't try to enable it
4 on that platform. 4 on that platform.
5 5
6* Cocoa gamepad backend can only be used if the toolkit is cocoa too. 6* Cocoa gamepad backend can only be used if the toolkit is cocoa too.
7 7
8* The preprocessor macro XP_MACOSX is misused everywhere. They tend to 8* The preprocessor macro XP_MACOSX is misused everywhere. They tend to
9 say "#if defined(XP_MACOSX)" to actually mean 9 say "#if defined(XP_MACOSX)" to actually mean
10 "#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with 10 "#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with
11 XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a 11 XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a
12 result, cairo-gtk2 build on Darwin is completely broken and needs 12 result, cairo-gtk2 build on Darwin is completely broken and needs
13 heavy patching. Ideally they should be fixed individually but that 13 heavy patching. Ideally they should be fixed individually but that
14 will be an extremely hard work, so don't define XP_MACOSX for now. 14 will be an extremely hard work, so don't define XP_MACOSX for now.
15 15
16--- configure.in.orig 2015-05-04 00:43:23.000000000 +0000 16--- configure.in.orig 2015-06-18 20:55:30.000000000 +0000
17+++ configure.in 17+++ configure.in
18@@ -1794,7 +1794,13 @@ Linux) 18@@ -1796,7 +1796,13 @@ Linux)
19 MOZ_ENABLE_PROFILER_SPS= 19 MOZ_ENABLE_PROFILER_SPS=
20 esac 20 esac
21 ;; 21 ;;
22-WINNT|Darwin) ;; 22-WINNT|Darwin) ;;
23+WINNT|Darwin) 23+WINNT|Darwin)
24+ case "${CPU_ARCH}" in 24+ case "${CPU_ARCH}" in
25+ x86 | x86_64) ;; 25+ x86 | x86_64) ;;
26+ *) 26+ *)
27+ MOZ_ENABLE_PROFILER_SPS= 27+ MOZ_ENABLE_PROFILER_SPS=
28+ esac 28+ esac
29+ ;; 29+ ;;
30 *) 30 *)
31 MOZ_ENABLE_PROFILER_SPS= 31 MOZ_ENABLE_PROFILER_SPS=
32 ;; 32 ;;
33@@ -1898,7 +1904,7 @@ case "$host" in 33@@ -1900,7 +1906,7 @@ case "$host" in
34 ;; 34 ;;
35  35
36 *-darwin*) 36 *-darwin*)
37- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11" 37- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
38+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" 38+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
39 HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' 39 HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
40 HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" 40 HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
41 ;; 41 ;;
42@@ -2022,7 +2028,6 @@ case "$target" in 42@@ -2024,7 +2030,6 @@ case "$target" in
43 AC_DEFINE(XP_DARWIN) 43 AC_DEFINE(XP_DARWIN)
44 _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit' 44 _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
45 else 45 else
46- AC_DEFINE(XP_MACOSX) 46- AC_DEFINE(XP_MACOSX)
47 AC_DEFINE(XP_DARWIN) 47 AC_DEFINE(XP_DARWIN)
48 _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' 48 _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
49 # The ExceptionHandling framework is needed for Objective-C exception 49 # The ExceptionHandling framework is needed for Objective-C exception
50@@ -2641,8 +2646,7 @@ MOZ_CXX11 50@@ -2643,8 +2648,7 @@ MOZ_CXX11
51  51
52 AC_LANG_C 52 AC_LANG_C
53  53
54-dnl Check for .hidden assembler directive and visibility attribute. 54-dnl Check for .hidden assembler directive and visibility attribute.
55-dnl Borrowed from glibc configure.in 55-dnl Borrowed from glibc configure.in
56+dnl Setup default hidden visibility and wrapped system headers. 56+dnl Setup default hidden visibility and wrapped system headers.
57 dnl =============================================================== 57 dnl ===============================================================
58 if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then 58 if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
59 AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) 59 AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
60@@ -3663,6 +3667,14 @@ if test -n "$YASM"; then 60@@ -3666,6 +3670,14 @@ if test -n "$YASM"; then
61 _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` 61 _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
62 fi 62 fi
63  63
64+if test -n "${LIBXUL_SDK_DIR}"; then 64+if test -n "${LIBXUL_SDK_DIR}"; then
65+ AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.]) 65+ AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.])
66+ NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags nspr`" 66+ NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags nspr`"
67+ NSPR_LIBS="`pkg-config --libs nspr`" 67+ NSPR_LIBS="`pkg-config --libs nspr`"
68+ NSS_CFLAGS="`pkg-config --cflags nss`" 68+ NSS_CFLAGS="`pkg-config --cflags nss`"
69+ NSS_LIBS="`pkg-config --libs nss`" 69+ NSS_LIBS="`pkg-config --libs nss`"
70+fi 70+fi
71+ 71+
72 if test -z "$SKIP_LIBRARY_CHECKS"; then 72 if test -z "$SKIP_LIBRARY_CHECKS"; then
73 dnl system JPEG support 73 dnl system JPEG support
74 dnl ======================================================== 74 dnl ========================================================
75@@ -3690,11 +3702,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then 75@@ -3693,11 +3705,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
76 #include <jpeglib.h> ], 76 #include <jpeglib.h> ],
77 [ #if JPEG_LIB_VERSION < $MOZJPEG 77 [ #if JPEG_LIB_VERSION < $MOZJPEG
78 #error "Insufficient JPEG library version ($MOZJPEG required)." 78 #error "Insufficient JPEG library version ($MOZJPEG required)."
79- #endif 79- #endif
80- #ifndef JCS_EXTENSIONS 80- #ifndef JCS_EXTENSIONS
81- #error "libjpeg-turbo JCS_EXTENSIONS required" 81- #error "libjpeg-turbo JCS_EXTENSIONS required"
82- #endif 82- #endif
83- ], 83- ],
84+ #endif ], 84+ #endif ],
85 MOZ_NATIVE_JPEG=1, 85 MOZ_NATIVE_JPEG=1,
86 AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) 86 AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
87 fi 87 fi
88@@ -4392,6 +4400,10 @@ cairo-gonk) 88@@ -4403,6 +4411,10 @@ cairo-gonk)
89  89
90 esac 90 esac
91  91
92+if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then 92+if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
93+ AC_DEFINE(XP_MACOSX) 93+ AC_DEFINE(XP_MACOSX)
94+fi 94+fi
95+ 95+
96 AC_SUBST(MOZ_PDF_PRINTING) 96 AC_SUBST(MOZ_PDF_PRINTING)
97 if test "$MOZ_PDF_PRINTING"; then 97 if test "$MOZ_PDF_PRINTING"; then
98 PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" 98 PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
99@@ -4408,7 +4420,7 @@ fi 99@@ -5137,6 +5149,9 @@ if test -n "$MOZ_WEBRTC"; then
100  
101 if test "$COMPILE_ENVIRONMENT"; then 
102 if test "$MOZ_ENABLE_GTK3"; then 
103- PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 atk-bridge-2.0 $GDK_PACKAGES) 
104+ PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES) 
105 MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS" 
106 dnl Contrary to MOZ_GTK2_LIBS, MOZ_GTK3_LIBS needs to be literally added to TK_LIBS instead 
107 dnl of a make reference because of how TK_LIBS is mangled in toolkit/library/moz.build 
108@@ -5149,6 +5161,9 @@ if test -n "$MOZ_WEBRTC"; then 
109 MOZ_VPX=1 100 MOZ_VPX=1
110 MOZ_VPX_ERROR_CONCEALMENT=1 101 MOZ_VPX_ERROR_CONCEALMENT=1
111  102
112+ dnl with libv4l2 we can support more cameras 103+ dnl with libv4l2 we can support more cameras
113+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) 104+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
114+ 105+
115 dnl enable once Signaling lands 106 dnl enable once Signaling lands
116 MOZ_WEBRTC_SIGNALING=1 107 MOZ_WEBRTC_SIGNALING=1
117 AC_DEFINE(MOZ_WEBRTC_SIGNALING) 108 AC_DEFINE(MOZ_WEBRTC_SIGNALING)
118@@ -5252,6 +5267,157 @@ if test "${ac_cv_c_attribute_aligned}" ! 109@@ -5240,6 +5255,157 @@ if test "${ac_cv_c_attribute_aligned}" !
119 fi 110 fi
120  111
121 dnl ======================================================== 112 dnl ========================================================
122+dnl Check for libogg 113+dnl Check for libogg
123+dnl ======================================================== 114+dnl ========================================================
124+ 115+
125+MOZ_ARG_WITH_BOOL(system-ogg, 116+MOZ_ARG_WITH_BOOL(system-ogg,
126+[ --with-system-ogg Use system libogg (located with pkgconfig)], 117+[ --with-system-ogg Use system libogg (located with pkgconfig)],
127+MOZ_NATIVE_OGG=1, 118+MOZ_NATIVE_OGG=1,
128+MOZ_NATIVE_OGG=) 119+MOZ_NATIVE_OGG=)
129+ 120+
130+if test -n "$MOZ_NATIVE_OGG"; then 121+if test -n "$MOZ_NATIVE_OGG"; then
131+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1) 122+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
@@ -263,27 +254,27 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:4 @@ -263,27 +254,27 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:4
263+ 254+
264+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ 255+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
265+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then 256+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
266+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) 257+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
267+ fi 258+ fi
268+fi 259+fi
269+ 260+
270+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH) 261+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
271+ 262+
272+dnl ======================================================== 263+dnl ========================================================
273 dnl = Disable VP8 decoder support 264 dnl = Disable VP8 decoder support
274 dnl ======================================================== 265 dnl ========================================================
275 MOZ_ARG_DISABLE_BOOL(webm, 266 MOZ_ARG_DISABLE_BOOL(webm,
276@@ -5606,6 +5772,67 @@ fi 267@@ -5608,6 +5774,67 @@ fi
277 AC_SUBST(MOZ_WEBM_ENCODER) 268 AC_SUBST(MOZ_WEBM_ENCODER)
278  269
279 dnl ================================== 270 dnl ==================================
280+dnl = Check OSS availability 271+dnl = Check OSS availability
281+dnl ================================== 272+dnl ==================================
282+ 273+
283+dnl If using Linux, Solaris or BSDs, ensure that OSS is available 274+dnl If using Linux, Solaris or BSDs, ensure that OSS is available
284+case "$OS_TARGET" in 275+case "$OS_TARGET" in
285+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) 276+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD)
286+ MOZ_OSS=1 277+ MOZ_OSS=1
287+ ;; 278+ ;;
288+esac 279+esac
289+ 280+
@@ -331,62 +322,62 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:4 @@ -331,62 +322,62 @@ $NetBSD: patch-aa,v 1.37 2015/05/12 22:4
331+ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) 322+ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
332+fi 323+fi
333+CFLAGS=$_SAVE_CFLAGS 324+CFLAGS=$_SAVE_CFLAGS
334+LIBS=$_SAVE_LIBS 325+LIBS=$_SAVE_LIBS
335+ 326+
336+AC_SUBST(MOZ_OSS) 327+AC_SUBST(MOZ_OSS)
337+AC_SUBST_LIST(MOZ_OSS_CFLAGS) 328+AC_SUBST_LIST(MOZ_OSS_CFLAGS)
338+AC_SUBST_LIST(MOZ_OSS_LIBS) 329+AC_SUBST_LIST(MOZ_OSS_LIBS)
339+ 330+
340+dnl ================================== 331+dnl ==================================
341 dnl = Check alsa availability on Linux 332 dnl = Check alsa availability on Linux
342 dnl ================================== 333 dnl ==================================
343  334
344@@ -5619,12 +5846,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, 335@@ -5621,12 +5848,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
345 MOZ_ALSA=1, 336 MOZ_ALSA=1,
346 MOZ_ALSA=) 337 MOZ_ALSA=)
347  338
348+MOZ_ARG_DISABLE_BOOL(alsa-dlopen, 339+MOZ_ARG_DISABLE_BOOL(alsa-dlopen,
349+[ --disable-alsa-dlopen Disable runtime linking of libasound.so], 340+[ --disable-alsa-dlopen Disable runtime linking of libasound.so],
350+ DISABLE_LIBASOUND_DLOPEN=1, 341+ DISABLE_LIBASOUND_DLOPEN=1,
351+ DISABLE_LIBASOUND_DLOPEN=) 342+ DISABLE_LIBASOUND_DLOPEN=)
352+ 343+
353 if test -n "$MOZ_ALSA"; then 344 if test -n "$MOZ_ALSA"; then
354 PKG_CHECK_MODULES(MOZ_ALSA, alsa, , 345 PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
355 [echo "$MOZ_ALSA_PKG_ERRORS" 346 [echo "$MOZ_ALSA_PKG_ERRORS"
356 AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])]) 347 AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])])
357 fi 348 fi
358  349
359+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then 350+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
360+ AC_DEFINE(DISABLE_LIBASOUND_DLOPEN) 351+ AC_DEFINE(DISABLE_LIBASOUND_DLOPEN)
361+else 352+else
362+ MOZ_ALSA_LIBS= 353+ MOZ_ALSA_LIBS=
363+fi 354+fi
364+ 355+
365 AC_SUBST(MOZ_ALSA) 356 AC_SUBST(MOZ_ALSA)
366  357
367 dnl ======================================================== 358 dnl ========================================================
368@@ -6046,7 +6284,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, 359@@ -6054,7 +6292,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
369 if test "$MOZ_GAMEPAD"; then 360 if test "$MOZ_GAMEPAD"; then
370 case "$OS_TARGET" in 361 case "$OS_TARGET" in
371 Darwin) 362 Darwin)
372- MOZ_GAMEPAD_BACKEND=cocoa 363- MOZ_GAMEPAD_BACKEND=cocoa
373+ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then 364+ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
374+ MOZ_GAMEPAD_BACKEND=cocoa 365+ MOZ_GAMEPAD_BACKEND=cocoa
375+ fi 366+ fi
376 ;; 367 ;;
377 WINNT) 368 WINNT)
378 MOZ_GAMEPAD_BACKEND=windows 369 MOZ_GAMEPAD_BACKEND=windows
379@@ -8066,6 +8306,49 @@ if test "$USE_FC_FREETYPE"; then 370@@ -8073,6 +8313,49 @@ if test "$USE_FC_FREETYPE"; then
380 fi 371 fi
381  372
382 dnl ======================================================== 373 dnl ========================================================
383+dnl Check for harfbuzz 374+dnl Check for harfbuzz
384+dnl ======================================================== 375+dnl ========================================================
385+ 376+
386+MOZ_ARG_WITH_BOOL(system-harfbuzz, 377+MOZ_ARG_WITH_BOOL(system-harfbuzz,
387+[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)], 378+[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)],
388+MOZ_NATIVE_HARFBUZZ=1, 379+MOZ_NATIVE_HARFBUZZ=1,
389+MOZ_NATIVE_HARFBUZZ=) 380+MOZ_NATIVE_HARFBUZZ=)
390+ 381+
391+if test -n "$MOZ_NATIVE_HARFBUZZ"; then 382+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
392+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34) 383+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34)
File Deleted: pkgsrc/www/firefox/patches/Attic/patch-accessible_atk_Platform.cpp
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/Attic/patch-b2g_installer_package-manifest.in (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-b2g_installer_package-manifest.in 2015/02/28 04:30:55 1.4
+++ pkgsrc/www/firefox/patches/Attic/patch-b2g_installer_package-manifest.in 2015/07/03 10:25:40 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-b2g_installer_package-manifest.in,v 1.4 2015/02/28 04:30:55 ryoon Exp $ 1$NetBSD: patch-b2g_installer_package-manifest.in,v 1.5 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- b2g/installer/package-manifest.in.orig 2015-02-17 21:40:34.000000000 +0000 3--- b2g/installer/package-manifest.in.orig 2015-06-18 20:55:24.000000000 +0000
4+++ b2g/installer/package-manifest.in 4+++ b2g/installer/package-manifest.in
5@@ -609,7 +609,7 @@ 5@@ -671,7 +671,7 @@
6 @BINPATH@/components/EngineeringModeAPI.js 6 @RESPATH@/components/EngineeringModeAPI.js
7 @BINPATH@/components/EngineeringModeService.js 7 @RESPATH@/components/EngineeringModeService.js
8  8
9-#ifdef MOZ_DEBUG 9-#ifdef MOZ_DEBUG
10+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) 10+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
11 @BINPATH@/components/TestInterfaceJS.js 11 @RESPATH@/components/TestInterfaceJS.js
12 @BINPATH@/components/TestInterfaceJS.manifest 12 @RESPATH@/components/TestInterfaceJS.manifest
13 #endif 13 #endif
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/Attic/patch-mfbt_Attributes.h (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-mfbt_Attributes.h 2015/05/12 22:48:54 1.4
+++ pkgsrc/www/firefox/patches/Attic/patch-mfbt_Attributes.h 2015/07/03 10:25:40 1.5
@@ -1,32 +1,30 @@ @@ -1,32 +1,30 @@
1$NetBSD: patch-mfbt_Attributes.h,v 1.4 2015/05/12 22:48:54 ryoon Exp $ 1$NetBSD: patch-mfbt_Attributes.h,v 1.5 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- mfbt/Attributes.h.orig 2015-05-04 00:43:30.000000000 +0000 3--- mfbt/Attributes.h.orig 2015-06-18 20:55:34.000000000 +0000
4+++ mfbt/Attributes.h 4+++ mfbt/Attributes.h
5@@ -50,6 +50,7 @@ 5@@ -50,6 +50,7 @@
6 * don't indicate support for them here, due to 6 * don't indicate support for them here, due to
7 * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug 7 * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
8 */ 8 */
9+# define MOZ_HAVE_CXX11_ALIGNAS 9+# define MOZ_HAVE_CXX11_ALIGNAS
10 # define MOZ_HAVE_NEVER_INLINE __declspec(noinline) 10 # define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
11 # define MOZ_HAVE_NORETURN __declspec(noreturn) 11 # define MOZ_HAVE_NORETURN __declspec(noreturn)
12 # ifdef __clang__ 12 # ifdef __clang__
13@@ -70,6 +71,9 @@ 13@@ -70,6 +71,9 @@
14 # ifndef __has_extension 14 # ifndef __has_extension
15 # define __has_extension __has_feature /* compatibility, for older versions of clang */ 15 # define __has_extension __has_feature /* compatibility, for older versions of clang */
16 # endif 16 # endif
17+# if __has_extension(cxx_alignas) 17+# if __has_extension(cxx_alignas)
18+# define MOZ_HAVE_CXX11_ALIGNAS 18+# define MOZ_HAVE_CXX11_ALIGNAS
19+# endif 19+# endif
20 # if __has_extension(cxx_constexpr) 20 # if __has_extension(cxx_constexpr)
21 # define MOZ_HAVE_CXX11_CONSTEXPR 21 # define MOZ_HAVE_CXX11_CONSTEXPR
22 # endif 22 # endif
23@@ -84,6 +88,9 @@ 23@@ -86,6 +90,7 @@
24 # endif 
25 #elif defined(__GNUC__) 
26 # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L 24 # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
27+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) 25 # define MOZ_HAVE_CXX11_CONSTEXPR
 26 # if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
28+# define MOZ_HAVE_CXX11_ALIGNAS 27+# define MOZ_HAVE_CXX11_ALIGNAS
29+# endif 28 # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
30 # define MOZ_HAVE_CXX11_CONSTEXPR 29 # endif
31 # define MOZ_HAVE_EXPLICIT_CONVERSION 30 # define MOZ_HAVE_EXPLICIT_CONVERSION
32 # endif 
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_gtk3drawing.c (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_gtk3drawing.c 2015/05/12 22:48:54 1.4
+++ pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_gtk3drawing.c 2015/07/03 10:25:40 1.5
@@ -1,349 +1,60 @@ @@ -1,349 +1,60 @@
1$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.4 2015/05/12 22:48:54 ryoon Exp $ 1$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.5 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- widget/gtk/gtk3drawing.c.orig 2015-05-04 00:43:35.000000000 +0000 3--- widget/gtk/gtk3drawing.c.orig 2015-06-18 20:55:38.000000000 +0000
4+++ widget/gtk/gtk3drawing.c 4+++ widget/gtk/gtk3drawing.c
5@@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget; 5@@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget;
6 static style_prop_t style_prop_func; 6 static style_prop_t style_prop_func;
7 static gboolean have_arrow_scaling; 7 static gboolean have_arrow_scaling;
8 static gboolean checkbox_check_state; 8 static gboolean checkbox_check_state;
9+static gboolean notebook_has_tab_gap; 9+static gboolean notebook_has_tab_gap;
10 static gboolean is_initialized; 10 static gboolean is_initialized;
11  11
12 #define ARROW_UP 0 12 #define ARROW_UP 0
13@@ -725,6 +726,14 @@ moz_gtk_init() 13@@ -725,6 +726,14 @@ moz_gtk_init()
14 else 14 else
15 checkbox_check_state = GTK_STATE_FLAG_ACTIVE; 15 checkbox_check_state = GTK_STATE_FLAG_ACTIVE;
16  16
17+ if(!gtk_check_version(3, 12, 0)) { 17+ if(!gtk_check_version(3, 12, 0)) {
18+ ensure_tab_widget(); 18+ ensure_tab_widget();
19+ gtk_widget_style_get(gTabWidget, "has-tab-gap", &notebook_has_tab_gap, NULL); 19+ gtk_widget_style_get(gTabWidget, "has-tab-gap", &notebook_has_tab_gap, NULL);
20+ } 20+ }
21+ else { 21+ else {
22+ notebook_has_tab_gap = TRUE; 22+ notebook_has_tab_gap = TRUE;
23+ } 23+ }
24+ 24+
25 /* Add style property to GtkEntry. 25 /* Add style property to GtkEntry.
26 * Adding the style property to the normal GtkEntry class means that it 26 * Adding the style property to the normal GtkEntry class means that it
27 * will work without issues inside GtkComboBox and for Spinbuttons. */ 27 * will work without issues inside GtkComboBox and for Spinbuttons. */
28@@ -762,37 +771,17 @@ moz_gtk_radio_get_metrics(gint* indicato 28@@ -2012,6 +2021,9 @@ moz_gtk_get_tab_thickness(void)
29 gint 
30 moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width) 
31 { 
32- gboolean interior_focus; 
33- gint focus_width = 0; 
34+ GtkBorder border; 
35+ GtkBorder padding; 
36+ GtkStyleContext *style; 
37  
38 ensure_entry_widget(); 
39- gtk_widget_style_get(gEntryWidget, 
40- "interior-focus", &interior_focus, 
41- "focus-line-width", &focus_width, 
42- NULL); 
43- if (interior_focus) { 
44- GtkBorder border; 
45- GtkStyleContext *style = gtk_widget_get_style_context(gEntryWidget); 
46- gtk_style_context_get_border(style, 0, &border); 
47- *focus_h_width = border.left + focus_width; 
48- *focus_v_width = border.top + focus_width; 
49- } else { 
50- *focus_h_width = focus_width; 
51- *focus_v_width = focus_width; 
52- } 
53- return MOZ_GTK_SUCCESS; 
54-} 
55- 
56-gint 
57-moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, 
58- gint* focus_width, gint* focus_pad)  
59-{ 
60- gtk_widget_style_get (widget, 
61- "interior-focus", interior_focus, 
62- "focus-line-width", focus_width, 
63- "focus-padding", focus_pad, 
64- NULL); 
65+ style = gtk_widget_get_style_context(gEntryWidget); 
66  
67+ gtk_style_context_get_border(style, 0, &border); 
68+ gtk_style_context_get_padding(style, 0, &padding); 
69+ *focus_h_width = border.left + padding.left; 
70+ *focus_v_width = border.top + padding.top; 
71 return MOZ_GTK_SUCCESS; 
72 } 
73  
74@@ -880,24 +869,6 @@ moz_gtk_splitter_get_metrics(gint orient 
75 return MOZ_GTK_SUCCESS; 
76 } 
77  
78-gint 
79-moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border) 
80-{ 
81- static const GtkBorder default_inner_border = { 1, 1, 1, 1 }; 
82- GtkBorder *tmp_border; 
83- 
84- gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL); 
85- 
86- if (tmp_border) { 
87- *inner_border = *tmp_border; 
88- gtk_border_free(tmp_border); 
89- } 
90- else 
91- *inner_border = default_inner_border; 
92- 
93- return MOZ_GTK_SUCCESS; 
94-} 
95- 
96 static gint 
97 moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect, 
98 GtkWidgetState* state, 
99@@ -908,19 +879,8 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec 
100 GtkStyleContext* style = gtk_widget_get_style_context(widget);  
101 gint x = rect->x, y=rect->y, width=rect->width, height=rect->height; 
102  
103- gboolean interior_focus; 
104- gint focus_width, focus_pad; 
105- 
106- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad); 
107 gtk_widget_set_direction(widget, direction); 
108- 
109- if (!interior_focus && state->focused) { 
110- x += focus_width + focus_pad; 
111- y += focus_width + focus_pad; 
112- width -= 2 * (focus_width + focus_pad); 
113- height -= 2 * (focus_width + focus_pad); 
114- } 
115-  
116+  
117 gtk_style_context_save(style); 
118 gtk_style_context_set_state(style, state_flags); 
119  
120@@ -953,20 +913,12 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec 
121 } 
122  
123 if (state->focused) { 
124- if (interior_focus) { 
125- GtkBorder border; 
126- gtk_style_context_get_border(style, state_flags, &border); 
127- x += border.left + focus_pad; 
128- y += border.top + focus_pad; 
129- width -= 2 * (border.left + focus_pad); 
130- height -= 2 * (border.top + focus_pad); 
131- } else { 
132- x -= focus_width + focus_pad; 
133- y -= focus_width + focus_pad; 
134- width += 2 * (focus_width + focus_pad); 
135- height += 2 * (focus_width + focus_pad); 
136- } 
137- 
138+ GtkBorder border; 
139+ gtk_style_context_get_border(style, state_flags, &border); 
140+ x += border.left; 
141+ y += border.top; 
142+ width -= (border.left + border.right); 
143+ height -= (border.top + border.bottom); 
144 gtk_render_focus(style, cr, x, y, width, height); 
145 } 
146 gtk_style_context_restore(style); 
147@@ -1056,33 +1008,23 @@ calculate_button_inner_rect(GtkWidget* b 
148 GtkTextDirection direction, 
149 gboolean ignore_focus) 
150 { 
151- GtkBorder inner_border; 
152- gboolean interior_focus; 
153- gint focus_width, focus_pad; 
154 GtkStyleContext* style; 
155 GtkBorder border; 
156+ GtkBorder padding = {0, 0, 0, 0}; 
157  
158 style = gtk_widget_get_style_context(button); 
159  
160 /* This mirrors gtkbutton's child positioning */ 
161- moz_gtk_button_get_inner_border(button, &inner_border); 
162- moz_gtk_widget_get_focus(button, &interior_focus, 
163- &focus_width, &focus_pad); 
164- 
165- if (ignore_focus) 
166- focus_width = focus_pad = 0; 
167- 
168 gtk_style_context_get_border(style, 0, &border); 
169+ if (!ignore_focus) 
170+ gtk_style_context_get_padding(style, 0, &padding); 
171  
172- inner_rect->x = rect->x + border.left + focus_width + focus_pad; 
173- inner_rect->x += direction == GTK_TEXT_DIR_LTR ? 
174- inner_border.left : inner_border.right; 
175- inner_rect->y = rect->y + inner_border.top + border.top + 
176- focus_width + focus_pad; 
177- inner_rect->width = MAX(1, rect->width - inner_border.left - 
178- inner_border.right - (border.left + focus_pad + focus_width) * 2); 
179- inner_rect->height = MAX(1, rect->height - inner_border.top - 
180- inner_border.bottom - (border.top + focus_pad + focus_width) * 2); 
181+ inner_rect->x = rect->x + border.left + padding.left; 
182+ inner_rect->y = rect->y + padding.top + border.top; 
183+ inner_rect->width = MAX(1, rect->width - padding.left - 
184+ padding.right - border.left * 2); 
185+ inner_rect->height = MAX(1, rect->height - padding.top - 
186+ padding.bottom - border.top * 2); 
187  
188 return MOZ_GTK_SUCCESS; 
189 } 
190@@ -1230,6 +1172,7 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi 
191 GtkStyleContext* style; 
192 GtkScrollbar *scrollbar; 
193 GtkAdjustment *adj; 
194+ GtkBorder margin; 
195  
196 ensure_scrollbar_widget(); 
197  
198@@ -1239,15 +1182,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi 
199 scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget); 
200  
201 gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction); 
202-  
203+ 
204 style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar)); 
205 gtk_style_context_save(style); 
206-  
207+ 
208 gtk_style_context_add_class(style, GTK_STYLE_CLASS_SLIDER); 
209 gtk_style_context_set_state(style, state_flags); 
210  
211- gtk_render_slider(style, cr, rect->x, rect->y, 
212- rect->width, rect->height, 
213+ gtk_style_context_get_margin (style, state_flags, &margin); 
214+ 
215+ gtk_render_slider(style, cr, 
216+ rect->x + margin.left, 
217+ rect->y + margin.top, 
218+ rect->width - margin.left - margin.right, 
219+ rect->height - margin.top - margin.bottom, 
220 (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ? 
221 GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); 
222  
223@@ -1451,19 +1399,12 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect 
224 { 
225 gint x = rect->x, y = rect->y, width = rect->width, height = rect->height; 
226 GtkStyleContext* style; 
227- gboolean interior_focus; 
228- gint focus_width; 
229 int draw_focus_outline_only = state->depressed; // NS_THEME_FOCUS_OUTLINE 
230  
231 gtk_widget_set_direction(widget, direction); 
232  
233 style = gtk_widget_get_style_context(widget); 
234  
235- gtk_widget_style_get(widget, 
236- "interior-focus", &interior_focus, 
237- "focus-line-width", &focus_width, 
238- NULL); 
239- 
240 if (draw_focus_outline_only) { 
241 // Inflate the given 'rect' with the focus outline size. 
242 gint h, v; 
243@@ -1495,14 +1436,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect 
244 /* This will get us the lit borders that focused textboxes enjoy on 
245 * some themes. */ 
246 gtk_style_context_set_state(style, GTK_STATE_FLAG_FOCUSED); 
247- if (!interior_focus) { 
248- /* Indent the border a little bit if we have exterior focus  
249- (this is what GTK does to draw native entries) */ 
250- x += focus_width; 
251- y += focus_width; 
252- width -= 2 * focus_width; 
253- height -= 2 * focus_width; 
254- } 
255 } 
256  
257 if (state->disabled) { 
258@@ -1514,11 +1447,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect 
259 } 
260 gtk_render_frame(style, cr, x, y, width, height); 
261  
262- if (state->focused && !state->disabled) { 
263- if (!interior_focus) { 
264- gtk_render_focus(style, cr, rect->x, rect->y, rect->width, rect->height); 
265- } 
266- } 
267 gtk_style_context_restore(style); 
268  
269 return MOZ_GTK_SUCCESS; 
270@@ -1823,8 +1751,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk 
271 GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); 
272 GtkStyleContext* style; 
273 GtkWidget *widget; 
274- gboolean interior_focus; 
275- gint focus_width, focus_pad; 
276  
277 if (isradio) { 
278 ensure_radiobutton_widget(); 
279@@ -1837,7 +1763,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk 
280  
281 style = gtk_widget_get_style_context(widget); 
282 gtk_style_context_save(style); 
283- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad); 
284 gtk_style_context_set_state(style, state_flags); 
285  
286 /* this is for drawing a prelight box */ 
287@@ -1846,10 +1771,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk 
288 rect->x, rect->y, rect->width, rect->height); 
289 } 
290  
291- if (state->focused && !interior_focus) { 
292- gtk_render_focus(style, cr, 
293- rect->x, rect->y, rect->width, rect->height); 
294- } 
295 gtk_style_context_restore(style); 
296  
297 return MOZ_GTK_SUCCESS; 
298@@ -1862,7 +1783,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr,  
299 { 
300 GtkStyleContext *style; 
301 GtkWidget *widget; 
302- gboolean interior_focus; 
303  
304 if (!state->focused) 
305 return MOZ_GTK_SUCCESS; 
306@@ -1883,10 +1803,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr,  
307 } 
308 gtk_widget_set_direction(widget, direction); 
309  
310- gtk_widget_style_get(widget, "interior-focus", &interior_focus, NULL); 
311- if (!interior_focus) 
312- return MOZ_GTK_SUCCESS; 
313- 
314 gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state)); 
315 gtk_render_focus(style, cr, 
316 rect->x, rect->y, rect->width, rect->height); 
317@@ -2105,6 +2021,9 @@ moz_gtk_get_tab_thickness(void) 
318 GtkStyleContext * style; 29 GtkStyleContext * style;
319  30
320 ensure_tab_widget(); 31 ensure_tab_widget();
321+ if (!notebook_has_tab_gap) 32+ if (!notebook_has_tab_gap)
322+ return 0; /* tabs do not overdraw the tabpanel border with "no gap" style */ 33+ return 0; /* tabs do not overdraw the tabpanel border with "no gap" style */
323+ 34+
324 style = gtk_widget_get_style_context(gTabWidget); 35 style = gtk_widget_get_style_context(gTabWidget);
325 gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK); 36 gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK);
326 gtk_style_context_get_border(style, 0, &border); 37 gtk_style_context_get_border(style, 0, &border);
327@@ -2150,7 +2069,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan 38@@ -2057,7 +2069,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
328 ensure_tab_widget(); 39 ensure_tab_widget();
329 gtk_widget_set_direction(gTabWidget, direction); 40 gtk_widget_set_direction(gTabWidget, direction);
330  41
331- style = gtk_widget_get_style_context(gTabWidget);  42- style = gtk_widget_get_style_context(gTabWidget);
332+ style = gtk_widget_get_style_context(gTabWidget); 43+ style = gtk_widget_get_style_context(gTabWidget);
333 gtk_style_context_save(style); 44 gtk_style_context_save(style);
334 moz_gtk_tab_prepare_style_context(style, flags); 45 moz_gtk_tab_prepare_style_context(style, flags);
335  46
336@@ -2167,143 +2086,155 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan 47@@ -2074,143 +2086,155 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan
337  48
338 focusRect = backRect = tabRect; 49 focusRect = backRect = tabRect;
339  50
340- if ((flags & MOZ_GTK_TAB_SELECTED) == 0) { 51- if ((flags & MOZ_GTK_TAB_SELECTED) == 0) {
341- /* Only draw the tab */ 52- /* Only draw the tab */
342- gtk_render_extension(style, cr, 53- gtk_render_extension(style, cr,
343- tabRect.x, tabRect.y, tabRect.width, tabRect.height, 54- tabRect.x, tabRect.y, tabRect.width, tabRect.height,
344- (flags & MOZ_GTK_TAB_BOTTOM) ? 55- (flags & MOZ_GTK_TAB_BOTTOM) ?
345- GTK_POS_TOP : GTK_POS_BOTTOM ); 56- GTK_POS_TOP : GTK_POS_BOTTOM );
346- } else { 57- } else {
347- /* Draw the tab and the gap 58- /* Draw the tab and the gap
348- * We want the gap to be positioned exactly on the tabpanel top 59- * We want the gap to be positioned exactly on the tabpanel top
349- * border; since tabbox.css may set a negative margin so that the tab 60- * border; since tabbox.css may set a negative margin so that the tab
@@ -602,227 +313,39 @@ $NetBSD: patch-widget_gtk_gtk3drawing.c, @@ -602,227 +313,39 @@ $NetBSD: patch-widget_gtk_gtk3drawing.c,
602+ focusRect.y += padding.top; 313+ focusRect.y += padding.top;
603+ focusRect.height -= (padding.top + padding.bottom); 314+ focusRect.height -= (padding.top + padding.bottom);
604  315
605 gtk_render_focus(style, cr, 316 gtk_render_focus(style, cr,
606 focusRect.x, focusRect.y, focusRect.width, focusRect.height); 317 focusRect.x, focusRect.y, focusRect.width, focusRect.height);
607+ 318+
608+ gtk_style_context_restore(style); 319+ gtk_style_context_restore(style);
609 } 320 }
610  321
611- gtk_style_context_restore(style); 322- gtk_style_context_restore(style);
612  323
613 return MOZ_GTK_SUCCESS; 324 return MOZ_GTK_SUCCESS;
614 } 325 }
615@@ -2684,26 +2615,18 @@ moz_gtk_get_widget_border(GtkThemeWidget 326@@ -2831,11 +2855,7 @@ moz_gtk_get_tab_border(gint* left, gint*
616 switch (widget) { 
617 case MOZ_GTK_BUTTON: 
618 { 
619- GtkBorder inner_border; 
620- gboolean interior_focus; 
621- gint focus_width, focus_pad; 
622- 
623 ensure_button_widget(); 
624+ style = gtk_widget_get_style_context(gButtonWidget); 
625+ 
626 *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButtonWidget)); 
627  
628 /* Don't add this padding in HTML, otherwise the buttons will 
629 become too big and stuff the layout. */ 
630 if (!inhtml) { 
631- moz_gtk_widget_get_focus(gButtonWidget, &interior_focus, &focus_width, &focus_pad); 
632- moz_gtk_button_get_inner_border(gButtonWidget, &inner_border); 
633- *left += focus_width + focus_pad + inner_border.left; 
634- *right += focus_width + focus_pad + inner_border.right; 
635- *top += focus_width + focus_pad + inner_border.top; 
636- *bottom += focus_width + focus_pad + inner_border.bottom; 
637+ moz_gtk_add_style_padding(style, left, top, right, bottom); 
638 } 
639  
640- moz_gtk_add_style_border(gtk_widget_get_style_context(gButtonWidget),  
641- left, top, right, bottom); 
642+ moz_gtk_add_style_border(style, left, top, right, bottom); 
643 return MOZ_GTK_SUCCESS; 
644 } 
645 case MOZ_GTK_ENTRY: 
646@@ -2711,7 +2634,13 @@ moz_gtk_get_widget_border(GtkThemeWidget 
647 ensure_entry_widget(); 
648 style = gtk_widget_get_style_context(gEntryWidget); 
649 moz_gtk_add_style_border(style, left, top, right, bottom); 
650- moz_gtk_add_style_padding(style, left, top, right, bottom); 
651+ 
652+ /* Use the document padding in HTML 
653+ and GTK style padding in XUL. */ 
654+ if (!inhtml) { 
655+ moz_gtk_add_style_padding(style, left, top, right, bottom); 
656+ } 
657+ 
658 return MOZ_GTK_SUCCESS; 
659 } 
660 case MOZ_GTK_TREEVIEW: 
661@@ -2731,23 +2660,15 @@ moz_gtk_get_widget_border(GtkThemeWidget 
662 * assigned. 
663 * That is why the following code is the same as for MOZ_GTK_BUTTON.  
664 * */ 
665- 
666- GtkBorder inner_border; 
667- gboolean interior_focus; 
668- gint focus_width, focus_pad; 
669+ GtkStyleContext *style; 
670  
671 ensure_tree_header_cell_widget(); 
672 *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gTreeHeaderCellWidget)); 
673  
674- moz_gtk_widget_get_focus(gTreeHeaderCellWidget, &interior_focus, &focus_width, &focus_pad); 
675- moz_gtk_button_get_inner_border(gTreeHeaderCellWidget, &inner_border); 
676- *left += focus_width + focus_pad + inner_border.left; 
677- *right += focus_width + focus_pad + inner_border.right; 
678- *top += focus_width + focus_pad + inner_border.top; 
679- *bottom += focus_width + focus_pad + inner_border.bottom; 
680-  
681- moz_gtk_add_style_border(gtk_widget_get_style_context(gTreeHeaderCellWidget),  
682- left, top, right, bottom); 
683+ style = gtk_widget_get_style_context(gTreeHeaderCellWidget); 
684+ 
685+ moz_gtk_add_style_border(style, left, top, right, bottom); 
686+ moz_gtk_add_style_padding(style, left, top, right, bottom); 
687 return MOZ_GTK_SUCCESS; 
688 } 
689 case MOZ_GTK_TREE_HEADER_SORTARROW: 
690@@ -2767,29 +2688,23 @@ moz_gtk_get_widget_border(GtkThemeWidget 
691 /* We need to account for the arrow on the dropdown, so text 
692 * doesn't come too close to the arrow, or in some cases spill 
693 * into the arrow. */ 
694- gboolean ignored_interior_focus, wide_separators; 
695- gint focus_width, focus_pad, separator_width; 
696+ gboolean wide_separators; 
697+ gint separator_width; 
698 GtkRequisition arrow_req; 
699 GtkBorder border; 
700  
701 ensure_combo_box_widgets(); 
702  
703- *left = gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget)); 
704+ *left = *top = *right = *bottom =  
705+ gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget)); 
706+ 
707+ style = gtk_widget_get_style_context(gComboBoxButtonWidget); 
708  
709 if (!inhtml) { 
710- moz_gtk_widget_get_focus(gComboBoxButtonWidget, 
711- &ignored_interior_focus, 
712- &focus_width, &focus_pad); 
713- *left += focus_width + focus_pad; 
714+ moz_gtk_add_style_padding(style, left, top, right, bottom); 
715 } 
716  
717- style = gtk_widget_get_style_context(gComboBoxButtonWidget); 
718- gtk_style_context_get_border(style, 0, &border); 
719- 
720- *top = *left + border.top; 
721- *left += border.left; 
722- 
723- *right = *left; *bottom = *top; 
724+ moz_gtk_add_style_border(style, left, top, right, bottom); 
725  
726 /* If there is no separator, don't try to count its width. */ 
727 separator_width = 0; 
728@@ -2841,60 +2756,23 @@ moz_gtk_get_widget_border(GtkThemeWidget 
729 ensure_frame_widget(); 
730 w = gFrameWidget; 
731 break; 
732- case MOZ_GTK_CHECKBUTTON_LABEL: 
733- case MOZ_GTK_RADIOBUTTON_LABEL: 
734- { 
735- gboolean interior_focus; 
736- gint focus_width, focus_pad; 
737- 
738- /* If the focus is interior, then the label has a border of 
739- (focus_width + focus_pad). */ 
740- if (widget == MOZ_GTK_CHECKBUTTON_LABEL) { 
741- ensure_checkbox_widget(); 
742- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus, 
743- &focus_width, &focus_pad); 
744- } 
745- else { 
746- ensure_radiobutton_widget(); 
747- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus, 
748- &focus_width, &focus_pad); 
749- } 
750- 
751- if (interior_focus) 
752- *left = *top = *right = *bottom = (focus_width + focus_pad); 
753- 
754- return MOZ_GTK_SUCCESS; 
755- } 
756- 
757 case MOZ_GTK_CHECKBUTTON_CONTAINER: 
758 case MOZ_GTK_RADIOBUTTON_CONTAINER: 
759 { 
760- gboolean interior_focus; 
761- gint focus_width, focus_pad; 
762- 
763- /* If the focus is _not_ interior, then the container has a border 
764- of (focus_width + focus_pad). */ 
765 if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) { 
766 ensure_checkbox_widget(); 
767- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus, 
768- &focus_width, &focus_pad); 
769 w = gCheckboxWidget; 
770 } else { 
771 ensure_radiobutton_widget(); 
772- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus, 
773- &focus_width, &focus_pad); 
774 w = gRadiobuttonWidget; 
775 } 
776+ style = gtk_widget_get_style_context(w); 
777  
778 *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w)); 
779- 
780- if (!interior_focus) { 
781- *left += (focus_width + focus_pad); 
782- *right += (focus_width + focus_pad); 
783- *top += (focus_width + focus_pad); 
784- *bottom += (focus_width + focus_pad); 
785- } 
786- 
787+ moz_gtk_add_style_border(style, 
788+ left, top, right, bottom); 
789+ moz_gtk_add_style_padding(style, 
790+ left, top, right, bottom); 
791 return MOZ_GTK_SUCCESS; 
792 } 
793 case MOZ_GTK_MENUPOPUP: 
794@@ -2921,6 +2799,8 @@ moz_gtk_get_widget_border(GtkThemeWidget 
795 return MOZ_GTK_SUCCESS; 
796 } 
797 /* These widgets have no borders, since they are not containers. */ 
798+ case MOZ_GTK_CHECKBUTTON_LABEL: 
799+ case MOZ_GTK_RADIOBUTTON_LABEL: 
800 case MOZ_GTK_SPLITTER_HORIZONTAL: 
801 case MOZ_GTK_SPLITTER_VERTICAL: 
802 case MOZ_GTK_CHECKBUTTON: 
803@@ -2975,11 +2855,7 @@ moz_gtk_get_tab_border(gint* left, gint* 
804 gtk_style_context_save(style); 327 gtk_style_context_save(style);
805 moz_gtk_tab_prepare_style_context(style, flags); 328 moz_gtk_tab_prepare_style_context(style, flags);
806  329
807- // TODO add_style_border() should be replaced 330- // TODO add_style_border() should be replaced
808- // with focus-line-width and focus-padding 331- // with focus-line-width and focus-padding
809- // see Bug 877605 332- // see Bug 877605
810 *left = *top = *right = *bottom = 0; 333 *left = *top = *right = *bottom = 0;
811- moz_gtk_add_style_border(style, left, top, right, bottom); 334- moz_gtk_add_style_border(style, left, top, right, bottom);
812 moz_gtk_add_style_padding(style, left, top, right, bottom); 335 moz_gtk_add_style_padding(style, left, top, right, bottom);
813  336
814 gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL); 337 gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL);
815@@ -2990,16 +2866,9 @@ moz_gtk_get_tab_border(gint* left, gint* 338@@ -2846,16 +2866,9 @@ moz_gtk_get_tab_border(gint* left, gint*
816 int initial_gap; 339 int initial_gap;
817 gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL); 340 gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL);
818 if (direction == GTK_TEXT_DIR_RTL) 341 if (direction == GTK_TEXT_DIR_RTL)
819- *right += initial_gap; 342- *right += initial_gap;
820+ *right += initial_gap; 343+ *right += initial_gap;
821 else 344 else
822- *left += initial_gap; 345- *left += initial_gap;
823- } 346- }
824- 347-
825- // Top tabs have no bottom border, bottom tabs have no top border 348- // Top tabs have no bottom border, bottom tabs have no top border
826- if (flags & MOZ_GTK_TAB_BOTTOM) { 349- if (flags & MOZ_GTK_TAB_BOTTOM) {
827- *top = 0; 350- *top = 0;
828- } else { 351- } else {
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_nsNativeThemeGTK.cpp (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_nsNativeThemeGTK.cpp 2015/05/12 22:48:54 1.4
+++ pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_nsNativeThemeGTK.cpp 2015/07/03 10:25:40 1.5
@@ -1,30 +1,13 @@ @@ -1,30 +1,13 @@
1$NetBSD: patch-widget_gtk_nsNativeThemeGTK.cpp,v 1.4 2015/05/12 22:48:54 ryoon Exp $ 1$NetBSD: patch-widget_gtk_nsNativeThemeGTK.cpp,v 1.5 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- widget/gtk/nsNativeThemeGTK.cpp.orig 2015-05-04 00:43:35.000000000 +0000 3--- widget/gtk/nsNativeThemeGTK.cpp.orig 2015-06-18 20:55:38.000000000 +0000
4+++ widget/gtk/nsNativeThemeGTK.cpp 4+++ widget/gtk/nsNativeThemeGTK.cpp
5@@ -761,6 +761,8 @@ nsNativeThemeGTK::GetExtraSizeForWidget( 5@@ -761,6 +761,8 @@ nsNativeThemeGTK::GetExtraSizeForWidget(
6 return false; 6 return false;
7  7
8 gint gap_height = moz_gtk_get_tab_thickness(); 8 gint gap_height = moz_gtk_get_tab_thickness();
9+ if (!gap_height) 9+ if (!gap_height)
10+ return false; 10+ return false;
11  11
12 int32_t extra = gap_height - GetTabMarginPixels(aFrame); 12 int32_t extra = gap_height - GetTabMarginPixels(aFrame);
13 if (extra <= 0) 13 if (extra <= 0)
14@@ -1528,9 +1530,15 @@ nsNativeThemeGTK::GetWidgetTransparency( 
15 case NS_THEME_MENUPOPUP: 
16 case NS_THEME_WINDOW: 
17 case NS_THEME_DIALOG: 
18- // Tooltips use gtk_paint_flat_box(). 
19+ return eOpaque; 
20+ // Tooltips use gtk_paint_flat_box() on Gtk2 
21+ // but are shaped on Gtk3 
22 case NS_THEME_TOOLTIP: 
23+#if (MOZ_WIDGET_GTK == 2) 
24 return eOpaque; 
25+#else 
26+ return eTransparent; 
27+#endif 
28 } 
29  
30 return eUnknownTransparency; 
cvs diff -r1.13 -r1.14 pkgsrc/www/firefox/patches/Attic/patch-config_system-headers (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-config_system-headers 2015/05/12 22:48:54 1.13
+++ pkgsrc/www/firefox/patches/Attic/patch-config_system-headers 2015/07/03 10:25:40 1.14
@@ -1,56 +1,48 @@ @@ -1,56 +1,48 @@
1$NetBSD: patch-config_system-headers,v 1.13 2015/05/12 22:48:54 ryoon Exp $ 1$NetBSD: patch-config_system-headers,v 1.14 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- config/system-headers.orig 2015-05-04 00:43:23.000000000 +0000 3--- config/system-headers.orig 2015-06-18 20:55:30.000000000 +0000
4+++ config/system-headers 4+++ config/system-headers
5@@ -189,7 +189,6 @@ asm/signal.h 5@@ -628,6 +628,7 @@ libgnome/libgnome.h
6 ASRegistry.h 6 libgnomeui/gnome-icon-lookup.h
7 assert.h 7 libgnomeui/gnome-icon-theme.h
8 atk/atk.h 8 libgnomeui/gnome-ui-init.h
9-atk-bridge.h 
10 atlcom.h 
11 atlconv.h 
12 atlctl.cpp 
13@@ -636,6 +635,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h 
14 libgnomevfs/gnome-vfs-mime-utils.h 
15 libgnomevfs/gnome-vfs-ops.h 
16 libgnomevfs/gnome-vfs-standard-callbacks.h 
17+libv4l2.h 9+libv4l2.h
18 lib$routines.h 10 lib$routines.h
19 limits 11 limits
20 limits.h 12 limits.h
21@@ -1266,7 +1266,6 @@ X11/Xlocale.h 13@@ -1258,7 +1259,6 @@ X11/Xlocale.h
22 X11/Xos.h 14 X11/Xos.h
23 X11/Xutil.h 15 X11/Xutil.h
24 zmouse.h 16 zmouse.h
25-soundtouch/SoundTouch.h 17-soundtouch/SoundTouch.h
26 #if MOZ_NATIVE_PNG==1 18 #if MOZ_NATIVE_PNG==1
27 png.h 19 png.h
28 #endif 20 #endif
29@@ -1328,10 +1327,13 @@ vorbis/codec.h 21@@ -1320,10 +1320,13 @@ vorbis/codec.h
30 theora/theoradec.h 22 theora/theoradec.h
31 tremor/ivorbiscodec.h 23 tremor/ivorbiscodec.h
32 speex/speex_resampler.h 24 speex/speex_resampler.h
33+soundtouch/SoundTouch.h 25+soundtouch/SoundTouch.h
34 ogg/ogg.h 26 ogg/ogg.h
35 ogg/os_types.h 27 ogg/os_types.h
36 nestegg/nestegg.h 28 nestegg/nestegg.h
37 cubeb/cubeb.h 29 cubeb/cubeb.h
38+speex/speex_resampler.h 30+speex/speex_resampler.h
39+soundtouch/SoundTouch.h 31+soundtouch/SoundTouch.h
40 #endif 32 #endif
41 gst/gst.h 33 gst/gst.h
42 gst/app/gstappsink.h 34 gst/app/gstappsink.h
43@@ -1360,3 +1362,43 @@ unicode/utypes.h 35@@ -1352,3 +1355,43 @@ unicode/utypes.h
44 #endif 36 #endif
45 libutil.h 37 libutil.h
46 unwind.h 38 unwind.h
47+#if MOZ_NATIVE_GRAPHITE2==1 39+#if MOZ_NATIVE_GRAPHITE2==1
48+graphite2/Font.h 40+graphite2/Font.h
49+graphite2/Segment.h 41+graphite2/Segment.h
50+#endif 42+#endif
51+#if MOZ_NATIVE_HARFBUZZ==1 43+#if MOZ_NATIVE_HARFBUZZ==1
52+harfbuzz/hb-ot.h 44+harfbuzz/hb-ot.h
53+harfbuzz/hb.h 45+harfbuzz/hb.h
54+#endif 46+#endif
55+#if MOZ_NATIVE_OGG==1 47+#if MOZ_NATIVE_OGG==1
56+ogg/ogg.h 48+ogg/ogg.h
cvs diff -r1.1 -r1.2 pkgsrc/www/firefox/patches/Attic/patch-dom_media_gmp_GMPParent.cpp (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-dom_media_gmp_GMPParent.cpp 2015/02/28 04:30:55 1.1
+++ pkgsrc/www/firefox/patches/Attic/patch-dom_media_gmp_GMPParent.cpp 2015/07/03 10:25:40 1.2
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1$NetBSD: patch-dom_media_gmp_GMPParent.cpp,v 1.1 2015/02/28 04:30:55 ryoon Exp $ 1$NetBSD: patch-dom_media_gmp_GMPParent.cpp,v 1.2 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- dom/media/gmp/GMPParent.cpp.orig 2015-02-17 21:40:44.000000000 +0000 3--- dom/media/gmp/GMPParent.cpp.orig 2015-06-18 20:55:35.000000000 +0000
4+++ dom/media/gmp/GMPParent.cpp 4+++ dom/media/gmp/GMPParent.cpp
5@@ -96,23 +96,16 @@ GMPParent::Init(GeckoMediaPluginService  5@@ -101,22 +101,15 @@ GMPParent::Init(GeckoMediaPluginService
6 mService = aService; 6 mService = aService;
7 mDirectory = aPluginDir; 7 mDirectory = aPluginDir;
8  8
9- // aPluginDir is <profile-dir>/<gmp-plugin-id>/<version> 9- // aPluginDir is <profile-dir>/<gmp-plugin-id>/<version>
10- // where <gmp-plugin-id> should be gmp-gmpopenh264 10- // where <gmp-plugin-id> should be gmp-gmpopenh264
11- nsCOMPtr<nsIFile> parent; 11- nsCOMPtr<nsIFile> parent;
12- nsresult rv = aPluginDir->GetParent(getter_AddRefs(parent)); 12- nsresult rv = aPluginDir->GetParent(getter_AddRefs(parent));
13- if (NS_FAILED(rv)) { 
14- return rv; 
15- } 
16- nsAutoString parentLeafName; 
17- rv = parent->GetLeafName(parentLeafName); 
18+ nsAutoString leafname; 13+ nsAutoString leafname;
19+ nsresult rv = aPluginDir->GetLeafName(leafname); 14+ nsresult rv = aPluginDir->GetLeafName(leafname);
20 if (NS_FAILED(rv)) { 15 if (NS_FAILED(rv)) {
21 return rv; 16 return rv;
22 } 17 }
23 LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this, 18- nsAutoString parentLeafName;
24- NS_LossyConvertUTF16toASCII(parentLeafName).get())); 19- rv = parent->GetLeafName(parentLeafName);
25+ NS_LossyConvertUTF16toASCII(leafname).get())); 20- if (NS_FAILED(rv)) {
 21- return rv;
 22- }
 23- LOGD("%s: for %s", __FUNCTION__, NS_LossyConvertUTF16toASCII(parentLeafName).get());
 24+ LOGD("%s: for %s", __FUNCTION__, NS_LossyConvertUTF16toASCII(leafname).get());
26  25
27- MOZ_ASSERT(parentLeafName.Length() > 4); 26- MOZ_ASSERT(parentLeafName.Length() > 4);
28- mName = Substring(parentLeafName, 4); 27- mName = Substring(parentLeafName, 4);
29+ MOZ_ASSERT(leafname.Length() > 4); 28+ MOZ_ASSERT(leafname.Length() > 4);
30+ mName = Substring(leafname, 4); 29+ mName = Substring(leafname, 4);
31  30
32 return ReadGMPMetaData(); 31 return ReadGMPMetaData();
33 } 32 }
cvs diff -r1.1 -r1.2 pkgsrc/www/firefox/patches/Attic/patch-ipc_glue_moz.build (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-ipc_glue_moz.build 2015/01/30 07:32:24 1.1
+++ pkgsrc/www/firefox/patches/Attic/patch-ipc_glue_moz.build 2015/07/03 10:25:40 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ipc_glue_moz.build,v 1.1 2015/01/30 07:32:24 pho Exp $ 1$NetBSD: patch-ipc_glue_moz.build,v 1.2 2015/07/03 10:25:40 ryoon Exp $
2 2
3Don't assume cocoa toolkit just because OS_ARCH is Darwin. 3Don't assume cocoa toolkit just because OS_ARCH is Darwin.
4 4
5--- ipc/glue/moz.build.orig 2015-01-29 12:45:33.000000000 +0000 5--- ipc/glue/moz.build.orig 2015-06-18 20:55:28.000000000 +0000
6+++ ipc/glue/moz.build 6+++ ipc/glue/moz.build
7@@ -87,7 +87,7 @@ elif CONFIG['OS_ARCH'] in ('DragonFly',  7@@ -87,7 +87,7 @@ elif CONFIG['OS_ARCH'] in ('DragonFly',
8 UNIFIED_SOURCES += [ 8 UNIFIED_SOURCES += [
9 'ProcessUtils_bsd.cpp' 9 'ProcessUtils_bsd.cpp'
10 ] 10 ]
11-elif CONFIG['OS_ARCH'] in ('Darwin'): 11-elif CONFIG['OS_ARCH'] == 'Darwin':
12+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 12+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
13 UNIFIED_SOURCES += [ 13 UNIFIED_SOURCES += [
14 'ProcessUtils_mac.mm' 14 'ProcessUtils_mac.mm'
15 ] 15 ]
File Deleted: pkgsrc/www/firefox/patches/Attic/patch-js_src_asmjs_AsmJSSignalHandlers.cpp
File Deleted: pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_gtk2drawing.c
File Deleted: pkgsrc/www/firefox/patches/Attic/patch-widget_gtk_gtkdrawing.h
cvs diff -r1.3 -r1.4 pkgsrc/www/firefox/patches/Attic/patch-js_src_shell_jsoptparse.cpp (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-js_src_shell_jsoptparse.cpp 2015/05/12 22:48:54 1.3
+++ pkgsrc/www/firefox/patches/Attic/patch-js_src_shell_jsoptparse.cpp 2015/07/03 10:25:40 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.3 2015/05/12 22:48:54 ryoon Exp $ 1$NetBSD: patch-js_src_shell_jsoptparse.cpp,v 1.4 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- js/src/shell/jsoptparse.cpp.orig 2015-05-04 00:43:27.000000000 +0000 3--- js/src/shell/jsoptparse.cpp.orig 2015-06-18 20:55:32.000000000 +0000
4+++ js/src/shell/jsoptparse.cpp 4+++ js/src/shell/jsoptparse.cpp
5@@ -90,7 +90,7 @@ PrintParagraph(const char* text, unsigne 5@@ -95,7 +95,7 @@ PrintParagraph(const char* text, unsigne
6 printf("%*s", startColno, ""); 6 ++it;
7  7
8 while (*it != '\0') { 8 while (*it != '\0') {
9- MOZ_ASSERT(!isspace(*it)); 9- MOZ_ASSERT(!isspace(*it));
10+ MOZ_ASSERT(!isspace((unsigned char)*it)); 10+ MOZ_ASSERT(!isspace((unsigned char)*it));
11  11
12 /* Delimit the current token. */ 12 /* Delimit the current token. */
13 const char* limit = it; 13 const char* limit = it;
cvs diff -r1.10 -r1.11 pkgsrc/www/firefox/patches/Attic/patch-media_libcubeb_src_cubeb__alsa.c (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-media_libcubeb_src_cubeb__alsa.c 2015/05/14 15:30:54 1.10
+++ pkgsrc/www/firefox/patches/Attic/patch-media_libcubeb_src_cubeb__alsa.c 2015/07/03 10:25:40 1.11
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.10 2015/05/14 15:30:54 bad Exp $ 1$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- media/libcubeb/src/cubeb_alsa.c.orig 2015-05-08 16:55:17.000000000 +0000 3--- media/libcubeb/src/cubeb_alsa.c.orig 2015-06-18 20:55:30.000000000 +0000
4+++ media/libcubeb/src/cubeb_alsa.c 2015-05-14 15:22:34.000000000 +0000 4+++ media/libcubeb/src/cubeb_alsa.c
5@@ -7,12 +7,18 @@ 5@@ -7,12 +7,18 @@
6 #undef NDEBUG 6 #undef NDEBUG
7 #define _DEFAULT_SOURCE 7 #define _DEFAULT_SOURCE
8 #define _BSD_SOURCE 8 #define _BSD_SOURCE
9+#if defined(__NetBSD__) 9+#if defined(__NetBSD__)
10+#define _NETBSD_SOURCE 10+#define _NETBSD_SOURCE
11+#endif 11+#endif
12 #define _XOPEN_SOURCE 500 12 #define _XOPEN_SOURCE 500
13 #include <pthread.h> 13 #include <pthread.h>
14 #include <sys/time.h> 14 #include <sys/time.h>
15 #include <assert.h> 15 #include <assert.h>
16 #include <limits.h> 16 #include <limits.h>
17+#include <dlfcn.h> 17+#include <dlfcn.h>
@@ -63,36 +63,36 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -63,36 +63,36 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
63+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count); 63+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count);
64+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents); 64+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents);
65+MAKE_TYPEDEF(snd_pcm_recover); 65+MAKE_TYPEDEF(snd_pcm_recover);
66+MAKE_TYPEDEF(snd_pcm_set_params); 66+MAKE_TYPEDEF(snd_pcm_set_params);
67+MAKE_TYPEDEF(snd_pcm_state); 67+MAKE_TYPEDEF(snd_pcm_state);
68+MAKE_TYPEDEF(snd_pcm_writei); 68+MAKE_TYPEDEF(snd_pcm_writei);
69+ 69+
70+#undef MAKE_TYPEDEF 70+#undef MAKE_TYPEDEF
71+#endif 71+#endif
72+ 72+
73 /* ALSA is not thread-safe. snd_pcm_t instances are individually protected 73 /* ALSA is not thread-safe. snd_pcm_t instances are individually protected
74 by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction 74 by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction
75 is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), 75 is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1),
76@@ -65,6 +116,8 @@ 76@@ -65,6 +116,8 @@ struct cubeb {
77 workaround is not required. */ 77 workaround is not required. */
78 snd_config_t * local_config; 78 snd_config_t * local_config;
79 int is_pa; 79 int is_pa;
80+ 80+
81+ void * libasound; 81+ void * libasound;
82 }; 82 };
83  83
84 enum stream_state { 84 enum stream_state {
85@@ -258,32 +311,35 @@ 85@@ -258,32 +311,35 @@ alsa_refill_stream(cubeb_stream * stm)
86 long got; 86 long got;
87 void * p; 87 void * p;
88 int draining; 88 int draining;
89+ unsigned pipefailures, againfailures; 89+ unsigned pipefailures, againfailures;
90  90
91 draining = 0; 91 draining = 0;
92  92
93 pthread_mutex_lock(&stm->mutex); 93 pthread_mutex_lock(&stm->mutex);
94  94
95- r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); 95- r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
96- if (r < 0 || revents != POLLOUT) { 96- if (r < 0 || revents != POLLOUT) {
97- /* This should be a stream error; it makes no sense for poll(2) to wake 97- /* This should be a stream error; it makes no sense for poll(2) to wake
98- for this stream and then have the stream report that it's not ready. 98- for this stream and then have the stream report that it's not ready.
@@ -127,60 +127,60 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -127,60 +127,60 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
127+ if (pipefailures++ > 11) { 127+ if (pipefailures++ > 11) {
128+ fprintf(stderr, "%s: repeated failures from snd_pcm_avail_update, " 128+ fprintf(stderr, "%s: repeated failures from snd_pcm_avail_update, "
129+ "giving up\n", __func__); 129+ "giving up\n", __func__);
130+ pthread_mutex_unlock(&stm->mutex); 130+ pthread_mutex_unlock(&stm->mutex);
131+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); 131+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
132+ return ERROR; 132+ return ERROR;
133+ } 133+ }
134+ WRAP(snd_pcm_recover)(stm->pcm, avail, 1); 134+ WRAP(snd_pcm_recover)(stm->pcm, avail, 1);
135 } 135 }
136+ pipefailures = againfailures = 0; 136+ pipefailures = againfailures = 0;
137  137
138 /* This should never happen. */ 138 /* This should never happen. */
139 if ((unsigned int) avail > stm->buffer_size) { 139 if ((unsigned int) avail > stm->buffer_size) {
140@@ -294,8 +350,8 @@ 140@@ -294,8 +350,8 @@ alsa_refill_stream(cubeb_stream * stm)
141 available to write. If avail is still zero here, the stream must be in 141 available to write. If avail is still zero here, the stream must be in
142 a funky state, so recover and try again. */ 142 a funky state, so recover and try again. */
143 if (avail == 0) { 143 if (avail == 0) {
144- snd_pcm_recover(stm->pcm, -EPIPE, 1); 144- snd_pcm_recover(stm->pcm, -EPIPE, 1);
145- avail = snd_pcm_avail_update(stm->pcm); 145- avail = snd_pcm_avail_update(stm->pcm);
146+ WRAP(snd_pcm_recover)(stm->pcm, -EPIPE, 1); 146+ WRAP(snd_pcm_recover)(stm->pcm, -EPIPE, 1);
147+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); 147+ avail = WRAP(snd_pcm_avail_update)(stm->pcm);
148 if (avail <= 0) { 148 if (avail <= 0) {
149 pthread_mutex_unlock(&stm->mutex); 149 pthread_mutex_unlock(&stm->mutex);
150 stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); 150 stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
151@@ -303,7 +359,7 @@ 151@@ -303,7 +359,7 @@ alsa_refill_stream(cubeb_stream * stm)
152 } 152 }
153 } 153 }
154  154
155- p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail)); 155- p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail));
156+ p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail)); 156+ p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail));
157 assert(p); 157 assert(p);
158  158
159 pthread_mutex_unlock(&stm->mutex); 159 pthread_mutex_unlock(&stm->mutex);
160@@ -312,10 +368,11 @@ 160@@ -312,10 +368,11 @@ alsa_refill_stream(cubeb_stream * stm)
161 if (got < 0) { 161 if (got < 0) {
162 pthread_mutex_unlock(&stm->mutex); 162 pthread_mutex_unlock(&stm->mutex);
163 stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); 163 stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
164+ free(p); 164+ free(p);
165 return ERROR; 165 return ERROR;
166 } 166 }
167 if (got > 0) { 167 if (got > 0) {
168- snd_pcm_sframes_t wrote; 168- snd_pcm_sframes_t wrote;
169+ snd_pcm_sframes_t wrote, towrite = got; 169+ snd_pcm_sframes_t wrote, towrite = got;
170  170
171 if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) { 171 if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
172 float * b = (float *) p; 172 float * b = (float *) p;
173@@ -328,14 +385,64 @@ 173@@ -328,14 +385,62 @@ alsa_refill_stream(cubeb_stream * stm)
174 b[i] *= stm->volume; 174 b[i] *= stm->volume;
175 } 175 }
176 } 176 }
177- wrote = snd_pcm_writei(stm->pcm, p, got); 177- wrote = snd_pcm_writei(stm->pcm, p, got);
178- if (wrote == -EPIPE) { 178- if (wrote == -EPIPE) {
179- snd_pcm_recover(stm->pcm, wrote, 1); 179- snd_pcm_recover(stm->pcm, wrote, 1);
180- wrote = snd_pcm_writei(stm->pcm, p, got); 180- wrote = snd_pcm_writei(stm->pcm, p, got);
181- } 181- }
182- assert(wrote >= 0 && wrote == got); 182- assert(wrote >= 0 && wrote == got);
183- stm->write_position += wrote; 183- stm->write_position += wrote;
184- gettimeofday(&stm->last_activity, NULL); 184- gettimeofday(&stm->last_activity, NULL);
185+ for (;;) { 185+ for (;;) {
186+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, 186+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p,
@@ -196,35 +196,33 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -196,35 +196,33 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
196+ } 196+ }
197+ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1); 197+ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1);
198+ continue; 198+ continue;
199+ case -EAGAIN: 199+ case -EAGAIN:
200+ if (againfailures++ > 3) { 200+ if (againfailures++ > 3) {
201+ fprintf(stderr, "%s: Too many -EAGAIN errors from snd_pcm_writei, " 201+ fprintf(stderr, "%s: Too many -EAGAIN errors from snd_pcm_writei, "
202+ "giving up\n", __func__); 202+ "giving up\n", __func__);
203+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); 203+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
204+ pthread_mutex_unlock(&stm->mutex); 204+ pthread_mutex_unlock(&stm->mutex);
205+ free(p); 205+ free(p);
206+ return ERROR; 206+ return ERROR;
207+ } 207+ }
208+ continue; 208+ continue;
209+#if defined(EBADFD) 
210+ case -EBADFD: 209+ case -EBADFD:
211+ fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n", 210+ fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n",
212+ __func__, "EBADFD"); 211+ __func__, "EBADFD");
213+ free(p); 212+ free(p);
214+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); 213+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
215+ pthread_mutex_unlock(&stm->mutex); 214+ pthread_mutex_unlock(&stm->mutex);
216+ return ERROR; 215+ return ERROR;
217+#endif 
218+ } 216+ }
219+ if (wrote < 0) { 217+ if (wrote < 0) {
220+ fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, " 218+ fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, "
221+ "giving up\n", __func__, (long long)wrote); 219+ "giving up\n", __func__, (long long)wrote);
222+ free(p); 220+ free(p);
223+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); 221+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
224+ pthread_mutex_unlock(&stm->mutex); 222+ pthread_mutex_unlock(&stm->mutex);
225+ return ERROR; 223+ return ERROR;
226+ } 224+ }
227+ pipefailures = againfailures = 0; 225+ pipefailures = againfailures = 0;
228+ stm->write_position += wrote; 226+ stm->write_position += wrote;
229+ gettimeofday(&stm->last_activity, NULL); 227+ gettimeofday(&stm->last_activity, NULL);
230+ if (wrote > towrite) { 228+ if (wrote > towrite) {
@@ -233,36 +231,36 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -233,36 +231,36 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
233+ __func__, (long long)wrote, (long long)towrite); 231+ __func__, (long long)wrote, (long long)towrite);
234+ free(p); 232+ free(p);
235+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); 233+ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
236+ pthread_mutex_unlock(&stm->mutex); 234+ pthread_mutex_unlock(&stm->mutex);
237+ return ERROR; 235+ return ERROR;
238+ } 236+ }
239+ if (towrite == wrote) 237+ if (towrite == wrote)
240+ break; 238+ break;
241+ towrite -= wrote; 239+ towrite -= wrote;
242+ } 240+ }
243 } 241 }
244 if (got != avail) { 242 if (got != avail) {
245 long buffer_fill = stm->buffer_size - (avail - got); 243 long buffer_fill = stm->buffer_size - (avail - got);
246@@ -343,7 +450,7 @@ 244@@ -343,7 +448,7 @@ alsa_refill_stream(cubeb_stream * stm)
247  245
248 /* Fill the remaining buffer with silence to guarantee one full period 246 /* Fill the remaining buffer with silence to guarantee one full period
249 has been written. */ 247 has been written. */
250- snd_pcm_writei(stm->pcm, (char *) p + got, avail - got); 248- snd_pcm_writei(stm->pcm, (char *) p + got, avail - got);
251+ WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got); 249+ WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got);
252  250
253 set_timeout(&stm->drain_timeout, buffer_time * 1000); 251 set_timeout(&stm->drain_timeout, buffer_time * 1000);
254  252
255@@ -454,26 +561,26 @@ 253@@ -454,26 +559,26 @@ get_slave_pcm_node(snd_config_t * lconf,
256  254
257 slave_def = NULL; 255 slave_def = NULL;
258  256
259- r = snd_config_search(root_pcm, "slave", &slave_pcm); 257- r = snd_config_search(root_pcm, "slave", &slave_pcm);
260+ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); 258+ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
261 if (r < 0) { 259 if (r < 0) {
262 return NULL; 260 return NULL;
263 } 261 }
264  262
265- r = snd_config_get_string(slave_pcm, &string); 263- r = snd_config_get_string(slave_pcm, &string);
266+ r = WRAP(snd_config_get_string)(slave_pcm, &string); 264+ r = WRAP(snd_config_get_string)(slave_pcm, &string);
267 if (r >= 0) { 265 if (r >= 0) {
268- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); 266- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
@@ -274,148 +272,148 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -274,148 +272,148 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
274  272
275 do { 273 do {
276- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); 274- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
277+ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); 275+ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
278 if (r < 0) { 276 if (r < 0) {
279 break; 277 break;
280 } 278 }
281  279
282- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); 280- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
283+ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); 281+ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
284 if (r < 0) { 282 if (r < 0) {
285 break; 283 break;
286 } 284 }
287@@ -482,7 +589,7 @@ 285@@ -482,7 +587,7 @@ get_slave_pcm_node(snd_config_t * lconf,
288 if (r < 0 || r > (int) sizeof(node_name)) { 286 if (r < 0 || r > (int) sizeof(node_name)) {
289 break; 287 break;
290 } 288 }
291- r = snd_config_search(lconf, node_name, &pcm); 289- r = snd_config_search(lconf, node_name, &pcm);
292+ r = WRAP(snd_config_search)(lconf, node_name, &pcm); 290+ r = WRAP(snd_config_search)(lconf, node_name, &pcm);
293 if (r < 0) { 291 if (r < 0) {
294 break; 292 break;
295 } 293 }
296@@ -491,7 +598,7 @@ 294@@ -491,7 +596,7 @@ get_slave_pcm_node(snd_config_t * lconf,
297 } while (0); 295 } while (0);
298  296
299 if (slave_def) { 297 if (slave_def) {
300- snd_config_delete(slave_def); 298- snd_config_delete(slave_def);
301+ WRAP(snd_config_delete)(slave_def); 299+ WRAP(snd_config_delete)(slave_def);
302 } 300 }
303  301
304 return NULL; 302 return NULL;
305@@ -514,22 +621,22 @@ 303@@ -514,22 +619,22 @@ init_local_config_with_workaround(char c
306  304
307 lconf = NULL; 305 lconf = NULL;
308  306
309- if (snd_config == NULL) { 307- if (snd_config == NULL) {
310+ if (*WRAP(snd_config) == NULL) { 308+ if (*WRAP(snd_config) == NULL) {
311 return NULL; 309 return NULL;
312 } 310 }
313  311
314- r = snd_config_copy(&lconf, snd_config); 312- r = snd_config_copy(&lconf, snd_config);
315+ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); 313+ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
316 if (r < 0) { 314 if (r < 0) {
317 return NULL; 315 return NULL;
318 } 316 }
319  317
320 do { 318 do {
321- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); 319- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
322+ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); 320+ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
323 if (r < 0) { 321 if (r < 0) {
324 break; 322 break;
325 } 323 }
326  324
327- r = snd_config_get_id(pcm_node, &string); 325- r = snd_config_get_id(pcm_node, &string);
328+ r = WRAP(snd_config_get_id)(pcm_node, &string); 326+ r = WRAP(snd_config_get_id)(pcm_node, &string);
329 if (r < 0) { 327 if (r < 0) {
330 break; 328 break;
331 } 329 }
332@@ -538,7 +645,7 @@ 330@@ -538,7 +643,7 @@ init_local_config_with_workaround(char c
333 if (r < 0 || r > (int) sizeof(node_name)) { 331 if (r < 0 || r > (int) sizeof(node_name)) {
334 break; 332 break;
335 } 333 }
336- r = snd_config_search(lconf, node_name, &pcm_node); 334- r = snd_config_search(lconf, node_name, &pcm_node);
337+ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); 335+ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
338 if (r < 0) { 336 if (r < 0) {
339 break; 337 break;
340 } 338 }
341@@ -549,12 +656,12 @@ 339@@ -549,12 +654,12 @@ init_local_config_with_workaround(char c
342 } 340 }
343  341
344 /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ 342 /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
345- r = snd_config_search(pcm_node, "type", &node); 343- r = snd_config_search(pcm_node, "type", &node);
346+ r = WRAP(snd_config_search)(pcm_node, "type", &node); 344+ r = WRAP(snd_config_search)(pcm_node, "type", &node);
347 if (r < 0) { 345 if (r < 0) {
348 break; 346 break;
349 } 347 }
350  348
351- r = snd_config_get_string(node, &string); 349- r = snd_config_get_string(node, &string);
352+ r = WRAP(snd_config_get_string)(node, &string); 350+ r = WRAP(snd_config_get_string)(node, &string);
353 if (r < 0) { 351 if (r < 0) {
354 break; 352 break;
355 } 353 }
356@@ -565,18 +672,18 @@ 354@@ -565,18 +670,18 @@ init_local_config_with_workaround(char c
357  355
358 /* Don't clobber an explicit existing handle_underrun value, set it only 356 /* Don't clobber an explicit existing handle_underrun value, set it only
359 if it doesn't already exist. */ 357 if it doesn't already exist. */
360- r = snd_config_search(pcm_node, "handle_underrun", &node); 358- r = snd_config_search(pcm_node, "handle_underrun", &node);
361+ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); 359+ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
362 if (r != -ENOENT) { 360 if (r != -ENOENT) {
363 break; 361 break;
364 } 362 }
365  363
366 /* Disable pcm_pulse's asynchronous underrun handling. */ 364 /* Disable pcm_pulse's asynchronous underrun handling. */
367- r = snd_config_imake_integer(&node, "handle_underrun", 0); 365- r = snd_config_imake_integer(&node, "handle_underrun", 0);
368+ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); 366+ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
369 if (r < 0) { 367 if (r < 0) {
370 break; 368 break;
371 } 369 }
372  370
373- r = snd_config_add(pcm_node, node); 371- r = snd_config_add(pcm_node, node);
374+ r = WRAP(snd_config_add)(pcm_node, node); 372+ r = WRAP(snd_config_add)(pcm_node, node);
375 if (r < 0) { 373 if (r < 0) {
376 break; 374 break;
377 } 375 }
378@@ -584,7 +691,7 @@ 376@@ -584,7 +689,7 @@ init_local_config_with_workaround(char c
379 return lconf; 377 return lconf;
380 } while (0); 378 } while (0);
381  379
382- snd_config_delete(lconf); 380- snd_config_delete(lconf);
383+ WRAP(snd_config_delete)(lconf); 381+ WRAP(snd_config_delete)(lconf);
384  382
385 return NULL; 383 return NULL;
386 } 384 }
387@@ -596,9 +703,9 @@ 385@@ -596,9 +701,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
388  386
389 pthread_mutex_lock(&cubeb_alsa_mutex); 387 pthread_mutex_lock(&cubeb_alsa_mutex);
390 if (local_config) { 388 if (local_config) {
391- r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); 389- r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
392+ r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); 390+ r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
393 } else { 391 } else {
394- r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); 392- r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
395+ r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); 393+ r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
396 } 394 }
397 pthread_mutex_unlock(&cubeb_alsa_mutex); 395 pthread_mutex_unlock(&cubeb_alsa_mutex);
398  396
399@@ -611,7 +718,7 @@ 397@@ -611,7 +716,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
400 int r; 398 int r;
401  399
402 pthread_mutex_lock(&cubeb_alsa_mutex); 400 pthread_mutex_lock(&cubeb_alsa_mutex);
403- r = snd_pcm_close(pcm); 401- r = snd_pcm_close(pcm);
404+ r = WRAP(snd_pcm_close)(pcm); 402+ r = WRAP(snd_pcm_close)(pcm);
405 pthread_mutex_unlock(&cubeb_alsa_mutex); 403 pthread_mutex_unlock(&cubeb_alsa_mutex);
406  404
407 return r; 405 return r;
408@@ -668,12 +775,65 @@ 406@@ -668,12 +773,65 @@ alsa_init(cubeb ** context, char const *
409 pthread_attr_t attr; 407 pthread_attr_t attr;
410 snd_pcm_t * dummy; 408 snd_pcm_t * dummy;
411  409
412+ void * libasound = NULL; 410+ void * libasound = NULL;
413+ 411+
414+#ifndef DISABLE_LIBASOUND_DLOPEN 412+#ifndef DISABLE_LIBASOUND_DLOPEN
415+ libasound = dlopen("libasound.so", RTLD_LAZY); 413+ libasound = dlopen("libasound.so", RTLD_LAZY);
416+ if (!libasound) { 414+ if (!libasound) {
417+ return CUBEB_ERROR; 415+ return CUBEB_ERROR;
418+ } 416+ }
419+ 417+
420+#define LOAD(x) do { \ 418+#define LOAD(x) do { \
421+ cubeb_##x = dlsym(libasound, #x); \ 419+ cubeb_##x = dlsym(libasound, #x); \
@@ -462,69 +460,69 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -462,69 +460,69 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
462+ 460+
463+#undef LOAD 461+#undef LOAD
464+#endif 462+#endif
465 assert(context); 463 assert(context);
466 *context = NULL; 464 *context = NULL;
467  465
468 pthread_mutex_lock(&cubeb_alsa_mutex); 466 pthread_mutex_lock(&cubeb_alsa_mutex);
469 if (!cubeb_alsa_error_handler_set) { 467 if (!cubeb_alsa_error_handler_set) {
470- snd_lib_error_set_handler(silent_error_handler); 468- snd_lib_error_set_handler(silent_error_handler);
471+ WRAP(snd_lib_error_set_handler)(silent_error_handler); 469+ WRAP(snd_lib_error_set_handler)(silent_error_handler);
472 cubeb_alsa_error_handler_set = 1; 470 cubeb_alsa_error_handler_set = 1;
473 } 471 }
474 pthread_mutex_unlock(&cubeb_alsa_mutex); 472 pthread_mutex_unlock(&cubeb_alsa_mutex);
475@@ -681,6 +841,8 @@ 473@@ -681,6 +839,8 @@ alsa_init(cubeb ** context, char const *
476 ctx = calloc(1, sizeof(*ctx)); 474 ctx = calloc(1, sizeof(*ctx));
477 assert(ctx); 475 assert(ctx);
478  476
479+ ctx->libasound = libasound; 477+ ctx->libasound = libasound;
480+ 478+
481 ctx->ops = &alsa_ops; 479 ctx->ops = &alsa_ops;
482  480
483 r = pthread_mutex_init(&ctx->mutex, NULL); 481 r = pthread_mutex_init(&ctx->mutex, NULL);
484@@ -730,7 +892,7 @@ 482@@ -730,7 +890,7 @@ alsa_init(cubeb ** context, char const *
485 config fails with EINVAL, the PA PCM is too old for this workaround. */ 483 config fails with EINVAL, the PA PCM is too old for this workaround. */
486 if (r == -EINVAL) { 484 if (r == -EINVAL) {
487 pthread_mutex_lock(&cubeb_alsa_mutex); 485 pthread_mutex_lock(&cubeb_alsa_mutex);
488- snd_config_delete(ctx->local_config); 486- snd_config_delete(ctx->local_config);
489+ WRAP(snd_config_delete)(ctx->local_config); 487+ WRAP(snd_config_delete)(ctx->local_config);
490 pthread_mutex_unlock(&cubeb_alsa_mutex); 488 pthread_mutex_unlock(&cubeb_alsa_mutex);
491 ctx->local_config = NULL; 489 ctx->local_config = NULL;
492 } else if (r >= 0) { 490 } else if (r >= 0) {
493@@ -769,9 +931,13 @@ 491@@ -769,9 +929,13 @@ alsa_destroy(cubeb * ctx)
494 pthread_mutex_destroy(&ctx->mutex); 492 pthread_mutex_destroy(&ctx->mutex);
495 free(ctx->fds); 493 free(ctx->fds);
496  494
497+ if (ctx->libasound) { 495+ if (ctx->libasound) {
498+ dlclose(ctx->libasound); 496+ dlclose(ctx->libasound);
499+ } 497+ }
500+ 498+
501 if (ctx->local_config) { 499 if (ctx->local_config) {
502 pthread_mutex_lock(&cubeb_alsa_mutex); 500 pthread_mutex_lock(&cubeb_alsa_mutex);
503- snd_config_delete(ctx->local_config); 501- snd_config_delete(ctx->local_config);
504+ WRAP(snd_config_delete)(ctx->local_config); 502+ WRAP(snd_config_delete)(ctx->local_config);
505 pthread_mutex_unlock(&cubeb_alsa_mutex); 503 pthread_mutex_unlock(&cubeb_alsa_mutex);
506 } 504 }
507  505
508@@ -839,7 +1005,7 @@ 506@@ -839,7 +1003,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
509 return CUBEB_ERROR; 507 return CUBEB_ERROR;
510 } 508 }
511  509
512- r = snd_pcm_nonblock(stm->pcm, 1); 510- r = snd_pcm_nonblock(stm->pcm, 1);
513+ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); 511+ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
514 assert(r == 0); 512 assert(r == 0);
515  513
516 /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't 514 /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
517@@ -849,23 +1015,23 @@ 515@@ -849,23 +1013,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
518 latency = latency < 500 ? 500 : latency; 516 latency = latency < 500 ? 500 : latency;
519 } 517 }
520  518
521- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, 519- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
522- stm->params.channels, stm->params.rate, 1, 520- stm->params.channels, stm->params.rate, 1,
523- latency * 1000); 521- latency * 1000);
524+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, 522+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
525+ stm->params.channels, stm->params.rate, 1, 523+ stm->params.channels, stm->params.rate, 1,
526+ latency * 1000); 524+ latency * 1000);
527 if (r < 0) { 525 if (r < 0) {
528 alsa_stream_destroy(stm); 526 alsa_stream_destroy(stm);
529 return CUBEB_ERROR_INVALID_FORMAT; 527 return CUBEB_ERROR_INVALID_FORMAT;
530 } 528 }
@@ -534,63 +532,63 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -534,63 +532,63 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
534 assert(r == 0); 532 assert(r == 0);
535  533
536- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); 534- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
537+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); 535+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
538 assert(stm->nfds > 0); 536 assert(stm->nfds > 0);
539  537
540 stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); 538 stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
541 assert(stm->saved_fds); 539 assert(stm->saved_fds);
542- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); 540- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
543+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); 541+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
544 assert((nfds_t) r == stm->nfds); 542 assert((nfds_t) r == stm->nfds);
545  543
546 r = pthread_cond_init(&stm->cond, NULL); 544 r = pthread_cond_init(&stm->cond, NULL);
547@@ -896,7 +1062,7 @@ 545@@ -896,7 +1060,7 @@ alsa_stream_destroy(cubeb_stream * stm)
548 pthread_mutex_lock(&stm->mutex); 546 pthread_mutex_lock(&stm->mutex);
549 if (stm->pcm) { 547 if (stm->pcm) {
550 if (stm->state == DRAINING) { 548 if (stm->state == DRAINING) {
551- snd_pcm_drain(stm->pcm); 549- snd_pcm_drain(stm->pcm);
552+ WRAP(snd_pcm_drain)(stm->pcm); 550+ WRAP(snd_pcm_drain)(stm->pcm);
553 } 551 }
554 alsa_locked_pcm_close(stm->pcm); 552 alsa_locked_pcm_close(stm->pcm);
555 stm->pcm = NULL; 553 stm->pcm = NULL;
556@@ -906,7 +1072,10 @@ 554@@ -906,7 +1070,10 @@ alsa_stream_destroy(cubeb_stream * stm)
557 pthread_mutex_destroy(&stm->mutex); 555 pthread_mutex_destroy(&stm->mutex);
558  556
559 r = pthread_cond_destroy(&stm->cond); 557 r = pthread_cond_destroy(&stm->cond);
560- assert(r == 0); 558- assert(r == 0);
561+ if (r != 0) { /* XXX stopgap until someone figures out the real reason */ 559+ if (r != 0) { /* XXX stopgap until someone figures out the real reason */
562+ fprintf(stderr,"alsa_stream_destroy: pthread_cond_destroy failed: %s", 560+ fprintf(stderr,"alsa_stream_destroy: pthread_cond_destroy failed: %s",
563+ strerror(r)); 561+ strerror(r));
564+ } 562+ }
565  563
566 alsa_unregister_stream(stm); 564 alsa_unregister_stream(stm);
567  565
568@@ -938,12 +1107,12 @@ 566@@ -938,12 +1105,12 @@ alsa_get_max_channel_count(cubeb * ctx,
569 return CUBEB_ERROR; 567 return CUBEB_ERROR;
570 } 568 }
571  569
572- r = snd_pcm_hw_params_any(stm->pcm, hw_params); 570- r = snd_pcm_hw_params_any(stm->pcm, hw_params);
573+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); 571+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
574 if (r < 0) { 572 if (r < 0) {
575 return CUBEB_ERROR; 573 return CUBEB_ERROR;
576 } 574 }
577  575
578- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); 576- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
579+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); 577+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
580 if (r < 0) { 578 if (r < 0) {
581 return CUBEB_ERROR; 579 return CUBEB_ERROR;
582 } 580 }
583@@ -963,34 +1132,34 @@ 581@@ -963,34 +1130,34 @@ alsa_get_preferred_sample_rate(cubeb * c
584  582
585 /* get a pcm, disabling resampling, so we get a rate the 583 /* get a pcm, disabling resampling, so we get a rate the
586 * hardware/dmix/pulse/etc. supports. */ 584 * hardware/dmix/pulse/etc. supports. */
587- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); 585- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
588+ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); 586+ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
589 if (r < 0) { 587 if (r < 0) {
590 return CUBEB_ERROR; 588 return CUBEB_ERROR;
591 } 589 }
592  590
593- r = snd_pcm_hw_params_any(pcm, hw_params); 591- r = snd_pcm_hw_params_any(pcm, hw_params);
594+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); 592+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
595 if (r < 0) { 593 if (r < 0) {
596- snd_pcm_close(pcm); 594- snd_pcm_close(pcm);
@@ -613,61 +611,61 @@ $NetBSD: patch-media_libcubeb_src_cubeb_ @@ -613,61 +611,61 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
613- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); 611- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
614+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); 612+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
615 if (r < 0) { 613 if (r < 0) {
616- snd_pcm_close(pcm); 614- snd_pcm_close(pcm);
617+ WRAP(snd_pcm_close)(pcm); 615+ WRAP(snd_pcm_close)(pcm);
618 return CUBEB_ERROR; 616 return CUBEB_ERROR;
619 } 617 }
620  618
621- snd_pcm_close(pcm); 619- snd_pcm_close(pcm);
622+ WRAP(snd_pcm_close)(pcm); 620+ WRAP(snd_pcm_close)(pcm);
623  621
624 return CUBEB_OK; 622 return CUBEB_OK;
625 } 623 }
626@@ -1014,7 +1183,7 @@ 624@@ -1014,7 +1181,7 @@ alsa_stream_start(cubeb_stream * stm)
627 ctx = stm->context; 625 ctx = stm->context;
628  626
629 pthread_mutex_lock(&stm->mutex); 627 pthread_mutex_lock(&stm->mutex);
630- snd_pcm_pause(stm->pcm, 0); 628- snd_pcm_pause(stm->pcm, 0);
631+ WRAP(snd_pcm_pause)(stm->pcm, 0); 629+ WRAP(snd_pcm_pause)(stm->pcm, 0);
632 gettimeofday(&stm->last_activity, NULL); 630 gettimeofday(&stm->last_activity, NULL);
633 pthread_mutex_unlock(&stm->mutex); 631 pthread_mutex_unlock(&stm->mutex);
634  632
635@@ -1048,7 +1217,7 @@ 633@@ -1048,7 +1215,7 @@ alsa_stream_stop(cubeb_stream * stm)
636 pthread_mutex_unlock(&ctx->mutex); 634 pthread_mutex_unlock(&ctx->mutex);
637  635
638 pthread_mutex_lock(&stm->mutex); 636 pthread_mutex_lock(&stm->mutex);
639- snd_pcm_pause(stm->pcm, 1); 637- snd_pcm_pause(stm->pcm, 1);
640+ WRAP(snd_pcm_pause)(stm->pcm, 1); 638+ WRAP(snd_pcm_pause)(stm->pcm, 1);
641 pthread_mutex_unlock(&stm->mutex); 639 pthread_mutex_unlock(&stm->mutex);
642  640
643 return CUBEB_OK; 641 return CUBEB_OK;
644@@ -1064,14 +1233,17 @@ 642@@ -1064,14 +1231,17 @@ alsa_stream_get_position(cubeb_stream *
645 pthread_mutex_lock(&stm->mutex); 643 pthread_mutex_lock(&stm->mutex);
646  644
647 delay = -1; 645 delay = -1;
648- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || 646- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
649- snd_pcm_delay(stm->pcm, &delay) != 0) { 647- snd_pcm_delay(stm->pcm, &delay) != 0) {
650+ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || 648+ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
651+ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { 649+ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
652 *position = stm->last_position; 650 *position = stm->last_position;
653 pthread_mutex_unlock(&stm->mutex); 651 pthread_mutex_unlock(&stm->mutex);
654 return CUBEB_OK; 652 return CUBEB_OK;
655 } 653 }
656  654
657- assert(delay >= 0); 655- assert(delay >= 0);
658+ if (delay < 0) { 656+ if (delay < 0) {
659+ WRAP(snd_pcm_forward)(stm->pcm, -delay); 657+ WRAP(snd_pcm_forward)(stm->pcm, -delay);
660+ delay = 0; 658+ delay = 0;
661+ } 659+ }
662  660
663 *position = 0; 661 *position = 0;
664 if (stm->write_position >= (snd_pcm_uframes_t) delay) { 662 if (stm->write_position >= (snd_pcm_uframes_t) delay) {
665@@ -1090,7 +1262,7 @@ 663@@ -1090,7 +1260,7 @@ alsa_stream_get_latency(cubeb_stream * s
666 snd_pcm_sframes_t delay; 664 snd_pcm_sframes_t delay;
667 /* This function returns the delay in frames until a frame written using 665 /* This function returns the delay in frames until a frame written using
668 snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ 666 snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
669- if (snd_pcm_delay(stm->pcm, &delay)) { 667- if (snd_pcm_delay(stm->pcm, &delay)) {
670+ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { 668+ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
671 return CUBEB_ERROR; 669 return CUBEB_ERROR;
672 } 670 }
673  671
cvs diff -r1.2 -r1.3 pkgsrc/www/firefox/patches/Attic/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/Attic/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm 2015/05/12 22:48:54 1.2
+++ pkgsrc/www/firefox/patches/Attic/patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm 2015/07/03 10:25:40 1.3
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1$NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.2 2015/05/12 22:48:54 ryoon Exp $ 1$NetBSD: patch-toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.3 2015/07/03 10:25:40 ryoon Exp $
2 2
3--- toolkit/mozapps/extensions/internal/GMPProvider.jsm.orig 2015-05-04 00:43:33.000000000 +0000 3--- toolkit/mozapps/extensions/internal/GMPProvider.jsm.orig 2015-06-18 20:55:37.000000000 +0000
4+++ toolkit/mozapps/extensions/internal/GMPProvider.jsm 4+++ toolkit/mozapps/extensions/internal/GMPProvider.jsm
5@@ -101,12 +101,11 @@ function GMPWrapper(aPluginInfo) { 5@@ -112,12 +112,11 @@ function GMPWrapper(aPluginInfo) {
6 Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP", 6 Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP",
7 "GMPWrapper(" + 7 "GMPWrapper(" +
8 this._plugin.id + ") "); 8 this._plugin.id + ") ");
9- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, 9- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED,
10- this._plugin.id), 10- this._plugin.id),
11+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, this._plugin.id), 11+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, this._plugin.id),
12 this.onPrefEnabledChanged, this); 12 this.onPrefEnabledChanged, this);
13- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION, 13- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION,
14+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH, 14+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH,
15 this._plugin.id), 15 this._plugin.id),
16- this.onPrefVersionChanged, this); 16- this.onPrefVersionChanged, this);
17+ this.onPrefPathChanged, this); 17+ this.onPrefPathChanged, this);
18 if (this._plugin.isEME) { 18 if (this._plugin.isEME) {
19 Preferences.observe(GMPPrefs.KEY_EME_ENABLED, 19 Preferences.observe(GMPPrefs.KEY_EME_ENABLED,
20 this.onPrefEMEGlobalEnabledChanged, this); 20 this.onPrefEMEGlobalEnabledChanged, this);
21@@ -123,17 +122,14 @@ GMPWrapper.prototype = { 21@@ -134,17 +133,14 @@ GMPWrapper.prototype = {
22 optionsType: AddonManager.OPTIONS_TYPE_INLINE, 22 optionsType: AddonManager.OPTIONS_TYPE_INLINE,
23 get optionsURL() { return this._plugin.optionsURL; }, 23 get optionsURL() { return this._plugin.optionsURL; },
24  24
25+ 25+
26 set gmpPath(aPath) { this._gmpPath = aPath; }, 26 set gmpPath(aPath) { this._gmpPath = aPath; },
27 get gmpPath() { 27 get gmpPath() {
28- if (!this._gmpPath && this.isInstalled) { 28- if (!this._gmpPath && this.isInstalled) {
29- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir, 29- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
30- this._plugin.id, 30- this._plugin.id,
31- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, 31- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION,
32- null, this._plugin.id)); 32- null, this._plugin.id));
33+ if (!this._gmpPath) { 33+ if (!this._gmpPath) {
34+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); 34+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
35 } 35 }
36 return this._gmpPath; 36 return this._gmpPath;
37 }, 37 },
38- 38-
39 get id() { return this._plugin.id; }, 39 get missingKey() {
40 get type() { return "plugin"; }, 40 return this._plugin.missingKey;
41 get isGMPlugin() { return true; }, 41 },
42@@ -144,8 +140,13 @@ GMPWrapper.prototype = { 42@@ -159,8 +155,13 @@ GMPWrapper.prototype = {
43 get description() { return this._plugin.description; }, 43 get description() { return this._plugin.description; },
44 get fullDescription() { return this._plugin.fullDescription; }, 44 get fullDescription() { return this._plugin.fullDescription; },
45  45
46- get version() { return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null, 46- get version() { return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null,
47- this._plugin.id); }, 47- this._plugin.id); },
48+ get version() {  48+ get version() {
49+ if (this.isInstalled) { 49+ if (this.isInstalled) {
50+ return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null, 50+ return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null,
51+ this._plugin.id); 51+ this._plugin.id);
52+ } 52+ }
53+ return null; 53+ return null;
54+ }, 54+ },
55  55
56 get isActive() { return !this.appDisabled && !this.userDisabled; }, 56 get isActive() { return !this.appDisabled && !this.userDisabled; },
57 get appDisabled() { 57 get appDisabled() {
58@@ -292,24 +293,17 @@ GMPWrapper.prototype = { 58@@ -307,24 +308,17 @@ GMPWrapper.prototype = {
59  59
60 get pluginMimeTypes() { return []; }, 60 get pluginMimeTypes() { return []; },
61 get pluginLibraries() { 61 get pluginLibraries() {
62- if (this.isInstalled) { 62- if (this.isInstalled) {
63- let path = this.version; 63- let path = this.version;
64- return [path]; 64- return [path];
65- } 65- }
66- return []; 66- return [];
67+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); 67+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
68+ return path && path.length ? [OS.Path.basename(path)] : []; 68+ return path && path.length ? [OS.Path.basename(path)] : [];
69 }, 69 },
70 get pluginFullpath() { 70 get pluginFullpath() {
71- if (this.isInstalled) { 71- if (this.isInstalled) {
@@ -76,57 +76,57 @@ $NetBSD: patch-toolkit_mozapps_extension @@ -76,57 +76,57 @@ $NetBSD: patch-toolkit_mozapps_extension
76- } 76- }
77- return []; 77- return [];
78+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); 78+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
79+ return path && path.length ? [path] : []; 79+ return path && path.length ? [path] : [];
80 }, 80 },
81  81
82 get isInstalled() { 82 get isInstalled() {
83- return this.version && this.version.length > 0; 83- return this.version && this.version.length > 0;
84+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); 84+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id);
85+ return path && path.length > 0; 85+ return path && path.length > 0;
86 }, 86 },
87  87
88 _handleEnabledChanged: function() { 88 _handleEnabledChanged: function() {
89@@ -389,10 +383,10 @@ GMPWrapper.prototype = { 89@@ -404,10 +398,10 @@ GMPWrapper.prototype = {
90 } 90 }
91 }, 91 },
92  92
93- onPrefVersionChanged: function() { 93- onPrefVersionChanged: function() {
94+ onPrefPathChanged: function() { 94+ onPrefPathChanged: function() {
95 AddonManagerPrivate.callAddonListeners("onUninstalling", this, false); 95 AddonManagerPrivate.callAddonListeners("onUninstalling", this, false);
96 if (this._gmpPath) { 96 if (this._gmpPath) {
97- this._log.info("onPrefVersionChanged() - unregistering gmp directory " + 97- this._log.info("onPrefVersionChanged() - unregistering gmp directory " +
98+ this._log.info("onPrefPathChanged() - unregistering gmp directory " + 98+ this._log.info("onPrefPathChanged() - unregistering gmp directory " +
99 this._gmpPath); 99 this._gmpPath);
100 gmpService.removeAndDeletePluginDirectory(this._gmpPath, true /* can defer */); 100 gmpService.removeAndDeletePluginDirectory(this._gmpPath, true /* can defer */);
101 } 101 }
102@@ -401,15 +395,10 @@ GMPWrapper.prototype = { 102@@ -416,15 +410,10 @@ GMPWrapper.prototype = {
103 AddonManagerPrivate.callInstallListeners("onExternalInstall", null, this, 103 AddonManagerPrivate.callInstallListeners("onExternalInstall", null, this,
104 null, false); 104 null, false);
105 AddonManagerPrivate.callAddonListeners("onInstalling", this, false); 105 AddonManagerPrivate.callAddonListeners("onInstalling", this, false);
106- this._gmpPath = null; 106- this._gmpPath = null;
107- if (this.isInstalled) { 107- if (this.isInstalled) {
108- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir, 108- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
109- this._plugin.id, 109- this._plugin.id,
110- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, 110- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION,
111- null, this._plugin.id)); 111- null, this._plugin.id));
112- } 112- }
113+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, 113+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH,
114+ null, this._plugin.id); 114+ null, this._plugin.id);
115 if (this._gmpPath && this.isActive) { 115 if (this._gmpPath && this.isActive) {
116- this._log.info("onPrefVersionChanged() - registering gmp directory " + 116- this._log.info("onPrefVersionChanged() - registering gmp directory " +
117+ this._log.info("onPrefPathChanged() - registering gmp directory " + 117+ this._log.info("onPrefPathChanged() - registering gmp directory " +
118 this._gmpPath); 118 this._gmpPath);
119 gmpService.addPluginDirectory(this._gmpPath); 119 gmpService.addPluginDirectory(this._gmpPath);
120 } 120 }
121@@ -431,9 +420,9 @@ GMPWrapper.prototype = { 121@@ -446,9 +435,9 @@ GMPWrapper.prototype = {
122 Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, 122 Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED,
123 this._plugin.id), 123 this._plugin.id),
124 this.onPrefEnabledChanged, this); 124 this.onPrefEnabledChanged, this);
125- Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION, 125- Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION,
126+ Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH, 126+ Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH,
127 this._plugin.id), 127 this._plugin.id),
128- this.onPrefVersionChanged, this); 128- this.onPrefVersionChanged, this);
129+ this.onPrefPathChanged, this); 129+ this.onPrefPathChanged, this);
130 if (this._plugin.isEME) { 130 if (this._plugin.isEME) {
131 Preferences.ignore(GMPPrefs.KEY_EME_ENABLED, 131 Preferences.ignore(GMPPrefs.KEY_EME_ENABLED,
132 this.onPrefEMEGlobalEnabledChanged, this); 132 this.onPrefEMEGlobalEnabledChanged, this);