diff options
| author | ryoon <ryoon@pkgsrc.org> | 2018-05-10 20:01:53 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2018-05-10 20:01:53 +0000 |
| commit | 93988d6492ee5ec7b41637c9fba5bb3a7543cd11 (patch) | |
| tree | 53e18ed608024ff6a31af9ec9dd9ff1f9e1e111e /www | |
| parent | 19d097a426ac5bc54f1e1c498043c4984ec2bf46 (diff) | |
| download | pkgsrc-93988d6492ee5ec7b41637c9fba5bb3a7543cd11.tar.gz | |
Update to 60.0
* Remove untested patches including NetBSD/earm support
Changelog:
New
Added a policy engine that allows customized Firefox deployments in
enterprise environments, using Windows Group Policy or a cross-platform
JSON file
Enhancements to New Tab / Firefox Home
Responsive layout that shows more content for users with wide-screen
displays
Highlights section includes web sites saved to Pocket
More options to reorder sections and content on the page
Pocket Sponsored Stories will appear for a percentage of users in
the US. Read about our privacy-conscious approach to sponsored content
Redesigned Cookies and Site Storage section in Preferences for greater
clarity and control of first- and third-party cookies
Applied Quantum CSS to render browser UI
Added support for Web Authentication API, which allows USB tokens for
website authentication
Enhanced camera privacy indicators: Firefox now turns off your camera
and the camera's light when you disable video recording, and turns
the camera and light on when you resume recording
Added an option for Linux users to show or hide page titles in a bar
at the top of the browser. You'll find the Title Bar option in the
Customize panel available from the main browser menu.
Improved WebRTC audio performance and playback for Linux users
Locale added: Occitan (oc)
Fixed
Various security fixes
Changed
#CVE-2018-5154: Use-after-free with SVG animations and clip paths
#CVE-2018-5155: Use-after-free with SVG animations and text paths
#CVE-2018-5157: Same-origin bypass of PDF Viewer to view protected PDF files
#CVE-2018-5158: Malicious PDF can inject JavaScript into PDF Viewer
#CVE-2018-5159: Integer overflow and out-of-bounds write in Skia
#CVE-2018-5160: Uninitialized memory use by WebRTC encoder
#CVE-2018-5152: WebExtensions information leak through webRequest API
#CVE-2018-5153: Out-of-bounds read in mixed content websocket messages
#CVE-2018-5163: Replacing cached data in JavaScript Start-up Bytecode Cache
#CVE-2018-5164: CSP not applied to all multipart content sent with
multipart/x-mixed-replace
#CVE-2018-5166: WebExtension host permission bypass through filterReponseData
#CVE-2018-5167: Improper linkification of chrome: and javascript: content
in web console and JavaScript debugger
#CVE-2018-5168: Lightweight themes can be installed without user interaction
#CVE-2018-5169: Dragging and dropping link text onto home button can set home
page to include chrome pages
#CVE-2018-5172: Pasted script from clipboard can run in the Live Bookmarks
page or PDF viewer
#CVE-2018-5173: File name spoofing of Downloads panel with Unicode characters
#CVE-2018-5174: Windows Defender SmartScreen UI runs with less secure behavior
for downloaded files in Windows 10 April 2018 Update
#CVE-2018-5175: Universal CSP bypass on sites using strict-dynamic in
their policies
#CVE-2018-5176: JSON Viewer script injection
#CVE-2018-5177: Buffer overflow in XSLT during number formatting
#CVE-2018-5165: Checkbox for enabling Flash protected mode is inverted in
32-bit Firefox
#CVE-2018-5180: heap-use-after-free in mozilla::WebGLContext::DrawElementsInstanced
#CVE-2018-5181: Local file can be displayed in noopener tab through drag and
drop of hyperlink
#CVE-2018-5182: Local file can be displayed from hyperlink dragged and dropped
on addressbar
#CVE-2018-5151: Memory safety bugs fixed in Firefox 60
#CVE-2018-5150: Memory safety bugs fixed in Firefox 60 and Firefox ESR 52.8
Diffstat (limited to 'www')
65 files changed, 249 insertions, 2043 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index afe95cc9b4f..a88433a5680 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,19 +1,21 @@ -# $NetBSD: Makefile,v 1.330 2018/05/08 10:38:57 maya Exp $ +# $NetBSD: Makefile,v 1.331 2018/05/10 20:01:53 ryoon Exp $ -FIREFOX_HGREV= 6b51784853e47e091d213d421a19cb623af718f0 -FIREFOX_VER= 59.0.3 +FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} +MOZ_BRANCH= 60.0 +MOZ_BRANCH_MINOR= -DISTNAME= firefox-${FIREFOX_VER} +DISTNAME= firefox-${FIREFOX_VER}.source +PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} CATEGORIES= www -MASTER_SITES+= -https://hg.mozilla.org/releases/mozilla-release/archive/${FIREFOX_HGREV}${EXTRACT_SUFX} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} +EXTRACT_SUFX= .tar.xz MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://www.mozilla.com/en-US/firefox/ COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:C/\..*//}) LICENSE= mpl-1.1 -WRKSRC= ${WRKDIR}/mozilla-release-${FIREFOX_HGREV} +WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER} MOZILLA_DIR= # empty diff --git a/www/firefox/PLIST b/www/firefox/PLIST index e801d483b16..2045ae1f009 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.127 2018/03/17 00:59:02 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.128 2018/05/10 20:01:53 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -26,6 +26,8 @@ lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.js lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutRobots-icon.png lib/firefox/browser/chrome/browser/content/browser/aboutRobots-widget-left.png +lib/firefox/browser/chrome/browser/content/browser/aboutRobots.css +lib/firefox/browser/chrome/browser/content/browser/aboutRobots.js lib/firefox/browser/chrome/browser/content/browser/aboutRobots.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutSessionRestore.js lib/firefox/browser/chrome/browser/content/browser/aboutSessionRestore.xhtml @@ -56,7 +58,6 @@ lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2.png lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2@2x.png lib/firefox/browser/chrome/browser/content/browser/abouthome/sync.png lib/firefox/browser/chrome/browser/content/browser/abouthome/sync@2x.png -lib/firefox/browser/chrome/browser/content/browser/baseMenuOverlay.xul lib/firefox/browser/chrome/browser/content/browser/blockedSite.xhtml lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.js lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.xul @@ -83,6 +84,7 @@ lib/firefox/browser/chrome/browser/content/browser/browser-tabPreviews.xml lib/firefox/browser/chrome/browser/content/browser/browser-tabsintitlebar.js lib/firefox/browser/chrome/browser/content/browser/browser-thumbnails.js lib/firefox/browser/chrome/browser/content/browser/browser-trackingprotection.js +lib/firefox/browser/chrome/browser/content/browser/browser-webrender.js lib/firefox/browser/chrome/browser/content/browser/browser.css lib/firefox/browser/chrome/browser/content/browser/browser.js lib/firefox/browser/chrome/browser/content/browser/browser.xul @@ -92,9 +94,7 @@ lib/firefox/browser/chrome/browser/content/browser/content-sessionStore.js lib/firefox/browser/chrome/browser/content/browser/content.js lib/firefox/browser/chrome/browser/content/browser/contentSearchUI.css lib/firefox/browser/chrome/browser/content/browser/contentSearchUI.js -lib/firefox/browser/chrome/browser/content/browser/customizableui/panelUI.css lib/firefox/browser/chrome/browser/content/browser/customizableui/panelUI.js -lib/firefox/browser/chrome/browser/content/browser/customizableui/panelUI.xml lib/firefox/browser/chrome/browser/content/browser/customizableui/toolbar.xml lib/firefox/browser/chrome/browser/content/browser/default-theme-icon.svg lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.header.jpg @@ -112,7 +112,6 @@ lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.preview.png lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.header.png lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.icon.jpg lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.preview.jpg -lib/firefox/browser/chrome/browser/content/browser/defaultthemes/compact.header.png lib/firefox/browser/chrome/browser/content/browser/defaultthemes/dark.icon.svg lib/firefox/browser/chrome/browser/content/browser/defaultthemes/light.icon.svg lib/firefox/browser/chrome/browser/content/browser/downloads/allDownloadsViewOverlay.js @@ -123,9 +122,7 @@ lib/firefox/browser/chrome/browser/content/browser/downloads/contentAreaDownload lib/firefox/browser/chrome/browser/content/browser/downloads/download.xml lib/firefox/browser/chrome/browser/content/browser/downloads/downloads.css lib/firefox/browser/chrome/browser/content/browser/downloads/downloads.js -lib/firefox/browser/chrome/browser/content/browser/downloads/downloadsOverlay.xul lib/firefox/browser/chrome/browser/content/browser/downloads/indicator.js -lib/firefox/browser/chrome/browser/content/browser/downloads/indicatorOverlay.xul lib/firefox/browser/chrome/browser/content/browser/ext-bookmarks.js lib/firefox/browser/chrome/browser/content/browser/ext-browser.js lib/firefox/browser/chrome/browser/content/browser/ext-browser.json @@ -133,6 +130,7 @@ lib/firefox/browser/chrome/browser/content/browser/ext-browserAction.js lib/firefox/browser/chrome/browser/content/browser/ext-browsingData.js lib/firefox/browser/chrome/browser/content/browser/ext-c-browser.js lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools-inspectedWindow.js +lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools-network.js lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools-panels.js lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools.js lib/firefox/browser/chrome/browser/content/browser/ext-c-menus.js @@ -169,13 +167,8 @@ lib/firefox/browser/chrome/browser/content/browser/license.html lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png lib/firefox/browser/chrome/browser/content/browser/migration/migration.js lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul -lib/firefox/browser/chrome/browser/content/browser/newtab/alternativeDefaultSites.json -lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.css -lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.js -lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.xhtml lib/firefox/browser/chrome/browser/content/browser/nsContextMenu.js lib/firefox/browser/chrome/browser/content/browser/pageinfo/feeds.js -lib/firefox/browser/chrome/browser/content/browser/pageinfo/feeds.xml lib/firefox/browser/chrome/browser/content/browser/pageinfo/pageInfo.css lib/firefox/browser/chrome/browser/content/browser/pageinfo/pageInfo.js lib/firefox/browser/chrome/browser/content/browser/pageinfo/pageInfo.xul @@ -191,8 +184,6 @@ lib/firefox/browser/chrome/browser/content/browser/places/editBookmarkOverlay.js lib/firefox/browser/chrome/browser/content/browser/places/editBookmarkOverlay.xul lib/firefox/browser/chrome/browser/content/browser/places/history-panel.js lib/firefox/browser/chrome/browser/content/browser/places/menu.xml -lib/firefox/browser/chrome/browser/content/browser/places/moveBookmarks.js -lib/firefox/browser/chrome/browser/content/browser/places/moveBookmarks.xul lib/firefox/browser/chrome/browser/content/browser/places/organizer.css lib/firefox/browser/chrome/browser/content/browser/places/places.css lib/firefox/browser/chrome/browser/content/browser/places/places.js @@ -204,6 +195,9 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/applicationManage lib/firefox/browser/chrome/browser/content/browser/preferences/applicationManager.xul lib/firefox/browser/chrome/browser/content/browser/preferences/blocklists.js lib/firefox/browser/chrome/browser/content/browser/preferences/blocklists.xul +lib/firefox/browser/chrome/browser/content/browser/preferences/clearSiteData.css +lib/firefox/browser/chrome/browser/content/browser/preferences/clearSiteData.js +lib/firefox/browser/chrome/browser/content/browser/preferences/clearSiteData.xul lib/firefox/browser/chrome/browser/content/browser/preferences/colors.js lib/firefox/browser/chrome/browser/content/browser/preferences/colors.xul lib/firefox/browser/chrome/browser/content/browser/preferences/connection.js @@ -217,6 +211,7 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/fonts.xul lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.css lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.xml lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/containers.js +lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/extensionControlled.js lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/findInPage.js lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/main.js lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.js @@ -235,21 +230,17 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/selectBookmark.js lib/firefox/browser/chrome/browser/content/browser/preferences/selectBookmark.xul lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataRemoveSelected.js lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataRemoveSelected.xul -lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.css lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.js lib/firefox/browser/chrome/browser/content/browser/preferences/siteDataSettings.xul -lib/firefox/browser/chrome/browser/content/browser/preferences/siteListItem.xml lib/firefox/browser/chrome/browser/content/browser/preferences/sitePermissions.css lib/firefox/browser/chrome/browser/content/browser/preferences/sitePermissions.js lib/firefox/browser/chrome/browser/content/browser/preferences/sitePermissions.xul lib/firefox/browser/chrome/browser/content/browser/preferences/translation.js lib/firefox/browser/chrome/browser/content/browser/preferences/translation.xul -lib/firefox/browser/chrome/browser/content/browser/report-phishing-overlay.xul lib/firefox/browser/chrome/browser/content/browser/robot.ico lib/firefox/browser/chrome/browser/content/browser/safeMode.css lib/firefox/browser/chrome/browser/content/browser/safeMode.js lib/firefox/browser/chrome/browser/content/browser/safeMode.xul -lib/firefox/browser/chrome/browser/content/browser/sanitize.js lib/firefox/browser/chrome/browser/content/browser/sanitize.xul lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.css lib/firefox/browser/chrome/browser/content/browser/sanitizeDialog.js @@ -286,12 +277,12 @@ lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.js lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.xhtml lib/firefox/browser/chrome/browser/content/browser/tab-content.js lib/firefox/browser/chrome/browser/content/browser/tabbrowser.css +lib/firefox/browser/chrome/browser/content/browser/tabbrowser.js lib/firefox/browser/chrome/browser/content/browser/tabbrowser.xml lib/firefox/browser/chrome/browser/content/browser/translation-infobar.xml lib/firefox/browser/chrome/browser/content/browser/urlbarBindings.xml lib/firefox/browser/chrome/browser/content/browser/usercontext/usercontext.css lib/firefox/browser/chrome/browser/content/browser/utilityOverlay.js -lib/firefox/browser/chrome/browser/content/browser/viewSourceOverlay.xul lib/firefox/browser/chrome/browser/content/browser/web-panels.js lib/firefox/browser/chrome/browser/content/browser/web-panels.xul lib/firefox/browser/chrome/browser/content/browser/webext-panels.js @@ -409,9 +400,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/monitor.png lib/firefox/browser/chrome/browser/skin/classic/browser/monitor_16-10.png lib/firefox/browser/chrome/browser/skin/classic/browser/new-tab.svg lib/firefox/browser/chrome/browser/skin/classic/browser/new-window.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/close.png -lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/controls.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/newTab.css lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/camera-blocked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/camera.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/canvas-blocked.svg @@ -429,6 +417,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/login lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-blocked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-detailed.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/midi.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage-blocked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/plugin-badge.svg @@ -437,6 +426,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/popup lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/screen-blocked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/screen.svg lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/update.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg lib/firefox/browser/chrome/browser/skin/classic/browser/open.svg lib/firefox/browser/chrome/browser/skin/classic/browser/page-action.svg lib/firefox/browser/chrome/browser/skin/classic/browser/page-livemarks.png @@ -469,7 +459,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/places/livemark-item.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/organizer.css lib/firefox/browser/chrome/browser/skin/classic/browser/places/organizer.xml lib/firefox/browser/chrome/browser/skin/classic/browser/places/places.css -lib/firefox/browser/chrome/browser/skin/classic/browser/places/starred48.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/tag.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/unfiledBookmarks.svg @@ -531,9 +520,9 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/stop.svg lib/firefox/browser/chrome/browser/skin/classic/browser/sync-desktopIcon.svg lib/firefox/browser/chrome/browser/skin/classic/browser/sync-mobileIcon.svg lib/firefox/browser/chrome/browser/skin/classic/browser/sync.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/synced-tabs.svg lib/firefox/browser/chrome/browser/skin/classic/browser/syncedtabs/sidebar.css lib/firefox/browser/chrome/browser/skin/classic/browser/tab-crashed.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/tab.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/crashed.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/indicator-tab-attention.svg lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading-burst.svg @@ -559,7 +548,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge-failed.svg lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge.svg -lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-tab.svg lib/firefox/browser/chrome/browser/skin/classic/browser/warning-white.svg lib/firefox/browser/chrome/browser/skin/classic/browser/warning.svg lib/firefox/browser/chrome/browser/skin/classic/browser/webIDE.svg @@ -670,7 +658,6 @@ lib/firefox/browser/chrome/devtools/content/scratchpad/scratchpad.js lib/firefox/browser/chrome/devtools/content/scratchpad/scratchpad.xul lib/firefox/browser/chrome/devtools/content/shadereditor/shadereditor.js lib/firefox/browser/chrome/devtools/content/shadereditor/shadereditor.xul -lib/firefox/browser/chrome/devtools/content/shared/frame-script-utils.js lib/firefox/browser/chrome/devtools/content/shared/splitview.css lib/firefox/browser/chrome/devtools/content/shared/theme-switching.js lib/firefox/browser/chrome/devtools/content/shared/vendor/d3.js @@ -701,6 +688,7 @@ lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/inspector.js lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/properties.js lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/utils.js lib/firefox/browser/chrome/devtools/content/webaudioeditor/webaudioeditor.xul +lib/firefox/browser/chrome/devtools/content/webconsole/browserconsole.xul lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.html lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.xul lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/Aboutdebugging.js @@ -797,6 +785,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyList.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyListContainer.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyListHeader.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimatedPropertyName.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationDetailContainer.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationDetailHeader.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationItem.js @@ -821,6 +810,14 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/SummaryGraph.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/SummaryGraphPath.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/graph/TimingPath.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/ColorPath.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/ComputedStylePath.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/DiscretePath.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/DistancePath.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframeMarkerItem.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframeMarkerList.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframesGraph.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/keyframes-graph/KeyframesGraphPath.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/reducers/animations.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/utils/graph-helper.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/utils/l10n.js @@ -857,12 +854,16 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/sidebar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ExtensionSidebar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectTreeView.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectValueGripView.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/extension-sidebar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/reducers/sidebar.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/types.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/flexbox.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/components/Flexbox.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/components/FlexboxItem.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/flexbox.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/reducers/flexboxes.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/reducers/flexbox.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/reducers/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/types.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/font-options.js @@ -870,6 +871,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/acti lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/Font.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontList.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontPreview.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontsApp.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/reducers/font-options.js @@ -888,7 +890,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/grid lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/reducers/grids.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/reducers/highlighter-settings.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/types.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/utils/l10n.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/grids/utils/utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-commands.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-search.js @@ -896,6 +897,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/com lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/LayoutApp.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/layout.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/utils/l10n.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/element-container.js @@ -1012,6 +1014,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actio lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/App.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CookiesPanel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CustomRequestPanel.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/DropHarHandler.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/HeadersPanel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/HtmlPreview.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/MdnLink.js @@ -1053,10 +1056,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/conne lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-data-provider.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/constants.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/create-store.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-automation.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-builder-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-builder.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-collector.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-exporter.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-importer.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/toolbox-overlay.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/batching.js @@ -1074,7 +1080,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selec lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/requests.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/timing-markers.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/ui.js -lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/create-store.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-autocomplete-provider.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-predicates.js lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-text-utils.js @@ -1142,6 +1147,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/acti lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/location.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/network-throttling.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/reload-conditions.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/screenshot.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/touch-simulation.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/viewports.js @@ -1158,7 +1164,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/comp lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DeviceSelector.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/GlobalToolbar.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/NetworkThrottlingSelector.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ReloadConditions.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ResizableViewport.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ToggleMenu.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/Viewport.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ViewportDimension.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ViewportToolbar.js @@ -1176,6 +1184,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/redu lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/display-pixel-ratio.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/location.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/network-throttling.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/reload-conditions.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/screenshot.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/touch-simulation.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/reducers/viewports.js @@ -1187,6 +1196,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/util lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/key.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/l10n.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/message.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/notification.js lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/window.js lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-commands.js lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-manager.jsm @@ -1253,6 +1263,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middlew lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/thunk.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/wait-service.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/non-react-subscriber.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/visibility-handler-connect.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/scroll.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-map/index.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-map/worker.js @@ -1270,9 +1281,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/jszip. lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/lodash.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-factories.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-test-renderer-shallow.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/redux.js lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/reselect.js @@ -1423,6 +1436,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-conso lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/id-generator.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/messages.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/object-inspector.js +lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/utils/prefs.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-webconsole.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/utils.js @@ -1439,6 +1453,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runti lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runtimes.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/tab-store.js lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/accessibility-parent.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/accessibility.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/actor-registry.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/addon.js @@ -1448,9 +1463,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/breakpoint.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/call-watcher.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/canvas.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/child-process.js -lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/childtab.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/chrome.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/common.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/content.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/css-properties.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/csscoverage.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/device.js @@ -1465,6 +1480,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/gcli.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/heap-snapshot-file.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters.css lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/accessible.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/auto-refresh.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/css-grid.js @@ -1478,13 +1494,19 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/selector.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/shapes.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/simple-outline.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/utils/accessibility.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/utils/canvas.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/utils/markup.js -lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/inspector.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/xul-accessible.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/inspector/document-walker.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/inspector/inspector.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/inspector/node.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/inspector/utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/inspector/walker.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/layout.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/memory.js -lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/monitor.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/object.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/pause-scoped.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/perf.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance-recording.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance.js @@ -1494,22 +1516,25 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/process.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/promises.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/reflow.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/root.js -lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/script.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/source.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/storage.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/string.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/styles.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/stylesheets.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/tab.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/thread.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/timeline.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/TabSources.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/actor-registry-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/audionodes.json lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/automation-timeline.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/breakpoint-actor-map.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/css-grid-utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/event-loop.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/map-uri-to-addon-id.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/shapes-utils.js +lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/source-actor-store.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webaudio.js @@ -1549,7 +1574,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/acorn/acorn.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/acorn/acorn_loose.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/acorn/walk.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/apps/Devices.jsm -lib/firefox/browser/chrome/devtools/modules/devtools/shared/apps/app-actor-front.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/async-storage.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/async-utils.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/base-loader.js @@ -1788,6 +1812,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/worker.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/sprintfjs/sprintf.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/system.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/task.js +lib/firefox/browser/chrome/devtools/modules/devtools/shared/test-helpers/allocation-tracker.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/throttle.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/packets.js lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/stream-utils.js @@ -1846,6 +1871,7 @@ lib/firefox/browser/chrome/devtools/skin/images/command-screenshot.svg lib/firefox/browser/chrome/devtools/skin/images/commandline-icon.svg lib/firefox/browser/chrome/devtools/skin/images/controls.png lib/firefox/browser/chrome/devtools/skin/images/controls@2x.png +lib/firefox/browser/chrome/devtools/skin/images/copy.svg lib/firefox/browser/chrome/devtools/skin/images/cubic-bezier-swatch.png lib/firefox/browser/chrome/devtools/skin/images/cubic-bezier-swatch@2x.png lib/firefox/browser/chrome/devtools/skin/images/debugger-step-in.svg @@ -1853,11 +1879,13 @@ lib/firefox/browser/chrome/devtools/skin/images/debugger-step-out.svg lib/firefox/browser/chrome/devtools/skin/images/debugger-step-over.svg lib/firefox/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/arrow.svg +lib/firefox/browser/chrome/devtools/skin/images/debugger/back.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/blackBox.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/close.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/domain.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/file.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/folder.svg +lib/firefox/browser/chrome/devtools/skin/images/debugger/forward.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/pause-exceptions.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/pause.svg lib/firefox/browser/chrome/devtools/skin/images/debugger/prettyPrint.svg @@ -1930,6 +1958,7 @@ lib/firefox/browser/chrome/devtools/skin/images/item-arrow-dark-rtl.svg lib/firefox/browser/chrome/devtools/skin/images/item-arrow-ltr.svg lib/firefox/browser/chrome/devtools/skin/images/item-arrow-rtl.svg lib/firefox/browser/chrome/devtools/skin/images/item-toggle.svg +lib/firefox/browser/chrome/devtools/skin/images/jump-definition.svg lib/firefox/browser/chrome/devtools/skin/images/pane-collapse.svg lib/firefox/browser/chrome/devtools/skin/images/pane-expand.svg lib/firefox/browser/chrome/devtools/skin/images/pause.svg @@ -2037,20 +2066,18 @@ lib/firefox/browser/chrome/en-US/locale/browser/lightweightThemes.properties lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.dtd lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.properties lib/firefox/browser/chrome/en-US/locale/browser/netError.dtd -lib/firefox/browser/chrome/en-US/locale/browser/newTab.dtd -lib/firefox/browser/chrome/en-US/locale/browser/newTab.properties lib/firefox/browser/chrome/en-US/locale/browser/pageInfo.dtd lib/firefox/browser/chrome/en-US/locale/browser/pageInfo.properties lib/firefox/browser/chrome/en-US/locale/browser/places/bookmarkProperties.properties lib/firefox/browser/chrome/en-US/locale/browser/places/editBookmarkOverlay.dtd -lib/firefox/browser/chrome/en-US/locale/browser/places/moveBookmarks.dtd lib/firefox/browser/chrome/en-US/locale/browser/places/places.dtd lib/firefox/browser/chrome/en-US/locale/browser/places/places.properties lib/firefox/browser/chrome/en-US/locale/browser/preferences/advanced.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/applicationManager.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/applicationManager.properties -lib/firefox/browser/chrome/en-US/locale/browser/preferences/applications.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/blocklists.dtd +lib/firefox/browser/chrome/en-US/locale/browser/preferences/clearSiteData.dtd +lib/firefox/browser/chrome/en-US/locale/browser/preferences/clearSiteData.properties lib/firefox/browser/chrome/en-US/locale/browser/preferences/colors.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/connection.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/containers.dtd @@ -2069,7 +2096,6 @@ lib/firefox/browser/chrome/en-US/locale/browser/preferences/security.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/selectBookmark.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/siteDataSettings.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/sync.dtd -lib/firefox/browser/chrome/en-US/locale/browser/preferences/tabs.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/translation.dtd lib/firefox/browser/chrome/en-US/locale/browser/quitDialog.properties lib/firefox/browser/chrome/en-US/locale/browser/safeMode.dtd @@ -2097,6 +2123,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google.xml lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/amazon.ico lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/ebay.ico lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/wikipedia.ico +lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yahoo.ico lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-en.ico lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-ru.ico lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/list.json @@ -2105,6 +2132,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/wikipedia.xml lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/yandex-en.xml lib/firefox/browser/chrome/en-US/locale/browser/setDesktopBackground.dtd lib/firefox/browser/chrome/en-US/locale/browser/shellservice.properties +lib/firefox/browser/chrome/en-US/locale/browser/siteData.properties lib/firefox/browser/chrome/en-US/locale/browser/sitePermissions.properties lib/firefox/browser/chrome/en-US/locale/browser/syncBrand.dtd lib/firefox/browser/chrome/en-US/locale/browser/syncSetup.properties @@ -2112,6 +2140,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/tabbrowser.properties lib/firefox/browser/chrome/en-US/locale/browser/taskbar.properties lib/firefox/browser/chrome/en-US/locale/browser/translation.dtd lib/firefox/browser/chrome/en-US/locale/browser/translation.properties +lib/firefox/browser/chrome/en-US/locale/browser/uiDensity.properties lib/firefox/browser/chrome/en-US/locale/browser/webrtcIndicator.properties lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/VariablesView.dtd lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/aboutdebugging.dtd @@ -2458,8 +2487,6 @@ lib/firefox/browser/chrome/webide/content/details.js lib/firefox/browser/chrome/webide/content/details.xhtml lib/firefox/browser/chrome/webide/content/devicepreferences.js lib/firefox/browser/chrome/webide/content/devicepreferences.xhtml -lib/firefox/browser/chrome/webide/content/monitor.js -lib/firefox/browser/chrome/webide/content/monitor.xhtml lib/firefox/browser/chrome/webide/content/newapp.js lib/firefox/browser/chrome/webide/content/newapp.xul lib/firefox/browser/chrome/webide/content/prefs.js @@ -2482,7 +2509,6 @@ lib/firefox/browser/chrome/webide/skin/deck.css lib/firefox/browser/chrome/webide/skin/default-app-icon.png lib/firefox/browser/chrome/webide/skin/details.css lib/firefox/browser/chrome/webide/skin/icons.png -lib/firefox/browser/chrome/webide/skin/monitor.css lib/firefox/browser/chrome/webide/skin/newapp.css lib/firefox/browser/chrome/webide/skin/noise.png lib/firefox/browser/chrome/webide/skin/panel-listing.css @@ -2492,6 +2518,8 @@ lib/firefox/browser/chrome/webide/skin/throbber.svg lib/firefox/browser/chrome/webide/skin/webide.css lib/firefox/browser/chrome/webide/skin/wifi-auth.css lib/firefox/browser/components/ChromeProfileMigrator.js +lib/firefox/browser/components/EnterprisePolicies.js +lib/firefox/browser/components/EnterprisePoliciesContent.js lib/firefox/browser/components/ExperimentsService.js lib/firefox/browser/components/FeedConverter.js lib/firefox/browser/components/FeedWriter.js @@ -2505,6 +2533,7 @@ lib/firefox/browser/components/aboutdevtoolstoolbox-registration.js lib/firefox/browser/components/components.manifest lib/firefox/browser/components/devtools-startup.js lib/firefox/browser/components/interfaces.xpt +lib/firefox/browser/components/nsAboutCapabilities.js lib/firefox/browser/components/nsBrowserContentHandler.js lib/firefox/browser/components/nsBrowserGlue.js lib/firefox/browser/components/nsSessionStartup.js @@ -2534,7 +2563,10 @@ lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/common/P lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/common/Reducers.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/css/activity-stream.css lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/activity-stream.bundle.js +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-add-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-arrowhead-down-12.svg +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-arrowhead-down-16.svg +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-cancel-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-delete-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-dismiss-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-edit-16.svg @@ -2542,7 +2574,8 @@ lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/con lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-historyItem-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-import-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-info-16.svg -lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-info-option-12.svg +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-maximize-16.svg +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-minimize-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-modal-delete-32.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-newWindow-16.svg lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/content/assets/glyph-pin-12.svg @@ -2573,6 +2606,7 @@ lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/data/con lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/ActivityStream.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/ActivityStreamMessageChannel.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/ActivityStreamPrefs.jsm +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/ActivityStreamStorage.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/FaviconFeed.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/FilterAdult.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/HighlightsFeed.jsm @@ -2592,10 +2626,14 @@ lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/Tele lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/TippyTopProvider.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/TopSitesFeed.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/TopStoriesFeed.jsm +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/UTEventReporting.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/lib/UserDomainAffinityProvider.jsm lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/ach/activity-stream-prerendered.html lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/ach/activity-stream-strings.js lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/ach/activity-stream.html +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/an/activity-stream-prerendered.html +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/an/activity-stream-strings.js +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/an/activity-stream.html lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/ar/activity-stream-prerendered.html lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/ar/activity-stream-strings.js lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/ar/activity-stream.html @@ -2629,6 +2667,9 @@ lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerende lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/cak/activity-stream-prerendered.html lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/cak/activity-stream-strings.js lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/cak/activity-stream.html +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/crh/activity-stream-prerendered.html +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/crh/activity-stream-strings.js +lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/crh/activity-stream.html lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/cs/activity-stream-prerendered.html lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/cs/activity-stream-strings.js lib/firefox/browser/features/activity-stream@mozilla.org/chrome/content/prerendered/cs/activity-stream.html @@ -2894,8 +2935,6 @@ lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/poc lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketlogo@2x.png lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketlogosolo@1x.png lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketlogosolo@2x.png -lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketmenuitem16.png -lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketmenuitem16@2x.png lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_button@1x.png lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_button@2x.png lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/img/pocketsignup_devices@1x.png @@ -2927,8 +2966,6 @@ lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/si lib/firefox/browser/features/firefox@getpocket.com/chrome/content/panels/tmpl/signupstoryboard_shell.handlebars lib/firefox/browser/features/firefox@getpocket.com/chrome/content/pktApi.jsm lib/firefox/browser/features/firefox@getpocket.com/chrome/content/pocket-content-process.js -lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/menuPanel.png -lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/linux/menuPanel@2x.png lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/shared/library-pocket-animation.svg lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/shared/pocket-animation.svg lib/firefox/browser/features/firefox@getpocket.com/chrome/skin/shared/pocket.css @@ -2965,11 +3002,11 @@ lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/FormAutofillHeu lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/FormAutofillNameUtils.jsm lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/FormAutofillParent.jsm lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/FormAutofillPreferences.jsm +lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/FormAutofillStorage.jsm lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/FormAutofillSync.jsm lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/FormAutofillUtils.jsm lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/MasterPassword.jsm lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/ProfileAutoCompleteResult.jsm -lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/ProfileStorage.jsm lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/addressmetadata/addressReferences.js lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/addressmetadata/addressReferencesExt.js lib/firefox/browser/features/formautofill@mozilla.org/chrome/res/phonenumberutils/PhoneNumber.jsm @@ -3026,6 +3063,7 @@ lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/az/me lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/be/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/bg/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/bn_BD/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/br/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/bs/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ca/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/cak/messages.json @@ -3071,6 +3109,7 @@ lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/lij/m lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/lo/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/lt/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/mk/messages.json +lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ml/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/mr/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/ms/messages.json lib/firefox/browser/features/screenshots@mozilla.org/webextension/_locales/my/messages.json @@ -3119,6 +3158,7 @@ lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/onboardi lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/onboardingHtml.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/raven.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/shot.js +lib/firefox/browser/features/screenshots@mozilla.org/webextension/build/thumbnailGenerator.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/catcher.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/clipboard.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/domainFromUrl.js @@ -3131,9 +3171,8 @@ lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/copy.svg lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/done.svg lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/download.svg lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/help-16.svg -lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-16-v2.svg -lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-32-v2.svg lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-highlight-32-v2.svg +lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-v2.svg lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/icon-welcome-face-without-eyes.svg lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/menu-fullpage.svg lib/firefox/browser/features/screenshots@mozilla.org/webextension/icons/menu-myshot-white.svg @@ -3157,61 +3196,20 @@ lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/ui.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/uicontrol.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/selector/util.js lib/firefox/browser/features/screenshots@mozilla.org/webextension/sitehelper.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/bootstrap.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome.manifest -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/AboutPages.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/about-studies/about-studies.css -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/about-studies/about-studies.html -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/about-studies/about-studies.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/about-studies/common.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/about-studies/img/shield-logo.png -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/about-studies/shield-studies.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/shield-content-frame.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/content/shield-content-process.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/ActionSandboxManager.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/AddonStudies.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/Addons.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/CleanupManager.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/ClientEnvironment.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/EventEmitter.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/FilterExpressions.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/Heartbeat.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/LogManager.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/NormandyApi.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/NormandyDriver.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/PreferenceExperiments.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/PreferenceFilters.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/RecipeRunner.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/Sampling.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/SandboxManager.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/ShieldPreferences.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/ShieldRecipeClient.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/Storage.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/Uptake.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/lib/Utils.jsm -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/skin/osx/Heartbeat.css -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/skin/shared/Heartbeat.css -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/skin/shared/heartbeat-icon.svg -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/skin/shared/heartbeat-star-lit.svg -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/skin/shared/heartbeat-star-off.svg -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/vendor/LICENSE_THIRDPARTY -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/vendor/PropTypes.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/vendor/React.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/vendor/ReactDOM.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/vendor/classnames.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/chrome/vendor/mozjexl.js -lib/firefox/browser/features/shield-recipe-client@mozilla.org/install.rdf lib/firefox/browser/features/webcompat@mozilla.org/bootstrap.js lib/firefox/browser/features/webcompat@mozilla.org/chrome.manifest lib/firefox/browser/features/webcompat@mozilla.org/chrome/content/data/ua_overrides.jsm lib/firefox/browser/features/webcompat@mozilla.org/chrome/content/lib/ua_overrider.jsm lib/firefox/browser/features/webcompat@mozilla.org/install.rdf -lib/firefox/browser/localization/en-US/browser/preferences/main.ftl +lib/firefox/browser/localization/en-US/branding/brand.ftl +lib/firefox/browser/localization/en-US/browser/branding/sync-brand.ftl lib/firefox/browser/localization/en-US/browser/preferences/preferences.ftl lib/firefox/browser/modules/AboutHome.jsm lib/firefox/browser/modules/AboutNewTab.jsm +lib/firefox/browser/modules/AsyncTabSwitcher.jsm lib/firefox/browser/modules/AttributionCode.jsm lib/firefox/browser/modules/AutoMigrate.jsm +lib/firefox/browser/modules/BrowserErrorReporter.jsm lib/firefox/browser/modules/BrowserUITelemetry.jsm lib/firefox/browser/modules/BrowserUsageTelemetry.jsm lib/firefox/browser/modules/ChromeMigrationUtils.jsm @@ -3226,7 +3224,6 @@ lib/firefox/browser/modules/ContextMenu.jsm lib/firefox/browser/modules/CustomizableUI.jsm lib/firefox/browser/modules/CustomizableWidgets.jsm lib/firefox/browser/modules/CustomizeMode.jsm -lib/firefox/browser/modules/DirectoryLinksProvider.jsm lib/firefox/browser/modules/DownloadsCommon.jsm lib/firefox/browser/modules/DownloadsSubview.jsm lib/firefox/browser/modules/DownloadsTaskbar.jsm @@ -3240,10 +3237,7 @@ lib/firefox/browser/modules/FormValidationHandler.jsm lib/firefox/browser/modules/HeadlessShell.jsm lib/firefox/browser/modules/LaterRun.jsm lib/firefox/browser/modules/MigrationUtils.jsm -lib/firefox/browser/modules/NewTabPrefsProvider.jsm -lib/firefox/browser/modules/NewTabRemoteResources.jsm -lib/firefox/browser/modules/NewTabSearchProvider.jsm -lib/firefox/browser/modules/NewTabWebChannel.jsm +lib/firefox/browser/modules/OpenInTabsUtils.jsm lib/firefox/browser/modules/PageActions.jsm lib/firefox/browser/modules/PanelMultiView.jsm lib/firefox/browser/modules/ParseBreakpadSymbols-worker.js @@ -3265,6 +3259,7 @@ lib/firefox/browser/modules/SearchWidgetTracker.jsm lib/firefox/browser/modules/ShellService.jsm lib/firefox/browser/modules/SiteDataManager.jsm lib/firefox/browser/modules/SitePermissions.jsm +lib/firefox/browser/modules/ThemeVariableMap.jsm lib/firefox/browser/modules/TransientPrefs.jsm lib/firefox/browser/modules/UITour.jsm lib/firefox/browser/modules/UpdateTopLevelContentWindowIDHelper.jsm @@ -3272,6 +3267,12 @@ lib/firefox/browser/modules/ZoomUI.jsm lib/firefox/browser/modules/distribution.js lib/firefox/browser/modules/experiments/Experiments.jsm lib/firefox/browser/modules/offlineAppCache.jsm +lib/firefox/browser/modules/policies/BookmarksPolicies.jsm +lib/firefox/browser/modules/policies/Policies.jsm +lib/firefox/browser/modules/policies/PoliciesValidator.jsm +lib/firefox/browser/modules/policies/ProxyPolicies.jsm +lib/firefox/browser/modules/policies/WebsiteFilter.jsm +lib/firefox/browser/modules/policies/schema.jsm lib/firefox/browser/modules/sessionstore/ContentRestore.jsm lib/firefox/browser/modules/sessionstore/DocShellCapabilities.jsm lib/firefox/browser/modules/sessionstore/GlobalState.jsm @@ -3385,6 +3386,7 @@ lib/firefox/chrome/en-US/locale/en-US/global/notification.dtd lib/firefox/chrome/en-US/locale/en-US/global/nsWebBrowserPersist.properties lib/firefox/chrome/en-US/locale/en-US/global/plugins.properties lib/firefox/chrome/en-US/locale/en-US/global/preferences.dtd +lib/firefox/chrome/en-US/locale/en-US/global/printPageSetup.dtd lib/firefox/chrome/en-US/locale/en-US/global/printPreview.dtd lib/firefox/chrome/en-US/locale/en-US/global/printPreviewProgress.dtd lib/firefox/chrome/en-US/locale/en-US/global/printProgress.dtd @@ -3401,7 +3403,6 @@ lib/firefox/chrome/en-US/locale/en-US/global/svg/svg.properties lib/firefox/chrome/en-US/locale/en-US/global/textcontext.dtd lib/firefox/chrome/en-US/locale/en-US/global/tree.dtd lib/firefox/chrome/en-US/locale/en-US/global/videocontrols.dtd -lib/firefox/chrome/en-US/locale/en-US/global/viewSource.dtd lib/firefox/chrome/en-US/locale/en-US/global/viewSource.properties lib/firefox/chrome/en-US/locale/en-US/global/wizard.dtd lib/firefox/chrome/en-US/locale/en-US/global/wizard.properties @@ -3477,12 +3478,6 @@ lib/firefox/chrome/marionette/content/session.js lib/firefox/chrome/marionette/content/stream-utils.js lib/firefox/chrome/marionette/content/sync.js lib/firefox/chrome/marionette/content/transport.js -lib/firefox/chrome/pippki/content/pippki/CAOverlay.xul -lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul -lib/firefox/chrome/pippki/content/pippki/OrphanOverlay.xul -lib/firefox/chrome/pippki/content/pippki/OthersOverlay.xul -lib/firefox/chrome/pippki/content/pippki/WebSitesOverlay.xul -lib/firefox/chrome/pippki/content/pippki/certDump.xul lib/firefox/chrome/pippki/content/pippki/certManager.js lib/firefox/chrome/pippki/content/pippki/certManager.xul lib/firefox/chrome/pippki/content/pippki/certViewer.js @@ -3514,7 +3509,6 @@ lib/firefox/chrome/pippki/content/pippki/resetpassword.js lib/firefox/chrome/pippki/content/pippki/resetpassword.xul lib/firefox/chrome/pippki/content/pippki/setp12password.js lib/firefox/chrome/pippki/content/pippki/setp12password.xul -lib/firefox/chrome/pippki/content/pippki/viewCertDetails.xul lib/firefox/chrome/recording/content/recording.js lib/firefox/chrome/recording/content/recording.xul lib/firefox/chrome/toolkit/content/extensions/dummy.xul @@ -3535,6 +3529,7 @@ lib/firefox/chrome/toolkit/content/extensions/ext-clipboard.js lib/firefox/chrome/toolkit/content/extensions/ext-contentScripts.js lib/firefox/chrome/toolkit/content/extensions/ext-contextualIdentities.js lib/firefox/chrome/toolkit/content/extensions/ext-cookies.js +lib/firefox/chrome/toolkit/content/extensions/ext-dns.js lib/firefox/chrome/toolkit/content/extensions/ext-downloads.js lib/firefox/chrome/toolkit/content/extensions/ext-extension.js lib/firefox/chrome/toolkit/content/extensions/ext-i18n.js @@ -3561,6 +3556,7 @@ lib/firefox/chrome/toolkit/content/extensions/schemas/clipboard.json lib/firefox/chrome/toolkit/content/extensions/schemas/content_scripts.json lib/firefox/chrome/toolkit/content/extensions/schemas/contextual_identities.json lib/firefox/chrome/toolkit/content/extensions/schemas/cookies.json +lib/firefox/chrome/toolkit/content/extensions/schemas/dns.json lib/firefox/chrome/toolkit/content/extensions/schemas/downloads.json lib/firefox/chrome/toolkit/content/extensions/schemas/events.json lib/firefox/chrome/toolkit/content/extensions/schemas/experiments.json @@ -3599,6 +3595,7 @@ lib/firefox/chrome/toolkit/content/global/aboutCheckerboard.xhtml lib/firefox/chrome/toolkit/content/global/aboutMemory.css lib/firefox/chrome/toolkit/content/global/aboutMemory.js lib/firefox/chrome/toolkit/content/global/aboutMemory.xhtml +lib/firefox/chrome/toolkit/content/global/aboutMozilla.css lib/firefox/chrome/toolkit/content/global/aboutNetworking.js lib/firefox/chrome/toolkit/content/global/aboutNetworking.xhtml lib/firefox/chrome/toolkit/content/global/aboutPerformance.js @@ -3663,7 +3660,6 @@ lib/firefox/chrome/toolkit/content/global/bindings/richlistbox.xml lib/firefox/chrome/toolkit/content/global/bindings/scale.xml lib/firefox/chrome/toolkit/content/global/bindings/scrollbar.xml lib/firefox/chrome/toolkit/content/global/bindings/scrollbox.xml -lib/firefox/chrome/toolkit/content/global/bindings/spinbuttons.xml lib/firefox/chrome/toolkit/content/global/bindings/spinner.js lib/firefox/chrome/toolkit/content/global/bindings/splitter.xml lib/firefox/chrome/toolkit/content/global/bindings/stringbundle.xml @@ -3680,10 +3676,12 @@ lib/firefox/chrome/toolkit/content/global/bindings/videocontrols.xml lib/firefox/chrome/toolkit/content/global/bindings/wizard.xml lib/firefox/chrome/toolkit/content/global/browser-child.js lib/firefox/chrome/toolkit/content/global/browser-content.js +lib/firefox/chrome/toolkit/content/global/buildconfig.css lib/firefox/chrome/toolkit/content/global/buildconfig.html lib/firefox/chrome/toolkit/content/global/commonDialog.css lib/firefox/chrome/toolkit/content/global/commonDialog.js lib/firefox/chrome/toolkit/content/global/commonDialog.xul +lib/firefox/chrome/toolkit/content/global/components.css lib/firefox/chrome/toolkit/content/global/config.js lib/firefox/chrome/toolkit/content/global/config.xul lib/firefox/chrome/toolkit/content/global/content-HybridContentTelemetry.js @@ -3691,7 +3689,6 @@ lib/firefox/chrome/toolkit/content/global/contentAreaUtils.js lib/firefox/chrome/toolkit/content/global/datepicker.xhtml lib/firefox/chrome/toolkit/content/global/directionDetector.html lib/firefox/chrome/toolkit/content/global/editMenuOverlay.js -lib/firefox/chrome/toolkit/content/global/editMenuOverlay.xul lib/firefox/chrome/toolkit/content/global/filepicker.properties lib/firefox/chrome/toolkit/content/global/globalOverlay.js lib/firefox/chrome/toolkit/content/global/gmp-sources/openh264.json @@ -3732,12 +3729,7 @@ lib/firefox/chrome/toolkit/content/global/textbox.css lib/firefox/chrome/toolkit/content/global/timepicker.xhtml lib/firefox/chrome/toolkit/content/global/treeUtils.js lib/firefox/chrome/toolkit/content/global/unifiedcomplete-top-urls.json -lib/firefox/chrome/toolkit/content/global/viewPartialSource.js -lib/firefox/chrome/toolkit/content/global/viewPartialSource.xul lib/firefox/chrome/toolkit/content/global/viewSource-content.js -lib/firefox/chrome/toolkit/content/global/viewSource.css -lib/firefox/chrome/toolkit/content/global/viewSource.js -lib/firefox/chrome/toolkit/content/global/viewSource.xul lib/firefox/chrome/toolkit/content/global/viewSourceUtils.js lib/firefox/chrome/toolkit/content/global/viewZoomOverlay.js lib/firefox/chrome/toolkit/content/global/win.xul @@ -3823,6 +3815,48 @@ lib/firefox/chrome/toolkit/res/html.css lib/firefox/chrome/toolkit/res/loading-image.png lib/firefox/chrome/toolkit/res/mathml.css lib/firefox/chrome/toolkit/res/noframes.css +lib/firefox/chrome/toolkit/res/normandy/Normandy.jsm +lib/firefox/chrome/toolkit/res/normandy/content/AboutPages.jsm +lib/firefox/chrome/toolkit/res/normandy/content/about-studies/about-studies.css +lib/firefox/chrome/toolkit/res/normandy/content/about-studies/about-studies.html +lib/firefox/chrome/toolkit/res/normandy/content/about-studies/about-studies.js +lib/firefox/chrome/toolkit/res/normandy/content/about-studies/common.js +lib/firefox/chrome/toolkit/res/normandy/content/about-studies/img/shield-logo.png +lib/firefox/chrome/toolkit/res/normandy/content/about-studies/shield-studies.js +lib/firefox/chrome/toolkit/res/normandy/content/shield-content-frame.js +lib/firefox/chrome/toolkit/res/normandy/content/shield-content-process.js +lib/firefox/chrome/toolkit/res/normandy/lib/ActionSandboxManager.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/AddonStudies.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/Addons.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/CleanupManager.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/ClientEnvironment.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/EventEmitter.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/FilterExpressions.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/Heartbeat.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/LogManager.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/NormandyApi.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/NormandyDriver.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/PreferenceExperiments.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/PreferenceFilters.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/RecipeRunner.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/Sampling.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/SandboxManager.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/ShieldPreferences.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/Storage.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/TelemetryEvents.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/Uptake.jsm +lib/firefox/chrome/toolkit/res/normandy/lib/Utils.jsm +lib/firefox/chrome/toolkit/res/normandy/skin/osx/Heartbeat.css +lib/firefox/chrome/toolkit/res/normandy/skin/shared/Heartbeat.css +lib/firefox/chrome/toolkit/res/normandy/skin/shared/heartbeat-icon.svg +lib/firefox/chrome/toolkit/res/normandy/skin/shared/heartbeat-star-lit.svg +lib/firefox/chrome/toolkit/res/normandy/skin/shared/heartbeat-star-off.svg +lib/firefox/chrome/toolkit/res/normandy/vendor/LICENSE_THIRDPARTY +lib/firefox/chrome/toolkit/res/normandy/vendor/PropTypes.js +lib/firefox/chrome/toolkit/res/normandy/vendor/React.js +lib/firefox/chrome/toolkit/res/normandy/vendor/ReactDOM.js +lib/firefox/chrome/toolkit/res/normandy/vendor/classnames.js +lib/firefox/chrome/toolkit/res/normandy/vendor/mozjexl.js lib/firefox/chrome/toolkit/res/noscript.css lib/firefox/chrome/toolkit/res/number-control.css lib/firefox/chrome/toolkit/res/quirk.css @@ -3837,10 +3871,8 @@ lib/firefox/chrome/toolkit/skin/classic/global/aboutRights.css lib/firefox/chrome/toolkit/skin/classic/global/aboutSupport.css lib/firefox/chrome/toolkit/skin/classic/global/alerts/alert.css lib/firefox/chrome/toolkit/skin/classic/global/appPicker.css -lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn-dis.gif lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn-hov.gif lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn.gif -lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up-dis.gif lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up-hov.gif lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up.gif lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal.svg @@ -3924,9 +3956,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/media/stalled.png lib/firefox/chrome/toolkit/skin/classic/global/media/throbber.png lib/firefox/chrome/toolkit/skin/classic/global/media/videocontrols.css lib/firefox/chrome/toolkit/skin/classic/global/menu.css -lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-active.svg -lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-black.svg -lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-hover.svg lib/firefox/chrome/toolkit/skin/classic/global/menulist.css lib/firefox/chrome/toolkit/skin/classic/global/narrate.css lib/firefox/chrome/toolkit/skin/classic/global/narrate/arrow.svg @@ -3958,7 +3987,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/richlistbox.css lib/firefox/chrome/toolkit/skin/classic/global/scale.css lib/firefox/chrome/toolkit/skin/classic/global/scrollbars.css lib/firefox/chrome/toolkit/skin/classic/global/scrollbox.css -lib/firefox/chrome/toolkit/skin/classic/global/spinbuttons.css lib/firefox/chrome/toolkit/skin/classic/global/splitter.css lib/firefox/chrome/toolkit/skin/classic/global/splitter/grip-bottom.gif lib/firefox/chrome/toolkit/skin/classic/global/splitter/grip-left.gif @@ -3983,7 +4011,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutNetworking.css lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutProfiles.css lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutServiceWorkers.css lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png -lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloadIcon.png lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/unknownContentType.css lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/about.css lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-error.svg @@ -4024,7 +4051,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/profile/profileSelection.css lib/firefox/chrome/toolkit/skin/classic/mozapps/profile/profileicon.png lib/firefox/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png lib/firefox/chrome/toolkit/skin/classic/mozapps/update/updates.css -lib/firefox/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css lib/firefox/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css lib/firefox/components/BrowserElementParent.js lib/firefox/components/ColorAnalyzer.js @@ -4068,17 +4094,14 @@ lib/firefox/components/captivedetect.js lib/firefox/components/components.manifest lib/firefox/components/contentAreaDropListener.js lib/firefox/components/crypto-SDR.js -lib/firefox/components/defaultShims.js lib/firefox/components/extension-process-script.js lib/firefox/components/htmlMenuBuilder.js lib/firefox/components/interfaces.xpt lib/firefox/components/marionette.js lib/firefox/components/mozIntl.js lib/firefox/components/mozProtocolHandler.js -lib/firefox/components/multiprocessShims.js lib/firefox/components/nsAsyncShutdown.js lib/firefox/components/nsBlocklistService.js -lib/firefox/components/nsBlocklistServiceContent.js lib/firefox/components/nsContentDispatchChooser.js lib/firefox/components/nsCrashMonitor.js lib/firefox/components/nsDNSServiceDiscovery.js @@ -4197,7 +4220,6 @@ lib/firefox/modules/Color.jsm lib/firefox/modules/ColorAnalyzer_worker.js lib/firefox/modules/ColorConversion.js lib/firefox/modules/CommonDialog.jsm -lib/firefox/modules/CompatWarning.jsm lib/firefox/modules/Console.jsm lib/firefox/modules/ContentPrefServiceChild.jsm lib/firefox/modules/ContentPrefServiceParent.jsm @@ -4282,7 +4304,6 @@ lib/firefox/modules/LanguagePrompt.jsm lib/firefox/modules/LegacyExtensionsUtils.jsm lib/firefox/modules/LightweightThemeConsumer.jsm lib/firefox/modules/LightweightThemeManager.jsm -lib/firefox/modules/LoadContextInfo.jsm lib/firefox/modules/Localization.jsm lib/firefox/modules/Log.jsm lib/firefox/modules/LoginHelper.jsm @@ -4331,7 +4352,6 @@ lib/firefox/modules/PlacesUtils.jsm lib/firefox/modules/PluralForm.jsm lib/firefox/modules/PopupNotifications.jsm lib/firefox/modules/Preferences.jsm -lib/firefox/modules/Prefetcher.jsm lib/firefox/modules/PrivateBrowsingUtils.jsm lib/firefox/modules/ProfileAge.jsm lib/firefox/modules/Promise-backend.js @@ -4347,8 +4367,6 @@ lib/firefox/modules/PushService.jsm lib/firefox/modules/PushServiceHttp2.jsm lib/firefox/modules/PushServiceWebSocket.jsm lib/firefox/modules/ReaderMode.jsm -lib/firefox/modules/RemoteAddonsChild.jsm -lib/firefox/modules/RemoteAddonsParent.jsm lib/firefox/modules/RemoteController.js lib/firefox/modules/RemoteFinder.jsm lib/firefox/modules/RemotePageManager.jsm @@ -4371,6 +4389,7 @@ lib/firefox/modules/ShortcutUtils.jsm lib/firefox/modules/SimpleServiceDiscovery.jsm lib/firefox/modules/Sqlite.jsm lib/firefox/modules/Subprocess.jsm +lib/firefox/modules/SyncedBookmarksMirror.jsm lib/firefox/modules/Task.jsm lib/firefox/modules/TelemetryArchive.jsm lib/firefox/modules/TelemetryController.jsm @@ -4385,7 +4404,6 @@ lib/firefox/modules/TelemetryStopwatch.jsm lib/firefox/modules/TelemetryStorage.jsm lib/firefox/modules/TelemetryTimestamps.jsm lib/firefox/modules/TelemetryUtils.jsm -lib/firefox/modules/ThirdPartyCookieProbe.jsm lib/firefox/modules/Timer.jsm lib/firefox/modules/Troubleshoot.jsm lib/firefox/modules/UITelemetry.jsm @@ -4538,7 +4556,7 @@ lib/firefox/res/fonts/mathfontSTIXGeneral.properties lib/firefox/res/fonts/mathfontUnicode.properties lib/firefox/res/grabber.gif lib/firefox/res/language.properties -lib/firefox/res/multilocale.json +lib/firefox/res/multilocale.txt lib/firefox/res/svg.css lib/firefox/res/table-add-column-after-active.gif lib/firefox/res/table-add-column-after-hover.gif diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 7db17a32a52..ebc7cde11d7 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,90 +1,39 @@ -$NetBSD: distinfo,v 1.314 2018/05/08 10:38:57 maya Exp $ +$NetBSD: distinfo,v 1.315 2018/05/10 20:01:53 ryoon Exp $ -SHA1 (firefox-59.0.3.tar.bz2) = 82f69f2eeef9316abb096518fff8e95386e0f1e1 -RMD160 (firefox-59.0.3.tar.bz2) = 011ada8789adeebf4cc83e488e44fe6c4863469f -SHA512 (firefox-59.0.3.tar.bz2) = 174b83949106bbc0d60f0c2ad622acfb2ac3a7c21911ca6e16f5c2575825cbfe26c7324d2774aca6735870e52f4d6cd140ab0d9a94514c2681f4e301e342019b -Size (firefox-59.0.3.tar.bz2) = 304965690 bytes -SHA1 (patch-aa) = aca3d55271df926da793d7a0543f522d42e67f9d -SHA1 (patch-browser_app_profile_firefox.js) = 1f9b9959aeffb41465c437a0fd747f265cdea6b4 -SHA1 (patch-build_gyp.mozbuild) = 77e0954a796337b24572674cd1d14d4a5cab8e6e -SHA1 (patch-build_moz.configure_init.configure) = 5ec8da6b5aad7682a88b010a99e19f5d4403e6db -SHA1 (patch-build_moz.configure_keyfiles.configure) = 5aeb43299430a7289f114945095ff7bdb723f726 -SHA1 (patch-build_moz.configure_old.configure) = 2f452e717f0c9dc8224019b58e531e5e95cc7697 -SHA1 (patch-config_external_moz.build) = 41eef447166279f124a64444ce2a1f6a1f7cf975 -SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 -SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b -SHA1 (patch-config_system-headers.mozbuild) = adf2fd70379165672b3b27215ffc18de178152cd -SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 -SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c -SHA1 (patch-dom_media_AudioStream.cpp) = 5ccc3b6a09e869a5a50998118157da7d6cc517ef -SHA1 (patch-dom_media_AudioStream.h) = dec0f7e4ec7541b3e5b5574b6ebfae9a8957e165 +SHA1 (firefox-60.0.source.tar.xz) = 070b99b19851efe13c1d947764a9de1a83f6362c +RMD160 (firefox-60.0.source.tar.xz) = f6c1ad34ab78e27964bb100b9190d4888200eb1b +SHA512 (firefox-60.0.source.tar.xz) = 63c156238a6b6b6188f093d2658d3152cd0ff6a1e275dd819a6d111dd4f964cac548632f45cd0f561b17537cde2740afe681e28d5a4d69477d9f39030567a0fc +Size (firefox-60.0.source.tar.xz) = 266717500 bytes +SHA1 (patch-aa) = fdabcc9b055f6439fdbda9b38ab7cec08ff3e231 +SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707 +SHA1 (patch-dom_fetch_FetchConsumer.cpp) = a164b68b968633e2f2e29c1c3917a77ac55a886b SHA1 (patch-dom_media_CubebUtils.cpp) = 3632cd0dd4b95f53f01050b8898b33fe198916b6 -SHA1 (patch-dom_media_flac_FlacDecoder.cpp) = 43ed8e3ff32b6d965f423cac5b04e60db683546f -SHA1 (patch-dom_media_moz.build) = fdc226fc85d626a0435feec5a7f50eeefb93939b -SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = f2965930c50961b42576a983e93a08d67da50a2a -SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6 -SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426 -SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = 09eb2fa66109d38a3aedc940fcaaee5f91e216ae -SHA1 (patch-gfx_moz.build) = 0d669ac6dc1af17ea8ed7e84e4915947c2a6b1ca -SHA1 (patch-gfx_skia_generate__mozbuild.py) = b23cfbe91efc92ec0de8110a602d2ab0d7b1b745 -SHA1 (patch-gfx_skia_moz.build) = cbaea1be331a5ad6ffe0f5cbd2d0c9d2cd5631e4 -SHA1 (patch-gfx_thebes_moz.build) = 97cacde522a07581adae8671cbc71d927c3d1e1e -SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf -SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 8ae94d3c10fc8472e0d6287a841f1366d4342770 +SHA1 (patch-gfx_webrender_src_query.rs) = 6434b0fc1d6441ddb555a2a3b199564b488ec336 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f -SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655 -SHA1 (patch-intl_unicharutil_util_moz.build) = 505967842bf0d38ab0edd44749ed79bc37ba5184 -SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 16e37fe54ba1d8d233f6b04dbd06e248305d7f6e SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 99b9f3f9dd88f1c8008d2fb6058450695394f5cf -SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 3ed4f482a8ccbd5db216c2623bf6dd93b0bbc1c9 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 937a843a7acf3085056e309ea5ab047bd9b95088 SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 778a569887d8ad082abc2fa2fe89a0a943e84d64 SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 3052338871447cedaeafe8369afe82233183c884 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 -SHA1 (patch-ipc_glue_MessageChannel.cpp) = e955b70ac005cda2061d478d62ccf11da9f280c5 -SHA1 (patch-js_src_build_moz.build) = ab917deecf9adb6cffb8c5c42f169ea1293bf8a9 -SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782 -SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde -SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 97a221c76593be712f670aa409f2f1ad5dc20628 +SHA1 (patch-media_libcubeb_AUTHORS) = 0565b8f0d27108667c1dfcc37ed397644c11d0f4 SHA1 (patch-media_libcubeb_gtest_moz.build) = 921a001726cda9e9782df5e59ae02b19d76ef47e SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b -SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = af2b8f577d9e57811f51742c8ea8ef974c211667 -SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 88cdfb9b9aa8c2607ca79bfa7fce4353e65638f7 -SHA1 (patch-media_libcubeb_src_moz.build) = 5fca6701cc890120a04483f52c25242ee7b1c051 -SHA1 (patch-media_libcubeb_update.sh) = e8babe57ea7f0f32658b391e9c4f6310e57fc38c -SHA1 (patch-media_libsoundtouch_src_soundtouch__perms.h) = 2d08a3b4176c155c57b458cb78043318b68d8fe2 -SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 3ef05c05799d56b3c160634327d90dd33764c3df -SHA1 (patch-media_libtheora_moz.build) = 27924593cfe223643d83270cad5f80eec9c42a6b -SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf -SHA1 (patch-media_libvorbis_moz.build) = 4d18f38471c32c478e58172dd20c3a3e703718e3 +SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 3ee36f58bb525767c7d2b9e814ba4ccaa4868717 +SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = ccd7ad6f09977dab358632107cfd9078b4649f99 +SHA1 (patch-media_libcubeb_src_moz.build) = f243068c8908dcb16434221edef8c65db3bb0c83 +SHA1 (patch-media_libcubeb_update.sh) = 3a322de06bbe9aafba9da349954ef022bd094992 SHA1 (patch-media_libyuv_libyuv_source_mjpeg__decoder.cc) = 8a264c439fa4749cd7c5acf96e1ae3f9bae0a886 -SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7 SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__device_linux_audio__device__alsa__linux.cc) = 91e8ce496c1f4dbbd0a463d83cb033afd1de3f49 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 0141dd1372c13ea1fce6e2f5ffb65e0cb0f3a13e SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = a69bc7b7096b410582e725f9dbec57fee90d6686 -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 772a858fb74d404a6b86e5634bc3eec586a1b06a -SHA1 (patch-modules_libpref_init_all.js) = 4c265ca5d45943fcfb7e75b0f0e5b918643bcd6c SHA1 (patch-modules_pdfium_update.sh) = b0bf091325c9322c54880de067871354cd689038 -SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249 -SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc -SHA1 (patch-netwerk_dns_moz.build) = 919951177a182a5d242789ad313502d33a9602b5 SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632 -SHA1 (patch-third__party_python_futures_concurrent_futures_process.py) = 5e5c77334d29814f7548450163b625f451b74942 -SHA1 (patch-third__party_rust_simd_.cargo-checksum.json) = 117ba033158711ab6b539d1631e7c9d3034f6f2d -SHA1 (patch-third__party_rust_simd_src_x86_avx2.rs) = 0169ad4ef8ff5107fc826336d025c6260bb84704 -SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = e79aad01ad230e265717bd2eccbedcdd092d12d6 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce -SHA1 (patch-toolkit_library_moz.build) = 34e757ad08ebaee1cbc69993ec0f6774d41a14a2 -SHA1 (patch-toolkit_moz.configure) = 78f5c46931ae3426e65eddbea7e0552bcc6a19e0 +SHA1 (patch-toolkit_library_moz.build) = ecb6125e996d5496335c58ecd3433ad3214f29f0 +SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 6f557fb732f0b9dabf059ffac0400d3db4e79e47 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b -SHA1 (patch-widget_gtk_nsClipboard.cpp) = 0a56631f05c2ead36b7a80a3cfe0ee7621047df1 -SHA1 (patch-widget_gtk_nsClipboard.h) = fab72d12326b9cef1a2041fa3d3eb2794e85d349 -SHA1 (patch-widget_gtk_nsClipboardX11.cpp) = 684ae1bc2fdca6edc4928b635d100435f8ecbf60 -SHA1 (patch-widget_gtk_nsClipboardX11.h) = 2902af4227b65e0594dcb2ef6fbd16d6d0850f58 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4 SHA1 (patch-xpcom_build_BinaryPath.h) = 88a815a142356bf76024e5a4326b677122c844c1 -SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54 -SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 528f7254966d883c18e33744e28780a93055d560 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239 diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index 43dd6ea2e4c..102102b24ca 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.56 2018/03/17 00:59:03 ryoon Exp $ +$NetBSD: patch-aa,v 1.57 2018/05/10 20:01:53 ryoon Exp $ * Disable libjpeg-turbo check * Add system libraries option * Add OSS audio support ---- old-configure.in.orig 2018-03-10 02:54:17.000000000 +0000 +--- old-configure.in.orig 2018-05-03 16:58:31.000000000 +0000 +++ old-configure.in -@@ -1849,11 +1849,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then +@@ -1804,11 +1804,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -19,128 +19,7 @@ $NetBSD: patch-aa,v 1.56 2018/03/17 00:59:03 ryoon Exp $ MOZ_SYSTEM_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -2455,7 +2451,7 @@ dnl Use integers over floats for audio o - dnl (regarless of the CPU architecture, because audio - dnl backends for those platforms don't support floats. We also - dnl use integers on ARM with other OS, because it's more efficient. --if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then -+if test -n "$MOZ_INTEGER_SAMPLES"; then - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) -@@ -2493,6 +2489,111 @@ if test -n "$MOZ_APPLEMEDIA"; then - fi - fi # COMPILE_ENVIRONMENT - -+dnl ======================================================== -+dnl Check for libogg -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-ogg, -+[ --with-system-ogg Use system libogg (located with pkgconfig)], -+MOZ_SYSTEM_OGG=1, -+MOZ_SYSTEM_OGG=) -+ -+if test -n "$MOZ_SYSTEM_OGG"; then -+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.0) -+ -+ _SAVE_LIBS=$LIBS -+ LIBS="$LIBS $MOZ_OGG_LIBS" -+ AC_CHECK_FUNC(ogg_set_mem_functions, [], -+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) -+ LIBS=$_SAVE_LIBS -+fi -+ -+AC_SUBST(MOZ_SYSTEM_OGG) -+ -+dnl ======================================================== -+dnl Check for libvorbis -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-vorbis, -+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], -+MOZ_SYSTEM_VORBIS=1, -+MOZ_SYSTEM_VORBIS=) -+ -+if test -n "$MOZ_SYSTEM_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_VORBIS) -+ -+dnl ======================================================== -+dnl Check for integer-only libvorbis aka tremor -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-tremor, -+[ --with-system-tremor Use system libtremor (located with pkgconfig)], -+MOZ_SYSTEM_TREMOR=1, -+MOZ_SYSTEM_TREMOR=) -+ -+if test -n "$MOZ_SYSTEM_TREMOR"; then -+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_TREMOR) -+ -+dnl ======================================================== -+dnl Check for libtheora -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-theora, -+[ --with-system-theora Use system libtheora (located with pkgconfig)], -+MOZ_SYSTEM_THEORA=1, -+MOZ_SYSTEM_THEORA=) -+ -+if test -n "$MOZ_SYSTEM_THEORA"; then -+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_THEORA) -+ -+dnl ======================================================== -+dnl Check for libSoundTouch -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-soundtouch, -+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], -+MOZ_SYSTEM_SOUNDTOUCH=1, -+MOZ_SYSTEM_SOUNDTOUCH=) -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) -+ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ _SAVE_CXXFLAGS=$CXXFLAGS -+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" -+ AC_CACHE_CHECK(for soundtouch sample type, -+ ac_cv_soundtouch_sample_type, -+ [AC_TRY_COMPILE([#include <SoundTouch.h> -+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES -+ #error soundtouch expects float samples -+ #endif], -+ [], -+ [ac_cv_soundtouch_sample_type=short], -+ [ac_cv_soundtouch_sample_type=float])]) -+ CXXFLAGS=$_SAVE_CXXFLAGS -+ AC_LANG_RESTORE -+ -+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ -+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then -+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) -+ fi -+fi -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) -+fi -+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) -+ - dnl system libvpx Support - dnl ======================================================== - MOZ_ARG_WITH_BOOL(system-libvpx, -@@ -2653,6 +2754,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER) +@@ -2596,6 +2592,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER) AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -208,41 +87,3 @@ $NetBSD: patch-aa,v 1.56 2018/03/17 00:59:03 ryoon Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -3540,6 +3702,9 @@ then - if test "x$ac_cv_sqlite_dbstat_vtab" = "xno"; then - AC_MSG_ERROR([System SQLite library is not compiled with SQLITE_ENABLE_DBSTAT_VTAB.]) - fi -+ -+ dnl with libv4l2 we can support more cameras -+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) - else - dnl ============================== - dnl === SQLite fdatasync check === -@@ -4080,6 +4245,27 @@ dnl ==================================== - AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) - - dnl ======================================================== -+dnl Check for graphite2 -+dnl ======================================================== -+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then -+ dnl graphite2.pc has bogus version, check manually -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" -+ AC_TRY_COMPILE([ #include <graphite2/Font.h> -+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ -+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ -+ * 100 + GR2_VERSION_BUGFIX >= \ -+ (major) * 10000 + (minor) * 100 + (bugfix) ) -+ ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,10) -+ #error "Insufficient graphite2 version." -+ #endif -+ ], [], -+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) -+ CFLAGS=$_SAVE_CFLAGS -+fi -+ -+dnl ======================================================== - dnl Check for pixman and cairo - dnl ======================================================== - diff --git a/www/firefox/patches/patch-browser_app_profile_firefox.js b/www/firefox/patches/patch-browser_app_profile_firefox.js deleted file mode 100644 index 2e497bb0f7a..00000000000 --- a/www/firefox/patches/patch-browser_app_profile_firefox.js +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-browser_app_profile_firefox.js,v 1.5 2018/04/14 07:05:14 ryoon Exp $ - -* Automatically set your UI language from LANG/LC_MESSAGE - ---- browser/app/profile/firefox.js.orig 2018-03-22 20:46:41.000000000 +0000 -+++ browser/app/profile/firefox.js -@@ -1757,3 +1757,6 @@ pref("browser.onboarding.updatetour", "p - - // Preference that allows individual users to disable Screenshots. - pref("extensions.screenshots.disabled", false); -+ -+// Select UI locale from LANG/LC_MESSAGE environmental variables -+pref("intl.locale.requested", ""); diff --git a/www/firefox/patches/patch-build_gyp.mozbuild b/www/firefox/patches/patch-build_gyp.mozbuild deleted file mode 100644 index 7add5d574fc..00000000000 --- a/www/firefox/patches/patch-build_gyp.mozbuild +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-build_gyp.mozbuild,v 1.8 2018/03/17 00:59:03 ryoon Exp $ - ---- build/gyp.mozbuild.orig 2018-03-10 02:54:17.000000000 +0000 -+++ build/gyp.mozbuild -@@ -22,6 +22,7 @@ gyp_vars.update({ - 'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0, - 'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0, - 'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0, -+ 'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0, - # basic stuff for everything - 'include_internal_video_render': 0, - 'clang': 1 if CONFIG['CC_TYPE'] == 'clang' else 0, diff --git a/www/firefox/patches/patch-build_moz.configure_init.configure b/www/firefox/patches/patch-build_moz.configure_init.configure deleted file mode 100644 index 8a298e4cc90..00000000000 --- a/www/firefox/patches/patch-build_moz.configure_init.configure +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-build_moz.configure_init.configure,v 1.3 2017/08/10 14:46:15 ryoon Exp $ - ---- build/moz.configure/init.configure.orig 2017-07-31 16:20:49.000000000 +0000 -+++ build/moz.configure/init.configure -@@ -157,6 +157,7 @@ option(env='PYTHON', nargs=1, help='Pyth - @imports(_from='mozbuild.configure.util', _import='LineIO') - @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') - @imports(_from='mozbuild.virtualenv', _import='verify_python_version') -+@imports(_from='__builtin__', _import='KeyError') - @imports('distutils.sysconfig') - def virtualenv_python(env_python, build_env, mozconfig, help): - if help: -@@ -176,6 +177,12 @@ def virtualenv_python(env_python, build_ - python = mozconfig['vars']['added']['PYTHON'] - elif 'PYTHON' in mozconfig['vars']['modified']: - python = mozconfig['vars']['modified']['PYTHON'][1] -+ for i in ('env', 'vars'): -+ for j in ('added', 'modified'): -+ try: -+ del mozconfig[i][j]['PYTHON'] -+ except KeyError: -+ pass - - with LineIO(lambda l: log.error(l)) as out: - verify_python_version(out) -@@ -211,7 +218,10 @@ def virtualenv_python(env_python, build_ - if python != normsep(sys.executable): - log.info('Reexecuting in the virtualenv') - if env_python: -- del os.environ['PYTHON'] -+ try: -+ del os.environ['PYTHON'] -+ except KeyError: -+ pass - # One would prefer to use os.execl, but that's completely borked on - # Windows. - sys.exit(subprocess.call([python] + sys.argv)) diff --git a/www/firefox/patches/patch-build_moz.configure_keyfiles.configure b/www/firefox/patches/patch-build_moz.configure_keyfiles.configure deleted file mode 100644 index d0ce5278583..00000000000 --- a/www/firefox/patches/patch-build_moz.configure_keyfiles.configure +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-build_moz.configure_keyfiles.configure,v 1.5 2018/03/17 00:59:03 ryoon Exp $ - ---- build/moz.configure/keyfiles.configure.orig 2018-03-10 02:54:17.000000000 +0000 -+++ build/moz.configure/keyfiles.configure -@@ -18,6 +18,7 @@ def keyfile(desc, default=None, help=Non - @checking('for the %s key' % desc, lambda x: x and x is not no_key) - @imports(_from='__builtin__', _import='open') - @imports(_from='__builtin__', _import='IOError') -+ @imports(_from='os', _import='environ') - def keyfile(value): - if value: - try: -@@ -28,7 +29,7 @@ def keyfile(desc, default=None, help=Non - raise FatalCheckError("'%s' is empty." % value[0]) - except IOError as e: - raise FatalCheckError("'%s': %s." % (value[0], e.strerror)) -- return no_key -+ return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key - - return keyfile - diff --git a/www/firefox/patches/patch-build_moz.configure_old.configure b/www/firefox/patches/patch-build_moz.configure_old.configure index 8a59b19a6fd..f4284684048 100644 --- a/www/firefox/patches/patch-build_moz.configure_old.configure +++ b/www/firefox/patches/patch-build_moz.configure_old.configure @@ -1,8 +1,8 @@ -$NetBSD: patch-build_moz.configure_old.configure,v 1.6 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-build_moz.configure_old.configure,v 1.7 2018/05/10 20:01:53 ryoon Exp $ ---- build/moz.configure/old.configure.orig 2017-04-11 04:15:17.000000000 +0000 +--- build/moz.configure/old.configure.orig 2018-05-03 16:58:26.000000000 +0000 +++ build/moz.configure/old.configure -@@ -275,6 +275,7 @@ def old_configure_options(*options): +@@ -262,6 +262,7 @@ def old_configure_options(*options): '--with-nspr-prefix', '--with-nss-exec-prefix', '--with-nss-prefix', @@ -10,16 +10,3 @@ $NetBSD: patch-build_moz.configure_old.configure,v 1.6 2017/04/27 01:49:47 ryoon '--with-pthreads', '--with-qemu-exe', '--with-sixgill', -@@ -286,7 +287,12 @@ def old_configure_options(*options): - '--with-system-libvpx', - '--with-system-nspr', - '--with-system-nss', -+ '--with-system-ogg', - '--with-system-png', -+ '--with-system-soundtouch', -+ '--with-system-theora', -+ '--with-system-tremor', -+ '--with-system-vorbis', - '--with-system-zlib', - '--with-thumb', - '--with-thumb-interwork', diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build deleted file mode 100644 index 324bda7d36b..00000000000 --- a/www/firefox/patches/patch-config_external_moz.build +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-config_external_moz.build,v 1.17 2018/03/17 00:59:03 ryoon Exp $ - -* Support system libraries - ---- config/external/moz.build.orig 2018-03-10 02:54:17.000000000 +0000 -+++ config/external/moz.build -@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2'] - - external_dirs += ['modules/xz-embedded'] - --if CONFIG['MOZ_VORBIS']: -+if not CONFIG['MOZ_SYSTEM_OGG']: -+ external_dirs += ['media/libogg'] -+ -+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: - external_dirs += ['media/libvorbis'] - --if CONFIG['MOZ_TREMOR']: -+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: - external_dirs += ['media/libtremor'] - -+if not CONFIG['MOZ_SYSTEM_THEORA']: -+ external_dirs += ['media/libtheora'] -+ -+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ external_dirs += ['media/libsoundtouch'] -+ - if CONFIG['MOZ_WEBM_ENCODER']: - external_dirs += ['media/libmkv'] - -@@ -51,11 +60,8 @@ external_dirs += [ - 'media/kiss_fft', - 'media/libcubeb', - 'media/libnestegg', -- 'media/libogg', - 'media/libopus', -- 'media/libtheora', - 'media/libspeex_resampler', -- 'media/libsoundtouch', - 'media/mp4parse-rust', - 'media/psshparser' - ] diff --git a/www/firefox/patches/patch-config_stl__wrappers_ios b/www/firefox/patches/patch-config_stl__wrappers_ios deleted file mode 100644 index afc51f11053..00000000000 --- a/www/firefox/patches/patch-config_stl__wrappers_ios +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-config_stl__wrappers_ios,v 1.5 2014/02/20 13:19:03 ryoon Exp $ - ---- config/stl_wrappers/ios.orig 2013-05-13 18:23:07.000000000 +0000 -+++ config/stl_wrappers/ios -@@ -0,0 +1,3 @@ -+#pragma GCC visibility push(default) -+#include_next <ios> -+#pragma GCC visibility pop diff --git a/www/firefox/patches/patch-config_stl__wrappers_ostream b/www/firefox/patches/patch-config_stl__wrappers_ostream deleted file mode 100644 index 9b888f24114..00000000000 --- a/www/firefox/patches/patch-config_stl__wrappers_ostream +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-config_stl__wrappers_ostream,v 1.5 2014/02/20 13:19:03 ryoon Exp $ - ---- config/stl_wrappers/ostream.orig 2013-05-13 18:22:40.000000000 +0000 -+++ config/stl_wrappers/ostream -@@ -0,0 +1,3 @@ -+#pragma GCC visibility push(default) -+#include_next <ostream> -+#pragma GCC visibility pop diff --git a/www/firefox/patches/patch-config_system-headers.mozbuild b/www/firefox/patches/patch-config_system-headers.mozbuild deleted file mode 100644 index 5862346d502..00000000000 --- a/www/firefox/patches/patch-config_system-headers.mozbuild +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-config_system-headers.mozbuild,v 1.1 2018/01/24 16:52:08 ryoon Exp $ - ---- config/system-headers.mozbuild.orig 2018-01-11 20:16:54.000000000 +0000 -+++ config/system-headers.mozbuild -@@ -428,6 +428,7 @@ system_headers = [ - 'libgnomeui/gnome-icon-theme.h', - 'libgnomeui/gnome-ui-init.h', - 'libutil.h', -+ 'libv4l2.h', - 'limits.h', - 'link.h', - 'linux/ioprio.h', -@@ -1311,6 +1312,41 @@ if not CONFIG['MOZ_TREE_PIXMAN']: - 'pixman.h', - ] - -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ system_headers += [ -+ 'graphite2/Font.h', -+ 'graphite2/Segment.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ system_headers += [ -+ 'harfbuzz/hb-glib.h', -+ 'harfbuzz/hb-ot.h', -+ 'harfbuzz/hb.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_OGG']: -+ system_headers += [ -+ 'ogg/ogg.h', -+ 'ogg/os_types.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ system_headers += [ -+ 'theora/theoradec.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ system_headers += [ -+ 'vorbis/codec.h', -+ 'vorbis/vorbisenc.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ system_headers += [ -+ 'tremor/ivorbiscodec.h', -+ ] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - system_headers += [ - 'vpx_mem/vpx_mem.h', diff --git a/www/firefox/patches/patch-config_system__wrappers_unwind.h b/www/firefox/patches/patch-config_system__wrappers_unwind.h deleted file mode 100644 index 20d1fd643c8..00000000000 --- a/www/firefox/patches/patch-config_system__wrappers_unwind.h +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-config_system__wrappers_unwind.h,v 1.5 2014/02/20 13:19:03 ryoon Exp $ - ---- config/system_wrappers/unwind.h.orig 2013-05-13 19:56:18.000000000 +0000 -+++ config/system_wrappers/unwind.h -@@ -0,0 +1,4 @@ -+#pragma GCC system_header -+#pragma GCC visibility push(default) -+#include_next <unwind.h> -+#pragma GCC visibility pop diff --git a/www/firefox/patches/patch-dom_base_moz.build b/www/firefox/patches/patch-dom_base_moz.build deleted file mode 100644 index 3b002224b70..00000000000 --- a/www/firefox/patches/patch-dom_base_moz.build +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dom_base_moz.build,v 1.3 2016/12/03 09:58:26 ryoon Exp $ - ---- dom/base/moz.build.orig 2016-10-31 20:15:32.000000000 +0000 -+++ dom/base/moz.build -@@ -457,6 +457,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser' - if CONFIG['MOZ_X11']: - CXXFLAGS += CONFIG['TK_CFLAGS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - GENERATED_FILES += [ - 'PropertyUseCounterMap.inc', - 'UseCounterList.h', diff --git a/www/firefox/patches/patch-dom_media_AudioStream.cpp b/www/firefox/patches/patch-dom_media_AudioStream.cpp deleted file mode 100644 index ca2316305e5..00000000000 --- a/www/firefox/patches/patch-dom_media_AudioStream.cpp +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-dom_media_AudioStream.cpp,v 1.2 2017/09/30 05:34:12 ryoon Exp $ - ---- dom/media/AudioStream.cpp.orig 2017-09-14 20:15:56.000000000 +0000 -+++ dom/media/AudioStream.cpp -@@ -115,7 +115,9 @@ AudioStream::AudioStream(DataSource& aSo - : mMonitor("AudioStream") - , mChannels(0) - , mOutChannels(0) -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - , mTimeStretcher(nullptr) -+#endif - , mDumpFile(nullptr) - , mState(INITIALIZED) - , mDataSource(aSource) -@@ -135,9 +137,11 @@ AudioStream::~AudioStream() - if (mDumpFile) { - fclose(mDumpFile); - } -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - if (mTimeStretcher) { - soundtouch::destroySoundTouchObj(mTimeStretcher); - } -+#endif - #if defined(XP_WIN) - if (XRE_IsContentProcess()) { - audio::AudioNotificationReceiver::Unregister(this); -@@ -161,7 +165,11 @@ nsresult AudioStream::EnsureTimeStretche - { - mMonitor.AssertCurrentThreadOwns(); - if (!mTimeStretcher) { -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ mTimeStretcher = new soundtouch::SoundTouch(); -+#else - mTimeStretcher = soundtouch::createSoundTouchObj(); -+#endif - mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); - mTimeStretcher->setChannels(mOutChannels); - mTimeStretcher->setPitch(1.0); diff --git a/www/firefox/patches/patch-dom_media_AudioStream.h b/www/firefox/patches/patch-dom_media_AudioStream.h deleted file mode 100644 index e8e70109dbe..00000000000 --- a/www/firefox/patches/patch-dom_media_AudioStream.h +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-dom_media_AudioStream.h,v 1.4 2017/09/30 05:34:12 ryoon Exp $ - ---- dom/media/AudioStream.h.orig 2017-09-14 20:15:56.000000000 +0000 -+++ dom/media/AudioStream.h -@@ -16,7 +16,11 @@ - #include "mozilla/TimeStamp.h" - #include "mozilla/UniquePtr.h" - #include "CubebUtils.h" -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "soundtouch/SoundTouch.h" -+#else - #include "soundtouch/SoundTouchFactory.h" -+#endif - - #if defined(XP_WIN) - #include "mozilla/audio/AudioNotificationReceiver.h" -@@ -299,7 +303,11 @@ private: - uint32_t mChannels; - uint32_t mOutChannels; - AudioClock mAudioClock; -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher; -+#else - soundtouch::SoundTouch* mTimeStretcher; -+#endif - - // Output file for dumping audio - FILE* mDumpFile; diff --git a/www/firefox/patches/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox/patches/patch-dom_media_flac_FlacDecoder.cpp deleted file mode 100644 index f2d22cb279e..00000000000 --- a/www/firefox/patches/patch-dom_media_flac_FlacDecoder.cpp +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-dom_media_flac_FlacDecoder.cpp,v 1.1 2018/01/24 16:52:08 ryoon Exp $ - ---- dom/media/flac/FlacDecoder.cpp.orig 2017-11-02 16:16:35.000000000 +0000 -+++ dom/media/flac/FlacDecoder.cpp -@@ -7,6 +7,7 @@ - #include "FlacDecoder.h" - #include "MediaContainerType.h" - #include "MediaPrefs.h" -+#include "PDMFactory.h" - - namespace mozilla { - -@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() - { - #ifdef MOZ_FFVPX - return MediaPrefs::FlacEnabled(); -+#elif defined(MOZ_FFMPEG) -+ RefPtr<PDMFactory> platform = new PDMFactory(); -+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), -+ /* DecoderDoctorDiagnostics* */ nullptr); - #else - // Until bug 1295886 is fixed. - return false; diff --git a/www/firefox/patches/patch-dom_media_moz.build b/www/firefox/patches/patch-dom_media_moz.build deleted file mode 100644 index f08c3d066b9..00000000000 --- a/www/firefox/patches/patch-dom_media_moz.build +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-dom_media_moz.build,v 1.9 2018/03/17 00:59:03 ryoon Exp $ - -* Support system libraries - ---- dom/media/moz.build.orig 2018-03-10 02:54:17.000000000 +0000 -+++ dom/media/moz.build -@@ -326,6 +326,21 @@ if CONFIG['MOZ_WEBRTC']: - - DEFINES['MOZILLA_INTERNAL_API'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] -+ - if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']: - DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True - diff --git a/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp b/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp deleted file mode 100644 index 8b24f954cfb..00000000000 --- a/www/firefox/patches/patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp,v 1.2 2017/06/14 11:28:44 ryoon Exp $ - ---- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp.orig 2017-06-05 20:45:19.000000000 +0000 -+++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -@@ -11,9 +11,13 @@ - #include "prmem.h" - #include "prlink.h" - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "nsXPCOMPrivate.h" // for XUL_DLL -+#else - // We use a known symbol located in lgpllibs to determine its location. - // soundtouch happens to be always included in lgpllibs - #include "soundtouch/SoundTouch.h" -+#endif - - namespace mozilla { - -@@ -50,6 +54,12 @@ FFVPXRuntimeLinker::Init() - - sLinkStatus = LinkStatus_FAILED; - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ // We retrieve the path of the XUL library as this is where mozavcodec and -+ // mozavutil libs are located. -+ char* path = -+ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); -+#else - // We retrieve the path of the lgpllibs library as this is where mozavcodec - // and mozavutil libs are located. - char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs"); -@@ -60,6 +70,7 @@ FFVPXRuntimeLinker::Init() - PR_GetLibraryFilePathname(lgpllibsname, - (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); - PR_FreeLibraryName(lgpllibsname); -+#endif - if (!path) { - return false; - } diff --git a/www/firefox/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S b/www/firefox/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S deleted file mode 100644 index a97534844a9..00000000000 --- a/www/firefox/patches/patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S,v 1.2 2016/06/16 12:08:21 ryoon Exp $ - -* Support NetBSD/earm - ---- gfx/cairo/libpixman/src/pixman-arm-neon-asm.S.orig 2015-09-29 21:45:08.000000000 +0000 -+++ gfx/cairo/libpixman/src/pixman-arm-neon-asm.S -@@ -34,6 +34,12 @@ - * - pixman_composite_over_n_8_0565_asm_neon - */ - -+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__) -+#define UNWIND -+#else -+#define UNWIND @ -+#endif -+ - /* Prevent the stack from becoming executable for no reason... */ - #if defined(__linux__) && defined(__ELF__) - .section .note.GNU-stack,"",%progbits -@@ -3141,7 +3147,8 @@ pixman_asm_function fname - TMP4 .req r9 - STRIDE .req r2 - -- .fnstart -+ .cfi_startproc -+ UNWIND .fnstart - mov ip, sp - .save {r4, r5, r6, r7, r8, r9} - push {r4, r5, r6, r7, r8, r9} -@@ -3244,7 +3251,8 @@ pixman_asm_function fname - .endif - pop {r4, r5, r6, r7, r8, r9} - bx lr -- .fnend -+ UNWIND .fnend -+ .cfi_endproc - - .unreq OUT - .unreq TOP diff --git a/www/firefox/patches/patch-gfx_gl_GLContextProviderGLX.cpp b/www/firefox/patches/patch-gfx_gl_GLContextProviderGLX.cpp deleted file mode 100644 index d022a7204b2..00000000000 --- a/www/firefox/patches/patch-gfx_gl_GLContextProviderGLX.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-gfx_gl_GLContextProviderGLX.cpp,v 1.1 2015/07/05 11:55:06 martin Exp $ - -Fix libGL.so filename on NetBSD, -see https://bugzilla.mozilla.org/show_bug.cgi?id=1180498 - ---- gfx/gl/GLContextProviderGLX.cpp.orig 2015-07-01 00:58:10.000000000 +0200 -+++ gfx/gl/GLContextProviderGLX.cpp 2015-07-04 21:13:15.000000000 +0200 -@@ -82,7 +82,7 @@ - // see e.g. bug 608526: it is intrinsically interesting to know whether we have dynamically linked to libGL.so.1 - // because at least the NVIDIA implementation requires an executable stack, which causes mprotect calls, - // which trigger glibc bug http://sourceware.org/bugzilla/show_bug.cgi?id=12225 --#ifdef __OpenBSD__ -+#if defined(__OpenBSD__) || defined(__NetBSD__) - libGLfilename = "libGL.so"; - #else - libGLfilename = "libGL.so.1"; diff --git a/www/firefox/patches/patch-gfx_graphite2_moz-gr-update.sh b/www/firefox/patches/patch-gfx_graphite2_moz-gr-update.sh deleted file mode 100644 index bf7955c65fb..00000000000 --- a/www/firefox/patches/patch-gfx_graphite2_moz-gr-update.sh +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-gfx_graphite2_moz-gr-update.sh,v 1.3 2016/12/03 09:58:26 ryoon Exp $ - ---- gfx/graphite2/moz-gr-update.sh.orig 2016-07-25 20:22:05.000000000 +0000 -+++ gfx/graphite2/moz-gr-update.sh -@@ -1,6 +1,7 @@ - #!/bin/bash - - # Script used to update the Graphite2 library in the mozilla source tree -+# and bump version for --with-system-graphite2 - - # This script lives in gfx/graphite2, along with the library source, - # but must be run from the top level of the mozilla-central tree. -@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> - #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \; - #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \; - -+# chase version for --with-system-graphite2 -+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" old-configure.in -+ - # summarize what's been touched - echo Updated to $RELEASE. - echo Here is what changed in the gfx/graphite2 directory: - echo - --hg stat gfx/graphite2 -+hg stat old-configure.in gfx/graphite2 - - echo - echo If gfx/graphite2/src/files.mk has changed, please make corresponding diff --git a/www/firefox/patches/patch-gfx_moz.build b/www/firefox/patches/patch-gfx_moz.build deleted file mode 100644 index f89054cf8ae..00000000000 --- a/www/firefox/patches/patch-gfx_moz.build +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-gfx_moz.build,v 1.3 2016/12/03 09:58:26 ryoon Exp $ - ---- gfx/moz.build.orig 2016-10-31 20:15:31.000000000 +0000 -+++ gfx/moz.build -@@ -7,6 +7,12 @@ - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ DIRS += ['graphite2/src' ] -+ -+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ DIRS += ['harfbuzz/src'] -+ - DIRS += [ - '2d', - 'ycbcr', -@@ -15,8 +21,6 @@ DIRS += [ - 'qcms', - 'gl', - 'layers', -- 'graphite2/src', -- 'harfbuzz/src', - 'ots/src', - 'thebes', - 'ipc', diff --git a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py deleted file mode 100644 index 237fa32aea9..00000000000 --- a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.8 2018/03/17 00:59:03 ryoon Exp $ - ---- gfx/skia/generate_mozbuild.py.orig 2018-03-10 02:54:17.000000000 +0000 -+++ gfx/skia/generate_mozbuild.py -@@ -137,6 +137,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git a/www/firefox/patches/patch-gfx_skia_moz.build b/www/firefox/patches/patch-gfx_skia_moz.build deleted file mode 100644 index 19b4be7481e..00000000000 --- a/www/firefox/patches/patch-gfx_skia_moz.build +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-gfx_skia_moz.build,v 1.15 2018/03/17 00:59:03 ryoon Exp $ - ---- gfx/skia/moz.build.orig 2018-03-10 02:54:17.000000000 +0000 -+++ gfx/skia/moz.build -@@ -782,6 +782,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git a/www/firefox/patches/patch-gfx_thebes_moz.build b/www/firefox/patches/patch-gfx_thebes_moz.build deleted file mode 100644 index 4083ffb2a72..00000000000 --- a/www/firefox/patches/patch-gfx_thebes_moz.build +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-gfx_thebes_moz.build,v 1.9 2018/03/17 00:59:03 ryoon Exp $ - ---- gfx/thebes/moz.build.orig 2018-03-10 02:54:17.000000000 +0000 -+++ gfx/thebes/moz.build -@@ -273,7 +273,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3 - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - --DEFINES['GRAPHITE2_STATIC'] = True -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] -+else: -+ DEFINES['GRAPHITE2_STATIC'] = True -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] - - if CONFIG['CC_TYPE'] == 'clang': - # Suppress warnings from Skia header files. diff --git a/www/firefox/patches/patch-gfx_ycbcr_moz.build b/www/firefox/patches/patch-gfx_ycbcr_moz.build deleted file mode 100644 index 016052280e7..00000000000 --- a/www/firefox/patches/patch-gfx_ycbcr_moz.build +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-gfx_ycbcr_moz.build,v 1.2 2016/06/16 12:08:21 ryoon Exp $ - -* yuv_row_arm.S requires pre-processor - ---- gfx/ycbcr/moz.build.orig 2014-11-26 12:30:03.000000000 +0000 -+++ gfx/ycbcr/moz.build -@@ -63,7 +63,7 @@ else: - - if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: - SOURCES += [ -- 'yuv_row_arm.s', -+ 'yuv_row_arm.S', - ] - SOURCES += [ - 'yuv_convert_arm.cpp', diff --git a/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.S b/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.S deleted file mode 100644 index ee2b5384df1..00000000000 --- a/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.S +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-gfx_ycbcr_yuv__row__arm.S,v 1.4 2017/06/14 11:28:44 ryoon Exp $ - -* Copy from yuv_row_arm.s to process it with pre-processor - ---- gfx/ycbcr/yuv_row_arm.S.orig 2017-06-12 20:07:14.598490411 +0000 -+++ gfx/ycbcr/yuv_row_arm.S -@@ -2,6 +2,12 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__) -+#define UNWIND -+#else -+#define UNWIND @ -+#endif -+ - .arch armv7-a - .fpu neon - /* Allow to build on targets not supporting neon, and force the object file -@@ -74,7 +80,8 @@ YCbCr42xToRGB565_DITHER30_CONSTS_NEON: - .global ScaleYCbCr42xToRGB565_BilinearY_Row_NEON - .type ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, %function - .balign 64 -- .fnstart -+ .cfi_startproc -+ UNWIND .fnstart - ScaleYCbCr42xToRGB565_BilinearY_Row_NEON: - STMFD r13!,{r4-r9,r14} @ 8 words. - ADR r14,YCbCr42xToRGB565_DITHER03_CONSTS_NEON -@@ -296,9 +303,10 @@ s42xbily_neon_tail: - s42xbily_neon_done: - VPOP {Q4-Q7} @ 16 words. - LDMFD r13!,{r4-r9,PC} @ 8 words. -- .fnend -+ UNWIND .fnend -+ .cfi_endproc - .size ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, .-ScaleYCbCr42xToRGB565_BilinearY_Row_NEON - --#if defined(__ELF__)&&defined(__linux__) -+#if defined(__ELF__)&&(defined(__linux__) || defined(__NetBSD__)) - .section .note.GNU-stack,"",%progbits - #endif diff --git a/www/firefox/patches/patch-intl_hyphenation_glue_hnjalloc.h b/www/firefox/patches/patch-intl_hyphenation_glue_hnjalloc.h deleted file mode 100644 index a1921df8e62..00000000000 --- a/www/firefox/patches/patch-intl_hyphenation_glue_hnjalloc.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-intl_hyphenation_glue_hnjalloc.h,v 1.2 2016/06/16 12:08:21 ryoon Exp $ - -* Support Solaris - ---- intl/hyphenation/glue/hnjalloc.h.orig 2015-12-04 00:36:54.000000000 +0000 -+++ intl/hyphenation/glue/hnjalloc.h -@@ -24,6 +24,9 @@ - */ - - #include <stdio.h> /* ensure stdio.h is loaded before our macros */ -+#ifdef __sun -+#include <wchar.h> -+#endif - - #undef FILE - #define FILE hnjFile diff --git a/www/firefox/patches/patch-intl_unicharutil_util_moz.build b/www/firefox/patches/patch-intl_unicharutil_util_moz.build deleted file mode 100644 index 57629430e19..00000000000 --- a/www/firefox/patches/patch-intl_unicharutil_util_moz.build +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.7 2018/01/24 16:52:08 ryoon Exp $ - ---- intl/unicharutil/util/moz.build.orig 2018-01-11 20:17:05.000000000 +0000 -+++ intl/unicharutil/util/moz.build -@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ - 'nsUnicodeProperties.cpp', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - FINAL_LIBRARY = 'xul' diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_atomicops.h b/www/firefox/patches/patch-ipc_chromium_src_base_atomicops.h deleted file mode 100644 index 1c0edca930e..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_src_base_atomicops.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_atomicops.h,v 1.1 2014/11/26 14:56:28 ryoon Exp $ - -* Avoid invalid cast errors under NetBSD/evbearmv7hf-el. - ---- ipc/chromium/src/base/atomicops.h.orig 2014-11-13 22:49:59.000000000 +0000 -+++ ipc/chromium/src/base/atomicops.h -@@ -45,7 +45,7 @@ typedef int64_t Atomic64; - - // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or - // Atomic64 routines below, depending on your architecture. --#ifdef OS_OPENBSD -+#if defined(OS_OPENBSD) || (defined(OS_NETBSD) && defined(ARCH_CPU_ARM_FAMILY)) - #ifdef ARCH_CPU_64_BITS - typedef Atomic64 AtomicWord; - #else diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h b/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h deleted file mode 100644 index f1556878e28..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.6 2017/08/10 14:46:15 ryoon Exp $ - -* Support Solaris - ---- ipc/chromium/src/base/platform_thread.h.orig 2017-07-31 16:20:47.000000000 +0000 -+++ ipc/chromium/src/base/platform_thread.h -@@ -27,6 +27,9 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(__GLIBC__) - #include <unistd.h> - typedef pid_t PlatformThreadId; -+#elif defined(OS_SOLARIS) -+#include <sys/lwp.h> -+typedef lwpid_t PlatformThreadId; - #elif defined(OS_BSD) - #include <sys/types.h> - typedef lwpid_t PlatformThreadId; diff --git a/www/firefox/patches/patch-ipc_glue_MessageChannel.cpp b/www/firefox/patches/patch-ipc_glue_MessageChannel.cpp deleted file mode 100644 index a5a40a3f01b..00000000000 --- a/www/firefox/patches/patch-ipc_glue_MessageChannel.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ipc_glue_MessageChannel.cpp,v 1.1 2018/01/24 16:52:08 ryoon Exp $ - ---- ipc/glue/MessageChannel.cpp.orig 2018-01-11 20:17:05.000000000 +0000 -+++ ipc/glue/MessageChannel.cpp -@@ -686,6 +686,11 @@ MessageChannel::WillDestroyCurrentMessag - mWorkerLoop = nullptr; - } - -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000 -+// Work around UB in __tree crashing mPendingPromises.clear() -+// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003 -+[[clang::optnone]] -+#endif - void - MessageChannel::Clear() - { diff --git a/www/firefox/patches/patch-js_src_build_moz.build b/www/firefox/patches/patch-js_src_build_moz.build deleted file mode 100644 index 3aa3ab0c611..00000000000 --- a/www/firefox/patches/patch-js_src_build_moz.build +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-js_src_build_moz.build,v 1.2 2018/01/24 16:52:08 ryoon Exp $ - ---- js/src/build/moz.build.orig 2018-01-11 20:17:05.000000000 +0000 -+++ js/src/build/moz.build -@@ -72,10 +72,6 @@ if CONFIG['OS_ARCH'] == 'SunOS': - - OS_LIBS += CONFIG['REALTIME_LIBS'] - --NO_EXPAND_LIBS = True -- --DIST_INSTALL = True -- - # Ensure symbol versions of shared library on Linux do not conflict - # with those in libxul. - if CONFIG['OS_TARGET'] == 'Linux': diff --git a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp deleted file mode 100644 index 2e84bd19133..00000000000 --- a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.8 2017/03/07 20:45:43 ryoon Exp $ - -* Support NetBSD/earm - ---- js/src/jit/arm/Architecture-arm.cpp.orig 2015-08-24 21:53:12.000000000 +0000 -+++ js/src/jit/arm/Architecture-arm.cpp -@@ -16,7 +16,7 @@ - #include "jit/arm/Assembler-arm.h" - #include "jit/RegisterSets.h" - --#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM) -+#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM) || defined(__NetBSD__) - // The Android NDK and B2G do not include the hwcap.h kernel header, and it is not - // defined when building the simulator, so inline the header defines we need. - # define HWCAP_VFP (1 << 6) diff --git a/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp b/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp deleted file mode 100644 index 67ca9a8bd33..00000000000 --- a/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-js_xpconnect_src_XPCConvert.cpp,v 1.1 2015/03/31 10:59:43 martin Exp $ - -Suggested workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1147837 -Avoids a crash on big endian 64 bit architectures. - ---- js/xpconnect/src/XPCConvert.cpp.orig 2015-03-21 04:42:37.000000000 +0100 -+++ js/xpconnect/src/XPCConvert.cpp 2015-03-30 13:49:16.000000000 +0200 -@@ -134,7 +134,7 @@ - d.setNumber(*static_cast<const float*>(s)); - return true; - case nsXPTType::T_DOUBLE: -- d.setNumber(*static_cast<const double*>(s)); -+ d.setNumber(CanonicalizeNaN(*static_cast<const double*>(s))); - return true; - case nsXPTType::T_BOOL : - d.setBoolean(*static_cast<const bool*>(s)); diff --git a/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h b/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h deleted file mode 100644 index 6e869f3c327..00000000000 --- a/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-js_xpconnect_src_xpcprivate.h,v 1.4 2017/08/10 14:46:15 ryoon Exp $ - -From commit log 1.1: - Instantiate WeakMapPtr explicitly to get the right visibility with - clang. - ---- js/xpconnect/src/xpcprivate.h.orig 2017-07-31 16:20:47.000000000 +0000 -+++ js/xpconnect/src/xpcprivate.h -@@ -884,6 +884,8 @@ typedef nsTArray<InterpositionWhitelistP - /***************************************************************************/ - // XPCWrappedNativeScope is one-to-one with a JS global object. - -+extern template class JS_PUBLIC_API(JS::WeakMapPtr)<JSObject*, JSObject*>; -+ - class nsIAddonInterposition; - class nsXPCComponentsBase; - class XPCWrappedNativeScope final diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c index 9c01b069448..a4f0e6999e8 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c @@ -1,15 +1,16 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.27 2018/05/10 20:01:53 ryoon Exp $ * Support alsa audio under NetBSD * Avoid https://github.com/kinetiknz/cubeb/issues/226 ---- media/libcubeb/src/cubeb_alsa.c.orig 2017-11-02 16:16:36.000000000 +0000 +--- media/libcubeb/src/cubeb_alsa.c.orig 2018-05-03 16:58:30.000000000 +0000 +++ media/libcubeb/src/cubeb_alsa.c -@@ -8,10 +8,12 @@ +@@ -7,11 +7,13 @@ + #undef NDEBUG #define _DEFAULT_SOURCE #define _BSD_SOURCE - #define _XOPEN_SOURCE 500 +#define _NETBSD_SOURCE + #define _XOPEN_SOURCE 500 #include <pthread.h> #include <sys/time.h> #include <assert.h> @@ -80,7 +81,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon }; enum stream_state { -@@ -243,8 +293,8 @@ set_timeout(struct timeval * timeout, un +@@ -245,8 +295,8 @@ set_timeout(struct timeval * timeout, un static void stream_buffer_decrement(cubeb_stream * stm, long count) { @@ -91,7 +92,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon stm->bufframes -= count; } -@@ -276,9 +326,9 @@ alsa_process_stream(cubeb_stream * stm) +@@ -278,9 +328,9 @@ alsa_process_stream(cubeb_stream * stm) /* Call _poll_descriptors_revents() even if we don't use it to let underlying plugins clear null events. Otherwise poll() may wake up again and again, producing unnecessary CPU usage. */ @@ -103,7 +104,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon /* Got null event? Bail and wait for another wakeup. */ if (avail == 0) { -@@ -301,7 +351,7 @@ alsa_process_stream(cubeb_stream * stm) +@@ -303,7 +353,7 @@ alsa_process_stream(cubeb_stream * stm) // TODO: should it be marked as DRAINING? } @@ -112,7 +113,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (got < 0) { avail = got; // the error handler below will recover us -@@ -345,7 +395,7 @@ alsa_process_stream(cubeb_stream * stm) +@@ -347,7 +397,7 @@ alsa_process_stream(cubeb_stream * stm) (!stm->other_stream || stm->other_stream->bufframes > 0)) { long got = avail - stm->bufframes; void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; @@ -121,7 +122,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon /* Correct read size to the other stream available frames */ if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { -@@ -372,8 +422,8 @@ alsa_process_stream(cubeb_stream * stm) +@@ -374,8 +424,8 @@ alsa_process_stream(cubeb_stream * stm) long drain_frames = avail - stm->bufframes; double drain_time = (double) drain_frames / stm->params.rate; @@ -132,7 +133,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon stm->bufframes = avail; /* Mark as draining, unless we're waiting for capture */ -@@ -400,7 +450,7 @@ alsa_process_stream(cubeb_stream * stm) +@@ -402,7 +452,7 @@ alsa_process_stream(cubeb_stream * stm) } } @@ -141,7 +142,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (wrote < 0) { avail = wrote; // the error handler below will recover us } else { -@@ -413,13 +463,13 @@ alsa_process_stream(cubeb_stream * stm) +@@ -415,13 +465,13 @@ alsa_process_stream(cubeb_stream * stm) /* Got some error? Let's try to recover the stream. */ if (avail < 0) { @@ -158,7 +159,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon } } -@@ -535,26 +585,26 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -537,26 +587,26 @@ get_slave_pcm_node(snd_config_t * lconf, slave_def = NULL; @@ -190,7 +191,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (r < 0) { break; } -@@ -563,7 +613,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -565,7 +615,7 @@ get_slave_pcm_node(snd_config_t * lconf, if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -199,7 +200,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (r < 0) { break; } -@@ -572,7 +622,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -574,7 +624,7 @@ get_slave_pcm_node(snd_config_t * lconf, } while (0); if (slave_def) { @@ -208,7 +209,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon } return NULL; -@@ -595,22 +645,22 @@ init_local_config_with_workaround(char c +@@ -597,22 +647,22 @@ init_local_config_with_workaround(char c lconf = NULL; @@ -235,7 +236,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (r < 0) { break; } -@@ -619,7 +669,7 @@ init_local_config_with_workaround(char c +@@ -621,7 +671,7 @@ init_local_config_with_workaround(char c if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -244,7 +245,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (r < 0) { break; } -@@ -630,12 +680,12 @@ init_local_config_with_workaround(char c +@@ -632,12 +682,12 @@ init_local_config_with_workaround(char c } /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ @@ -259,7 +260,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (r < 0) { break; } -@@ -646,18 +696,18 @@ init_local_config_with_workaround(char c +@@ -648,18 +698,18 @@ init_local_config_with_workaround(char c /* Don't clobber an explicit existing handle_underrun value, set it only if it doesn't already exist. */ @@ -281,7 +282,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (r < 0) { break; } -@@ -665,7 +715,7 @@ init_local_config_with_workaround(char c +@@ -667,7 +717,7 @@ init_local_config_with_workaround(char c return lconf; } while (0); @@ -290,7 +291,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon return NULL; } -@@ -677,9 +727,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c +@@ -679,9 +729,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c pthread_mutex_lock(&cubeb_alsa_mutex); if (local_config) { @@ -302,7 +303,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -692,7 +742,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) +@@ -694,7 +744,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) int r; pthread_mutex_lock(&cubeb_alsa_mutex); @@ -311,7 +312,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); return r; -@@ -755,12 +805,65 @@ alsa_init(cubeb ** context, char const * +@@ -757,12 +807,65 @@ alsa_init(cubeb ** context, char const * pthread_attr_t attr; snd_pcm_t * dummy; @@ -378,7 +379,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon cubeb_alsa_error_handler_set = 1; } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -768,6 +871,8 @@ alsa_init(cubeb ** context, char const * +@@ -770,6 +873,8 @@ alsa_init(cubeb ** context, char const * ctx = calloc(1, sizeof(*ctx)); assert(ctx); @@ -387,7 +388,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon ctx->ops = &alsa_ops; r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -817,7 +922,7 @@ alsa_init(cubeb ** context, char const * +@@ -819,7 +924,7 @@ alsa_init(cubeb ** context, char const * config fails with EINVAL, the PA PCM is too old for this workaround. */ if (r == -EINVAL) { pthread_mutex_lock(&cubeb_alsa_mutex); @@ -396,7 +397,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); ctx->local_config = NULL; } else if (r >= 0) { -@@ -857,9 +962,13 @@ alsa_destroy(cubeb * ctx) +@@ -859,9 +964,13 @@ alsa_destroy(cubeb * ctx) pthread_mutex_destroy(&ctx->mutex); free(ctx->fds); @@ -411,7 +412,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); } -@@ -942,7 +1051,7 @@ alsa_stream_init_single(cubeb * ctx, cub +@@ -948,7 +1057,7 @@ alsa_stream_init_single(cubeb * ctx, cub return CUBEB_ERROR; } @@ -420,7 +421,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon assert(r == 0); latency_us = latency_frames * 1e6 / stm->params.rate; -@@ -955,7 +1064,7 @@ alsa_stream_init_single(cubeb * ctx, cub +@@ -961,7 +1070,7 @@ alsa_stream_init_single(cubeb * ctx, cub latency_us = latency_us < min_latency ? min_latency: latency_us; } @@ -429,7 +430,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon stm->params.channels, stm->params.rate, 1, latency_us); if (r < 0) { -@@ -963,20 +1072,20 @@ alsa_stream_init_single(cubeb * ctx, cub +@@ -969,20 +1078,20 @@ alsa_stream_init_single(cubeb * ctx, cub return CUBEB_ERROR_INVALID_FORMAT; } @@ -454,7 +455,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon assert((nfds_t) r == stm->nfds); if (alsa_register_stream(ctx, stm) != 0) { -@@ -1048,7 +1157,7 @@ alsa_stream_destroy(cubeb_stream * stm) +@@ -1054,7 +1163,7 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); if (stm->pcm) { if (stm->state == DRAINING) { @@ -463,7 +464,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon } alsa_locked_pcm_close(stm->pcm); stm->pcm = NULL; -@@ -1094,12 +1203,12 @@ alsa_get_max_channel_count(cubeb * ctx, +@@ -1100,12 +1209,12 @@ alsa_get_max_channel_count(cubeb * ctx, assert(stm); @@ -478,7 +479,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon if (r < 0) { return CUBEB_ERROR; } -@@ -1120,34 +1229,34 @@ alsa_get_preferred_sample_rate(cubeb * c +@@ -1126,34 +1235,34 @@ alsa_get_preferred_sample_rate(cubeb * c /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ @@ -521,7 +522,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon return CUBEB_OK; } -@@ -1180,10 +1289,10 @@ alsa_stream_start(cubeb_stream * stm) +@@ -1186,10 +1295,10 @@ alsa_stream_start(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); /* Capture pcm must be started after initial setup/recover */ if (stm->stream_type == SND_PCM_STREAM_CAPTURE && @@ -535,7 +536,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon gettimeofday(&stm->last_activity, NULL); pthread_mutex_unlock(&stm->mutex); -@@ -1223,7 +1332,7 @@ alsa_stream_stop(cubeb_stream * stm) +@@ -1229,7 +1338,7 @@ alsa_stream_stop(cubeb_stream * stm) pthread_mutex_unlock(&ctx->mutex); pthread_mutex_lock(&stm->mutex); @@ -544,7 +545,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1239,8 +1348,8 @@ alsa_stream_get_position(cubeb_stream * +@@ -1245,8 +1354,8 @@ alsa_stream_get_position(cubeb_stream * pthread_mutex_lock(&stm->mutex); delay = -1; @@ -555,7 +556,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon *position = stm->last_position; pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1265,7 +1374,7 @@ alsa_stream_get_latency(cubeb_stream * s +@@ -1271,7 +1380,7 @@ alsa_stream_get_latency(cubeb_stream * s snd_pcm_sframes_t delay; /* This function returns the delay in frames until a frame written using snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c index a12d451dd5f..bf3d7f6ef4d 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c @@ -1,10 +1,10 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.9 2017/04/27 01:49:47 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.10 2018/05/10 20:01:53 ryoon Exp $ * Restore OSS audio support code ---- media/libcubeb/src/cubeb_oss.c.orig 2017-04-23 13:26:11.608534944 +0000 +--- media/libcubeb/src/cubeb_oss.c.orig 2018-05-09 10:25:44.118207555 +0000 +++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,445 @@ +@@ -0,0 +1,454 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -41,11 +41,13 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.9 2017/04/27 01:49:47 ryoon E +}; + +struct cubeb_stream { ++ /* Note: Must match cubeb_stream layout in cubeb.c. */ + cubeb * context; ++ void * user_ptr; ++ /**/ + + cubeb_data_callback data_callback; + cubeb_state_callback state_callback; -+ void * user_ptr; + float volume; + float panning; + @@ -274,6 +276,11 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.9 2017/04/27 01:49:47 ryoon E + return CUBEB_ERROR_DEVICE_UNAVAILABLE; + } + ++ if ((input_stream_params && input_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK) || ++ (output_stream_params && output_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK)) { ++ return CUBEB_ERROR_NOT_SUPPORTED; ++ } ++ + if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) { + free(stream); + return CUBEB_ERROR; @@ -435,12 +442,14 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.9 2017/04/27 01:49:47 ryoon E + .get_min_latency = oss_get_min_latency, + .get_preferred_sample_rate = oss_get_preferred_sample_rate, + .get_preferred_channel_layout = NULL, -+ .destroy = oss_destroy, + .enumerate_devices = NULL, ++ .device_collection_destroy = NULL, ++ .destroy = oss_destroy, + .stream_init = oss_stream_init, + .stream_destroy = oss_stream_destroy, + .stream_start = oss_stream_start, + .stream_stop = oss_stream_stop, ++ .stream_reset_default_device = NULL, + .stream_get_position = oss_stream_get_position, + .stream_get_latency = oss_stream_get_latency, + .stream_set_volume = oss_stream_set_volume, diff --git a/www/firefox/patches/patch-media_libcubeb_src_moz.build b/www/firefox/patches/patch-media_libcubeb_src_moz.build index 5dd89ddd0de..ab30c2aad70 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_moz.build +++ b/www/firefox/patches/patch-media_libcubeb_src_moz.build @@ -1,9 +1,9 @@ -$NetBSD: patch-media_libcubeb_src_moz.build,v 1.13 2017/09/30 05:34:12 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_moz.build,v 1.14 2018/05/10 20:01:53 ryoon Exp $ * Add OSS audio support * Support system library ---- media/libcubeb/src/moz.build.orig 2017-07-31 16:20:49.000000000 +0000 +--- media/libcubeb/src/moz.build.orig 2018-05-03 16:58:30.000000000 +0000 +++ media/libcubeb/src/moz.build @@ -22,6 +22,12 @@ if CONFIG['MOZ_ALSA']: ] @@ -18,11 +18,11 @@ $NetBSD: patch-media_libcubeb_src_moz.build,v 1.13 2017/09/30 05:34:12 ryoon Exp if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']: SOURCES += [ 'cubeb_resampler.cpp', -@@ -85,6 +91,7 @@ if CONFIG['OS_TARGET'] == 'Android': - +@@ -87,6 +93,7 @@ if CONFIG['OS_TARGET'] == 'Android': FINAL_LIBRARY = 'gkmedias' -+CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] ++CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] + # We allow warnings for third-party code that can be updated from upstream. diff --git a/www/firefox/patches/patch-media_libcubeb_update.sh b/www/firefox/patches/patch-media_libcubeb_update.sh index 98237701a5c..b3bee7248e3 100644 --- a/www/firefox/patches/patch-media_libcubeb_update.sh +++ b/www/firefox/patches/patch-media_libcubeb_update.sh @@ -1,12 +1,12 @@ -$NetBSD: patch-media_libcubeb_update.sh,v 1.3 2017/08/10 14:46:15 ryoon Exp $ +$NetBSD: patch-media_libcubeb_update.sh,v 1.4 2018/05/10 20:01:53 ryoon Exp $ ---- media/libcubeb/update.sh.orig 2017-07-31 16:20:49.000000000 +0000 +--- media/libcubeb/update.sh.orig 2018-05-03 16:58:30.000000000 +0000 +++ media/libcubeb/update.sh @@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src cp $1/src/cubeb_mixer.cpp src cp $1/src/cubeb_mixer.h src cp $1/src/cubeb_opensl.c src +cp $1/src/cubeb_oss.c src - cp $1/src/cubeb_osx_run_loop.h src - cp $1/src/cubeb_panner.cpp src - cp $1/src/cubeb_panner.h src + cp $1/src/cubeb-jni.cpp src + cp $1/src/cubeb-jni.h src + cp $1/src/android/cubeb-output-latency.h src/android diff --git a/www/firefox/patches/patch-media_libsoundtouch_src_soundtouch__perms.h b/www/firefox/patches/patch-media_libsoundtouch_src_soundtouch__perms.h deleted file mode 100644 index e5e2f56c60c..00000000000 --- a/www/firefox/patches/patch-media_libsoundtouch_src_soundtouch__perms.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-media_libsoundtouch_src_soundtouch__perms.h,v 1.1 2016/12/03 09:58:26 ryoon Exp $ - ---- media/libsoundtouch/src/soundtouch_perms.h.orig 2016-05-12 17:13:16.000000000 +0000 -+++ media/libsoundtouch/src/soundtouch_perms.h -@@ -12,7 +12,9 @@ - - #pragma GCC visibility push(default) - #include "SoundTouch.h" -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - #include "SoundTouchFactory.h" -+#endif - #pragma GCC visibility pop - - #endif // MOZILLA_SOUNDTOUCH_PERMS_H diff --git a/www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c b/www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c deleted file mode 100644 index edba30d0895..00000000000 --- a/www/firefox/patches/patch-media_libtheora_lib_arm_armcpu.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-media_libtheora_lib_arm_armcpu.c,v 1.2 2017/04/27 01:49:47 ryoon Exp $ - ---- media/libtheora/lib/arm/armcpu.c.orig 2016-05-12 17:13:17.000000000 +0000 -+++ media/libtheora/lib/arm/armcpu.c -@@ -107,6 +107,18 @@ ogg_uint32_t oc_cpu_flags_get(void){ - return flags; - } - -+#elif defined(__NetBSD__) -+ogg_uint32_t oc_cpu_flags_get(void){ -+ ogg_uint32_t flags; -+ /* XXX ryoon: I have no idea about ARM CPU extensions detection mechanism -+ under NetBSD/earm. -+ evbearmv6hf-el machine, Raspberry Pi does not have NEON. -+ evbearmv7hf-el machine, CubieBoard2 does not have EDSP. -+ I have no idea about MEDIA. -+ So I will disable all options. */ -+ flags=0; -+ return flags; -+} - #else - /*The feature registers which can tell us what the processor supports are - accessible in priveleged modes only, so we can't have a general user-space diff --git a/www/firefox/patches/patch-media_libtheora_moz.build b/www/firefox/patches/patch-media_libtheora_moz.build deleted file mode 100644 index ef47ce9d140..00000000000 --- a/www/firefox/patches/patch-media_libtheora_moz.build +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-media_libtheora_moz.build,v 1.8 2018/03/17 00:59:03 ryoon Exp $ - -* Support system library - ---- media/libtheora/moz.build.orig 2018-03-10 02:54:17.000000000 +0000 -+++ media/libtheora/moz.build -@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias' - # The encoder is currently not included. - DEFINES['THEORA_DISABLE_ENCODE'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'clang-cl', 'gcc'): - CFLAGS += ['-Wno-type-limits'] diff --git a/www/firefox/patches/patch-media_libtremor_moz.build b/www/firefox/patches/patch-media_libtremor_moz.build deleted file mode 100644 index e950f3be368..00000000000 --- a/www/firefox/patches/patch-media_libtremor_moz.build +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-media_libtremor_moz.build,v 1.3 2016/08/06 08:46:59 ryoon Exp $ - -* Support system library - ---- media/libtremor/moz.build.orig 2016-05-12 17:13:17.000000000 +0000 -+++ media/libtremor/moz.build -@@ -9,3 +9,5 @@ with Files('*'): - - DIRS += ['include/tremor', 'lib'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git a/www/firefox/patches/patch-media_libvorbis_moz.build b/www/firefox/patches/patch-media_libvorbis_moz.build deleted file mode 100644 index 0a1e0c3160a..00000000000 --- a/www/firefox/patches/patch-media_libvorbis_moz.build +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-media_libvorbis_moz.build,v 1.4 2018/03/17 00:59:03 ryoon Exp $ - -* Support system library - ---- media/libvorbis/moz.build.orig 2018-03-10 02:54:17.000000000 +0000 -+++ media/libvorbis/moz.build -@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias' - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CFLAGS += ['-Wno-uninitialized'] -+ -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git a/www/firefox/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h b/www/firefox/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h deleted file mode 100644 index c2ed0f45d1e..00000000000 --- a/www/firefox/patches/patch-media_openmax__dl_dl_api_armCOMM__s.h +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-media_openmax__dl_dl_api_armCOMM__s.h,v 1.2 2016/06/16 12:08:21 ryoon Exp $ - -* Support NetBSD/earm - ---- media/openmax_dl/dl/api/armCOMM_s.h.orig 2015-09-29 21:44:56.000000000 +0000 -+++ media/openmax_dl/dl/api/armCOMM_s.h -@@ -11,6 +11,12 @@ - @// This file was originally licensed as follows. It has been - @// relicensed with permission from the copyright holders. - @// -+ -+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__) -+#define UNWIND -+#else -+#define UNWIND @ -+#endif - - @// - @// File Name: armCOMM_s.h -@@ -175,7 +181,8 @@ - .object_arch armv4 - .align 2 - \name : --.fnstart -+ .cfi_startproc -+ UNWIND .fnstart - @ Save specified R registers - _M_GETRREGLIST \rreg - _M_PUSH_RREG -@@ -202,7 +209,8 @@ - .endif - @ Restore any saved R or D registers. - _M_RET -- .fnend -+ UNWIND .fnend -+ .cfi_endproc - .endfunc - @ Reset the global stack tracking variables back to their - @ initial values. diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi deleted file mode 100644 index 48f37ba4c49..00000000000 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.13 2017/09/30 05:34:12 ryoon Exp $ - ---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2017-09-14 20:16:07.000000000 +0000 -+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi -@@ -7,6 +7,9 @@ - # be found in the AUTHORS file in the root of the source tree. - - { -+ 'variables': { -+ 'use_libv4l2%': 0, -+ }, - 'targets': [ - { - # Note this library is missing an implementation for the video capture. -@@ -74,6 +77,19 @@ - 'linux/video_capture_linux.cc', - 'linux/video_capture_linux.h', - ], -+ 'conditions': [ -+ ['use_libv4l2==1', { -+ 'defines': [ -+ 'HAVE_LIBV4L2', -+ ], -+ 'cflags_mozilla': [ -+ '$(MOZ_LIBV4L2_CFLAGS)', -+ ], -+ 'libraries': [ -+ '-lv4l2', -+ ], -+ }], -+ ], - }], - ['OS=="mac"', { - 'sources': [ diff --git a/www/firefox/patches/patch-modules_libpref_init_all.js b/www/firefox/patches/patch-modules_libpref_init_all.js deleted file mode 100644 index 0237edb6f04..00000000000 --- a/www/firefox/patches/patch-modules_libpref_init_all.js +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-modules_libpref_init_all.js,v 1.8 2018/03/26 22:24:45 maya Exp $ - -Else case same as linux for duplex audio, capture_delay, and disabling -custom styling to workaround a GTK bug - ---- modules/libpref/init/all.js.orig 2018-03-10 02:54:17.000000000 +0000 -+++ modules/libpref/init/all.js -@@ -532,7 +532,10 @@ pref("media.peerconnection.capture_delay - pref("media.navigator.hardware.vp8_encode.acceleration_enabled", true); - pref("media.navigator.hardware.vp8_encode.acceleration_remote_enabled", true); - pref("media.navigator.hardware.vp8_decode.acceleration_enabled", false); -+#elif defined(XP_LINUX) || defined(MOZ_SNDIO) -+pref("media.peerconnection.capture_delay", 70); - #else -+// *BSD, others - merely a guess for now - pref("media.peerconnection.capture_delay", 70); - #endif - // Use MediaDataDecoder API for WebRTC, this includes hardware acceleration for -@@ -1331,8 +1334,8 @@ pref("dom.forms.autocomplete.formautofil - // Enable search in <select> dropdowns (more than 40 options) - pref("dom.forms.selectSearch", false); - // Allow for webpages to provide custom styling for <select> --// popups. Disabled on Linux due to bug 1338283. --#ifdef XP_LINUX -+// popups. Disabled on GTK due to bug 1338283. -+#ifdef MOZ_WIDGET_GTK - pref("dom.forms.select.customstyling", false); - #else - pref("dom.forms.select.customstyling", true); diff --git a/www/firefox/patches/patch-mozglue_build_arm.cpp b/www/firefox/patches/patch-mozglue_build_arm.cpp deleted file mode 100644 index dcbc706b6a7..00000000000 --- a/www/firefox/patches/patch-mozglue_build_arm.cpp +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-mozglue_build_arm.cpp,v 1.3 2016/09/20 20:01:41 ryoon Exp $ - -* Support NetBSD/earm - ---- mozglue/build/arm.cpp.orig 2016-08-01 16:14:43.000000000 +0000 -+++ mozglue/build/arm.cpp -@@ -13,10 +13,13 @@ - // we don't compile one of these detection methods. The detection code here is - // based on the CPU detection in libtheora. - --# if defined(__linux__) || defined(ANDROID) -+# if defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) - # include <stdio.h> - # include <stdlib.h> - # include <string.h> -+# if defined(__NetBSD__) -+# include <sys/sysctl.h> -+# endif - - enum{ - MOZILLA_HAS_EDSP_FLAG=1, -@@ -25,6 +28,29 @@ enum{ - MOZILLA_HAS_NEON_FLAG=8 - }; - -+# if defined(__NetBSD__) -+static unsigned -+get_arm_cpu_flags(void) -+{ -+ unsigned flags = 0; -+ size_t len; -+ int flag; -+ -+ len = sizeof(flag); -+ if (sysctlbyname("machdep.simdex_present", &flag, &len, NULL, 0) == 0 && flag) { -+ flags |= MOZILLA_HAS_ARMV6_FLAG; -+ flags |= MOZILLA_HAS_EDSP_FLAG; -+ } -+ -+ len = sizeof(flag); -+ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0 && flag) { -+ flags |= MOZILLA_HAS_ARMV7_FLAG; -+ flags |= MOZILLA_HAS_NEON_FLAG; -+ } -+ -+ return flags; -+} -+# else - static unsigned - get_arm_cpu_flags(void) - { -@@ -89,6 +115,7 @@ get_arm_cpu_flags(void) - } - return flags; - } -+# endif - - // Cache a local copy so we only have to read /proc/cpuinfo once. - static unsigned arm_cpu_flags = get_arm_cpu_flags(); diff --git a/www/firefox/patches/patch-mozglue_build_arm.h b/www/firefox/patches/patch-mozglue_build_arm.h deleted file mode 100644 index e8cc8281a16..00000000000 --- a/www/firefox/patches/patch-mozglue_build_arm.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mozglue_build_arm.h,v 1.2 2016/06/16 12:08:21 ryoon Exp $ - -* Support NetBSD/earm - ---- mozglue/build/arm.h.orig 2015-09-29 21:45:02.000000000 +0000 -+++ mozglue/build/arm.h -@@ -76,7 +76,7 @@ - # endif - - // Currently we only have CPU detection for Linux via /proc/cpuinfo --# if defined(__linux__) || defined(ANDROID) -+# if defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) - # define MOZILLA_ARM_HAVE_CPUID_DETECTION 1 - # endif - diff --git a/www/firefox/patches/patch-netwerk_dns_moz.build b/www/firefox/patches/patch-netwerk_dns_moz.build deleted file mode 100644 index 50f86215e41..00000000000 --- a/www/firefox/patches/patch-netwerk_dns_moz.build +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-netwerk_dns_moz.build,v 1.8 2018/03/17 00:59:03 ryoon Exp $ - ---- netwerk/dns/moz.build.orig 2018-03-10 02:54:17.000000000 +0000 -+++ netwerk/dns/moz.build -@@ -73,3 +73,6 @@ USE_LIBS += ['icu'] - - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CXXFLAGS += ['-Wno-error=shadow'] -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] diff --git a/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py b/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py deleted file mode 100644 index be33c6c884a..00000000000 --- a/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-third__party_python_futures_concurrent_futures_process.py,v 1.3 2018/01/24 16:52:08 ryoon Exp $ - ---- third_party/python/futures/concurrent/futures/process.py.orig 2017-07-31 16:20:49.000000000 +0000 -+++ third_party/python/futures/concurrent/futures/process.py -@@ -247,7 +247,11 @@ def _check_system_limits(): - _system_limits_checked = True - try: - import os -- nsems_max = os.sysconf("SC_SEM_NSEMS_MAX") -+ if sys.platform.startswith('freebsd'): -+ # sem(4) confuses sysconf(3) on FreeBSD < 11.1 -+ nsems_max = -1 -+ else: -+ nsems_max = os.sysconf("SC_SEM_NSEMS_MAX") - except (AttributeError, ValueError): - # sysconf not available or setting not available - return diff --git a/www/firefox/patches/patch-third__party_rust_simd_.cargo-checksum.json b/www/firefox/patches/patch-third__party_rust_simd_.cargo-checksum.json deleted file mode 100644 index 007482197e1..00000000000 --- a/www/firefox/patches/patch-third__party_rust_simd_.cargo-checksum.json +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-third__party_rust_simd_.cargo-checksum.json,v 1.1 2018/03/17 00:59:03 ryoon Exp $ - ---- third_party/rust/simd/.cargo-checksum.json.orig 2018-03-10 02:54:17.000000000 +0000 -+++ third_party/rust/simd/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"efe3006b13a13261a3dec3d37dc1d8cb53950f3803c420069231803374949937","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"} -\ No newline at end of file -+{"files":{".travis.yml":"e2c720c3633b7671efce49147c62b12bcbf630d7c5d6fc65cd97620bfa4ddcea","Cargo.toml":"608aad04f17a524ee21048fa2ce9f656ae344e0473dd0e331dc954f0f9677c63","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6d3a9431e65e69c73a8923e6517b889d17549b23db406b9ec027710d16af701f","README.md":"249294a9a5f63c64c0f7fe4a607060f43f3507dce2378067aa59d25fb3ae681d","benches/mandelbrot.rs":"051b5199e66bca6cf7774e9024915fd4e1349ab39726a10a14e06b60d65d87a4","benches/matrix.rs":"048a21dacdb62365e0105d00d2c8cd6bd2396ac81134f2bff7eb4f7d095fb735","examples/axpy.rs":"4307626045d64ec08361c97c9c72c5dc8d361bdc88f64453b97ac0212041a1b2","examples/convert.rs":"8e658fde050f8a0d8b84ad7570446b10fcf544afbd551b940ca340474f324840","examples/dot-product.rs":"6fe2e007c147af5353804173a593c5b9d57dbccec156e1da37e9e32537363f91","examples/fannkuch-redux-nosimd.rs":"7b2fbde35e8666929d14d67328471cb0483d038a5325232f8db148b30865312b","examples/fannkuch-redux.rs":"ea21fdbd2274488a62cc984acad6e0b65d52f24fb4ff63b7057a3a667e9c8aae","examples/mandelbrot.rs":"8b8fdca1edac50e5a33e0e0592bd41eb75114f31839ccd40d485c61a9a664380","examples/matrix-inverse.rs":"a378d20ef20c2119bb10a86de27c92fec2c2f77f374e6bfd36707c9825a5fe92","examples/nbody-nosimd.rs":"2c8e0a7feacd202fdd65eeceb6420d6e9f43340b81f20a8e532704a587a2796b","examples/nbody.rs":"a864311affab262024479d6348ff51af43d809e9ad332ec30ea4aacceaa2eae1","examples/ops.rs":"1316f915d0afcfa98fdc4077e965ccccf6b4b21c433cbe487ff0cdc60df3cd39","examples/spectral-norm-nosimd.rs":"ffc8512ecde779078ea467f38f423a0ea623c63da7078193f9dd370200773f79","examples/spectral-norm.rs":"edb09c9d477f83939098cfb77a27cc298bc7a0c8a8e29cece0cccae0d70d890e","src/aarch64/mod.rs":"83f52775364c98de0cecb7e1509530c18972e932469f5f1522aa24a735d0fa37","src/aarch64/neon.rs":"1fe769979e07d8e2bc3c78ce116e05d735860744efe097a894cc9421153257fb","src/arm/mod.rs":"dcdd90bc0b39abaf86a0c8946d442b16313563fbae1ff03248628275c74d8617","src/arm/neon.rs":"51cc509856200e80f8e4cc2c982586e6d1cef593ec4537e153dce0cfe31d3428","src/common.rs":"62f4e7e0fefb52ad190d0f2191bc435ac4deab3f2bc70dc427f2a7f9ccb7856e","src/lib.rs":"25f0b39c038fa85af858318135dfd87865be26c33bb4bd1438aec96a1e68d8b5","src/sixty_four.rs":"510a9e00189a61e4f0a5beb7052d5dee37fc8261f94a2af45ef10327e0f3b7df","src/v256.rs":"2e328e49034876d535e0627c7a62191da2b4fb156a657614bf531a5fc75b1385","src/x86/avx.rs":"c66140abefca634b48eae307c3ec8cf5a40f2279b10e246a7e2ac602a2a2bb28","src/x86/avx2.rs":"3bcb3f391ad5f16f0a6da0bc1301329beb478ad6265bd3b2c9c124fc2e6198e5","src/x86/mod.rs":"0acc5a5e2672e2a0fddc11065663be8b8fa2da87320ea291fa86ff8c2f33edf5","src/x86/sse2.rs":"5ceda75a401958a135fc9d851b22075314cdeed69fd483b6a7be4f11373f40da","src/x86/sse3.rs":"9bd01a4f08069ca4f445952e744d651efe887e3835b18872e757375f0d053bd2","src/x86/sse4_1.rs":"9ceb80dd70a7e7dfeef508cb935e1a2637175bc87a3b090f5dea691ff6aa0516","src/x86/sse4_2.rs":"c59321aed8decdce4d0d8570cff46aed02e1a8265647ef7702e9b180fc581254","src/x86/ssse3.rs":"2290f0269bae316b8e0491495645ee38a9bd73525c8572759c1328341c3bdb4c"},"package":"7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0"} -\ No newline at end of file diff --git a/www/firefox/patches/patch-third__party_rust_simd_src_x86_avx2.rs b/www/firefox/patches/patch-third__party_rust_simd_src_x86_avx2.rs deleted file mode 100644 index dcc6aaa4971..00000000000 --- a/www/firefox/patches/patch-third__party_rust_simd_src_x86_avx2.rs +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-third__party_rust_simd_src_x86_avx2.rs,v 1.1 2018/03/17 00:59:03 ryoon Exp $ - ---- third_party/rust/simd/src/x86/avx2.rs.orig 2018-03-10 02:54:17.000000000 +0000 -+++ third_party/rust/simd/src/x86/avx2.rs -@@ -42,7 +42,7 @@ extern "platform-intrinsic" { - fn x86_mm256_packus_epi32(x: i32x8, y: i32x8) -> u16x16; - fn x86_mm256_permutevar8x32_epi32(x: i32x8, y: i32x8) -> i32x8; - fn x86_mm256_permutevar8x32_ps(x: f32x8, y: i32x8) -> f32x8; -- fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u8x32; -+ fn x86_mm256_sad_epu8(x: u8x32, y: u8x32) -> u64x4; - fn x86_mm256_shuffle_epi8(x: i8x32, y: i8x32) -> i8x32; - fn x86_mm256_sign_epi8(x: i8x32, y: i8x32) -> i8x32; - fn x86_mm256_sign_epi16(x: i16x16, y: i16x16) -> i16x16; diff --git a/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h b/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h deleted file mode 100644 index 45f6c15a396..00000000000 --- a/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.4 2018/01/24 16:52:08 ryoon Exp $ - ---- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig 2018-01-11 20:17:03.000000000 +0000 -+++ toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h -@@ -87,6 +87,11 @@ typedef intptr_t Atomic64; - #endif - #endif - -+#if defined(__NetBSD__) && defined(__arm__) -+// NetBSD/arm uses long for intptr_t, which fails -fpermissive checks. So -+// explicitly use int32 here instead. -+typedef int32 AtomicWord; -+#else - // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or - // Atomic64 routines below, depending on your architecture. - #if defined(__OpenBSD__) && !defined(GOOGLE_PROTOBUF_ARCH_64_BIT) /* See Bug 1192556 */ -@@ -94,6 +99,7 @@ typedef Atomic32 AtomicWord; - #else - typedef intptr_t AtomicWord; - #endif -+#endif - - // Atomically execute: - // result = *ptr; diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build index 23cd3f66b06..9300669bb79 100644 --- a/www/firefox/patches/patch-toolkit_library_moz.build +++ b/www/firefox/patches/patch-toolkit_library_moz.build @@ -1,50 +1,11 @@ -$NetBSD: patch-toolkit_library_moz.build,v 1.15 2017/09/30 05:34:12 ryoon Exp $ +$NetBSD: patch-toolkit_library_moz.build,v 1.16 2018/05/10 20:01:53 ryoon Exp $ * Support system libraries * Restore OSS support ---- toolkit/library/moz.build.orig 2017-09-14 20:16:01.000000000 +0000 +--- toolkit/library/moz.build.orig 2018-05-03 16:58:41.000000000 +0000 +++ toolkit/library/moz.build -@@ -198,6 +198,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF - ] - - OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] -+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] - OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] - - if CONFIG['SERVO_TARGET_DIR']: -@@ -212,9 +213,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']: - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - -@@ -224,8 +246,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: +@@ -247,8 +247,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] diff --git a/www/firefox/patches/patch-toolkit_moz.configure b/www/firefox/patches/patch-toolkit_moz.configure index 1478e2784f0..51e3214343c 100644 --- a/www/firefox/patches/patch-toolkit_moz.configure +++ b/www/firefox/patches/patch-toolkit_moz.configure @@ -1,30 +1,10 @@ -$NetBSD: patch-toolkit_moz.configure,v 1.10 2018/03/17 00:59:03 ryoon Exp $ +$NetBSD: patch-toolkit_moz.configure,v 1.11 2018/05/10 20:01:53 ryoon Exp $ * skia part: support bigendian architectures ---- toolkit/moz.configure.orig 2018-03-10 02:54:17.000000000 +0000 +--- toolkit/moz.configure.orig 2018-05-03 16:58:41.000000000 +0000 +++ toolkit/moz.configure -@@ -414,7 +414,7 @@ option('--enable-eme', - def enable_eme(value, target): - # Widevine EME by default enabled on desktop Windows, MacOS and Linux, - # x86 and x64 builds. -- if (target.kernel in ('Darwin', 'WINNT', 'Linux') and -+ if (target.kernel in ('Darwin', 'WINNT', 'Linux', 'NetBSD') and - target.os not in ('Android', 'iOS') and - target.cpu in ('x86', 'x86_64')): - return value -@@ -815,8 +815,8 @@ def webrender(value, milestone): - enable_webrender = None - - if value.origin == 'default': -- # if nothing is specified, default to just building on Nightly -- build_webrender = milestone.is_nightly -+ # build by default downstream -+ build_webrender = True - elif len(value) and value[0] == 'build': - # if explicitly set to 'build', then we build but don't enable - build_webrender = True -@@ -924,11 +924,11 @@ include('nss.configure') +@@ -932,11 +932,11 @@ include('nss.configure') # ============================================================== option('--disable-skia', help='Disable use of Skia') @@ -41,30 +21,3 @@ $NetBSD: patch-toolkit_moz.configure,v 1.10 2018/03/17 00:59:03 ryoon Exp $ return True set_config('MOZ_ENABLE_SKIA', skia) -@@ -1051,6 +1051,26 @@ add_old_configure_assignment('FT2_LIBS', - add_old_configure_assignment('FT2_CFLAGS', - ft2_info.cflags) - -+# Graphite2 -+# ============================================================== -+option('--with-system-graphite2', -+ help="Use system graphite2 (located with pkgconfig)") -+ -+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', -+ when='--with-system-graphite2') -+ -+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) -+ -+# HarfBuzz -+# ============================================================== -+option('--with-system-harfbuzz', -+ help="Use system harfbuzz (located with pkgconfig)") -+ -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4', -+ when='--with-system-harfbuzz') -+ -+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) -+ - # Mortar - # ============================================================== - option('--enable-mortar', help='Enable mortar extension') diff --git a/www/firefox/patches/patch-widget_gtk_nsClipboard.cpp b/www/firefox/patches/patch-widget_gtk_nsClipboard.cpp deleted file mode 100644 index ae51b3f019e..00000000000 --- a/www/firefox/patches/patch-widget_gtk_nsClipboard.cpp +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-widget_gtk_nsClipboard.cpp,v 1.1 2018/04/29 13:27:08 martin Exp $ - -Upstream fixes for Bug 1447925 - - Add GetClipboardText() to get text data from clipboard - Use GetClipboardText() to get text data at nsClipboard::GetData() - ---- widget/gtk/nsClipboard.cpp.orig 2018-04-29 12:56:52.405590187 +0000 -+++ widget/gtk/nsClipboard.cpp -@@ -301,11 +301,8 @@ nsClipboard::GetData(nsITransferable *aT - // Special case text/unicode since we can convert any - // string into text/unicode - if (flavorStr.EqualsLiteral(kUnicodeMime)) { -- uint32_t clipboardDataLength; - const char* clipboardData = -- mContext->GetClipboardData(GTK_DEFAULT_MIME_TEXT, -- aWhichClipboard, -- &clipboardDataLength); -+ mContext->GetClipboardText(aWhichClipboard); - if (!clipboardData) { - // If the type was text/unicode and we couldn't get - // text off the clipboard, run the next loop -@@ -314,7 +311,7 @@ nsClipboard::GetData(nsITransferable *aT - } - - // Convert utf-8 into our unicode format. -- NS_ConvertUTF8toUTF16 ucs2string(clipboardData, clipboardDataLength); -+ NS_ConvertUTF8toUTF16 ucs2string(clipboardData); - const char* unicodeData = (const char *)ToNewUnicode(ucs2string); - uint32_t unicodeDataLength = ucs2string.Length() * 2; - SetTransferableData(aTransferable, flavorStr, diff --git a/www/firefox/patches/patch-widget_gtk_nsClipboard.h b/www/firefox/patches/patch-widget_gtk_nsClipboard.h deleted file mode 100644 index e2b891e3de5..00000000000 --- a/www/firefox/patches/patch-widget_gtk_nsClipboard.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-widget_gtk_nsClipboard.h,v 1.1 2018/04/29 13:27:08 martin Exp $ - -Upstream fixes for Bug 1447925 - - Add GetClipboardText() to get text data from clipboard - Use GetClipboardText() to get text data at nsClipboard::GetData() - ---- widget/gtk/nsClipboard.h.orig 2018-04-29 12:56:52.405642009 +0000 -+++ widget/gtk/nsClipboard.h -@@ -13,16 +13,18 @@ - #include "nsIBinaryOutputStream.h" - #include <gtk/gtk.h> - --// Default Gtk MIME for text --#define GTK_DEFAULT_MIME_TEXT "UTF8_STRING" -- - class nsRetrievalContext { - public: -+ // Get actual clipboard content (GetClipboardData/GetClipboardText) -+ // which has to be released by ReleaseClipboardData(). - virtual const char* GetClipboardData(const char* aMimeType, - int32_t aWhichClipboard, - uint32_t* aContentLength) = 0; -+ virtual const char* GetClipboardText(int32_t aWhichClipboard) = 0; - virtual void ReleaseClipboardData(const char* aClipboardData) = 0; - -+ // Get data mime types which can be obtained from clipboard. -+ // The returned array has to be released by g_free(). - virtual GdkAtom* GetTargets(int32_t aWhichClipboard, - int* aTargetNum) = 0; - diff --git a/www/firefox/patches/patch-widget_gtk_nsClipboardX11.cpp b/www/firefox/patches/patch-widget_gtk_nsClipboardX11.cpp deleted file mode 100644 index bb1dda76efc..00000000000 --- a/www/firefox/patches/patch-widget_gtk_nsClipboardX11.cpp +++ /dev/null @@ -1,264 +0,0 @@ -$NetBSD: patch-widget_gtk_nsClipboardX11.cpp,v 1.1 2018/04/29 13:27:08 martin Exp $ - -Upstream fixes for Bug 1447925 - - Add GetClipboardText() to get text data from clipboard - Use GetClipboardText() to get text data at nsClipboard::GetData() - ---- widget/gtk/nsClipboardX11.cpp.orig 2018-04-29 12:56:52.405706053 +0000 -+++ widget/gtk/nsClipboardX11.cpp -@@ -62,8 +62,10 @@ selection_request_filter(GdkXEvent *gdk_ - - nsRetrievalContextX11::nsRetrievalContextX11() - : mState(INITIAL) -- , mData(nullptr) - , mClipboardRequestNumber(0) -+ , mClipboardData(nullptr) -+ , mClipboardDataLength(0) -+ , mTargetMIMEType(gdk_atom_intern("TARGETS", FALSE)) - { - // A custom event filter to workaround attempting to dereference a null - // selection requestor in GTK3 versions before 3.11.3. See bug 1178799. -@@ -139,13 +141,11 @@ checkEventProc(Display *display, XEvent - return False; - } - --void * --nsRetrievalContextX11::Wait() -+bool -+nsRetrievalContextX11::WaitForX11Content() - { - if (mState == COMPLETED) { // the request completed synchronously -- void *data = mData; -- mData = nullptr; -- return data; -+ return true; - } - - GdkDisplay *gdkDisplay = gdk_display_get_default(); -@@ -181,9 +181,7 @@ nsRetrievalContextX11::Wait() - DispatchPropertyNotifyEvent(context.cbWidget, &xevent); - - if (mState == COMPLETED) { -- void *data = mData; -- mData = nullptr; -- return data; -+ return true; - } - } - -@@ -200,11 +198,12 @@ nsRetrievalContextX11::Wait() - printf("exceeded clipboard timeout\n"); - #endif - mState = TIMED_OUT; -- return nullptr; -+ return false; - } - - // Call this when data has been retrieved. --void nsRetrievalContextX11::Complete(GtkSelectionData* aData, -+void nsRetrievalContextX11::Complete(ClipboardDataType aDataType, -+ const void* aData, - int aDataRequestNumber) - { - if (mClipboardRequestNumber != aDataRequestNumber) { -@@ -214,8 +213,54 @@ void nsRetrievalContextX11::Complete(Gtk - - if (mState == INITIAL) { - mState = COMPLETED; -- mData = gtk_selection_data_get_length(aData) >= 0 ? -- gtk_selection_data_copy(aData) : nullptr; -+ -+ MOZ_ASSERT(mClipboardData == nullptr && -+ mClipboardDataLength == 0, -+ "We're leaking clipboard data!"); -+ -+ switch (aDataType) { -+ case CLIPBOARD_TEXT: -+ { -+ const char* text = static_cast<const char*>(aData); -+ if (text) { -+ mClipboardDataLength = sizeof(char) * (strlen(text) + 1); -+ mClipboardData = moz_xmalloc(mClipboardDataLength); -+ memcpy(mClipboardData, text, mClipboardDataLength); -+ } -+ } -+ break; -+ case CLIPBOARD_TARGETS: -+ { -+ const GtkSelectionData *selection = -+ static_cast<const GtkSelectionData *>(aData); -+ -+ gint n_targets = 0; -+ GdkAtom *targets = nullptr; -+ -+ if (!gtk_selection_data_get_targets(selection, &targets, &n_targets) || -+ !n_targets) { -+ return; -+ } -+ -+ mClipboardData = targets; -+ mClipboardDataLength = n_targets; -+ } -+ break; -+ case CLIPBOARD_DATA: -+ { -+ const GtkSelectionData *selection = -+ static_cast<const GtkSelectionData *>(aData); -+ -+ gint dataLength = gtk_selection_data_get_length(selection); -+ if (dataLength > 0) { -+ mClipboardDataLength = dataLength; -+ mClipboardData = moz_xmalloc(dataLength); -+ memcpy(mClipboardData, gtk_selection_data_get_data(selection), -+ dataLength); -+ } -+ } -+ break; -+ } - } else { - // Already timed out - MOZ_ASSERT(mState == TIMED_OUT); -@@ -233,12 +278,24 @@ clipboard_contents_received(GtkClipboard - delete handler; - } - --GtkSelectionData* --nsRetrievalContextX11::WaitForContents(GtkClipboard *clipboard, -- const char *aMimeType) -+static void -+clipboard_text_received(GtkClipboard *clipboard, -+ const gchar *text, -+ gpointer data) -+{ -+ ClipboardRequestHandler *handler = -+ static_cast<ClipboardRequestHandler*>(data); -+ handler->Complete(text); -+ delete handler; -+} -+ -+bool -+nsRetrievalContextX11::WaitForClipboardData(ClipboardDataType aDataType, -+ GtkClipboard *clipboard, -+ const char *aMimeType) - { - mState = INITIAL; -- NS_ASSERTION(!mData, "Leaking clipboard content!"); -+ NS_ASSERTION(!mClipboardData, "Leaking clipboard content!"); - - // Call ClipboardRequestHandler() with unique clipboard request number. - // The request number pairs gtk_clipboard_request_contents() data request -@@ -246,39 +303,45 @@ nsRetrievalContextX11::WaitForContents(G - // is provided by Gtk. - mClipboardRequestNumber++; - ClipboardRequestHandler* handler = -- new ClipboardRequestHandler(this, mClipboardRequestNumber); -+ new ClipboardRequestHandler(this, aDataType, mClipboardRequestNumber); -+ -+ switch (aDataType) { -+ case CLIPBOARD_DATA: -+ gtk_clipboard_request_contents(clipboard, -+ gdk_atom_intern(aMimeType, FALSE), clipboard_contents_received, -+ handler); -+ break; -+ case CLIPBOARD_TEXT: -+ gtk_clipboard_request_text(clipboard, clipboard_text_received, -+ handler); -+ break; -+ case CLIPBOARD_TARGETS: -+ gtk_clipboard_request_contents(clipboard, -+ mTargetMIMEType, clipboard_contents_received, -+ handler); -+ break; -+ } - -- gtk_clipboard_request_contents(clipboard, -- gdk_atom_intern(aMimeType, FALSE), -- clipboard_contents_received, -- handler); -- return static_cast<GtkSelectionData*>(Wait()); -+ return WaitForX11Content(); - } - - GdkAtom* - nsRetrievalContextX11::GetTargets(int32_t aWhichClipboard, int* aTargetNums) - { -- *aTargetNums = 0; -- -- GtkClipboard *clipboard = -- gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); -- -- GtkSelectionData *selection_data = WaitForContents(clipboard, "TARGETS"); -- if (!selection_data) -- return nullptr; -+ GtkClipboard *clipboard = -+ gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); - -- gint n_targets = 0; -- GdkAtom *targets = nullptr; -+ if (!WaitForClipboardData(CLIPBOARD_TARGETS, clipboard)) -+ return nullptr; - -- if (!gtk_selection_data_get_targets(selection_data, &targets, &n_targets) || -- !n_targets) { -- return nullptr; -- } -+ *aTargetNums = mClipboardDataLength; -+ GdkAtom* targets = static_cast<GdkAtom*>(mClipboardData); - -- gtk_selection_data_free(selection_data); -+ // We don't hold the target list internally but we transfer the ownership. -+ mClipboardData = nullptr; -+ mClipboardDataLength = 0; - -- *aTargetNums = n_targets; -- return targets; -+ return targets; - } - - const char* -@@ -289,25 +352,31 @@ nsRetrievalContextX11::GetClipboardData( - GtkClipboard *clipboard; - clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); - -- GtkSelectionData *selectionData = WaitForContents(clipboard, aMimeType); -- if (!selectionData) -+ if (!WaitForClipboardData(CLIPBOARD_DATA, clipboard, aMimeType)) - return nullptr; - -- char* clipboardData = nullptr; -- int contentLength = gtk_selection_data_get_length(selectionData); -- if (contentLength > 0) { -- clipboardData = reinterpret_cast<char*>( -- moz_xmalloc(sizeof(char)*contentLength)); -- memcpy(clipboardData, gtk_selection_data_get_data(selectionData), -- sizeof(char)*contentLength); -- } -- gtk_selection_data_free(selectionData); -+ *aContentLength = mClipboardDataLength; -+ return static_cast<const char*>(mClipboardData); -+} -+ -+const char* -+nsRetrievalContextX11::GetClipboardText(int32_t aWhichClipboard) -+{ -+ GtkClipboard *clipboard; -+ clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); - -- *aContentLength = contentLength; -- return (const char*)clipboardData; -+ if (!WaitForClipboardData(CLIPBOARD_TEXT, clipboard)) -+ return nullptr; -+ -+ return static_cast<const char*>(mClipboardData); - } - - void nsRetrievalContextX11::ReleaseClipboardData(const char* aClipboardData) - { -- free((void *)aClipboardData); -+ NS_ASSERTION(aClipboardData == mClipboardData, -+ "Releasing unknown clipboard data!"); -+ free((void*)aClipboardData); -+ -+ mClipboardData = nullptr; -+ mClipboardDataLength = 0; - } diff --git a/www/firefox/patches/patch-widget_gtk_nsClipboardX11.h b/www/firefox/patches/patch-widget_gtk_nsClipboardX11.h deleted file mode 100644 index 1b42bd125a3..00000000000 --- a/www/firefox/patches/patch-widget_gtk_nsClipboardX11.h +++ /dev/null @@ -1,92 +0,0 @@ -$NetBSD: patch-widget_gtk_nsClipboardX11.h,v 1.1 2018/04/29 13:27:08 martin Exp $ - -Upstream fixes for Bug 1447925 - - Add GetClipboardText() to get text data from clipboard - Use GetClipboardText() to get text data at nsClipboard::GetData() - ---- widget/gtk/nsClipboardX11.h.orig 2018-04-29 12:56:52.405751519 +0000 -+++ widget/gtk/nsClipboardX11.h -@@ -11,6 +11,12 @@ - #include "nsIClipboard.h" - #include <gtk/gtk.h> - -+enum ClipboardDataType { -+ CLIPBOARD_DATA, -+ CLIPBOARD_TEXT, -+ CLIPBOARD_TARGETS -+}; -+ - class nsRetrievalContextX11 : public nsRetrievalContext - { - public: -@@ -19,48 +25,59 @@ public: - virtual const char* GetClipboardData(const char* aMimeType, - int32_t aWhichClipboard, - uint32_t* aContentLength) override; -+ virtual const char* GetClipboardText(int32_t aWhichClipboard) override; - virtual void ReleaseClipboardData(const char* aClipboardData) override; - - virtual GdkAtom* GetTargets(int32_t aWhichClipboard, - int* aTargetNums) override; - -- // Call this when data has been retrieved. -- void Complete(GtkSelectionData* aData, int aDataRequestNumber); -+ // Call this when data or text has been retrieved. -+ void Complete(ClipboardDataType aDataType, -+ const void* aData, -+ int aDataRequestNumber); - - nsRetrievalContextX11(); - virtual ~nsRetrievalContextX11() override; - - private: -- GtkSelectionData* WaitForContents(GtkClipboard *clipboard, -- const char *aMimeType); -+ bool WaitForClipboardData(ClipboardDataType aDataType, -+ GtkClipboard *clipboard, -+ const char *aMimeType = nullptr); -+ - /** - * Spins X event loop until timing out or being completed. Returns - * null if we time out, otherwise returns the completed data (passing - * ownership to caller). - */ -- void *Wait(); -+ bool WaitForX11Content(); - -- State mState; -- void* mData; -- int mClipboardRequestNumber; -+ State mState; -+ int mClipboardRequestNumber; -+ void* mClipboardData; -+ uint32_t mClipboardDataLength; -+ GdkAtom mTargetMIMEType; - }; - - class ClipboardRequestHandler - { - public: -- ClipboardRequestHandler(nsRetrievalContextX11 *aContext, int aDataRequestNumber) -+ ClipboardRequestHandler(nsRetrievalContextX11 *aContext, -+ ClipboardDataType aDataType, -+ int aDataRequestNumber) - : mContext(aContext) - , mDataRequestNumber(aDataRequestNumber) -+ , mDataType(aDataType) - {} - -- void Complete(GtkSelectionData* aData) -+ void Complete(const void *aData) - { -- mContext->Complete(aData, mDataRequestNumber); -+ mContext->Complete(mDataType, aData, mDataRequestNumber); - } - - private: - nsRetrievalContextX11 *mContext; - int mDataRequestNumber; -+ ClipboardDataType mDataType; - }; - - #endif /* __nsClipboardX11_h_ */ diff --git a/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp b/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp deleted file mode 100644 index 05145136908..00000000000 --- a/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-xpcom_build_XPCOMInit.cpp,v 1.4 2016/12/03 09:58:26 ryoon Exp $ - ---- xpcom/build/XPCOMInit.cpp.orig 2016-10-31 20:15:39.000000000 +0000 -+++ xpcom/build/XPCOMInit.cpp -@@ -137,7 +137,9 @@ extern nsresult nsStringInputStreamConst - - #include "mozilla/ipc/GeckoChildProcessHost.h" - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #if defined(HAVE_STDINT_H) - // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -638,11 +640,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul - // this oddness. - mozilla::SetICUMemoryFunctions(); - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build deleted file mode 100644 index db60a72fed7..00000000000 --- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.9 2017/08/26 21:18:08 he Exp $ - -CONFIG['OS_TEST'] is apparently CPU, not MACHINE, so use 'powerpc' -instead of the longish list of powerpc ports. - ---- xpcom/reflect/xptcall/md/unix/moz.build.orig 2017-06-15 20:52:36.000000000 +0000 -+++ xpcom/reflect/xptcall/md/unix/moz.build -@@ -221,7 +221,7 @@ if CONFIG['OS_TEST'] in ('powerpc64', 'p - 'xptcstubs_ppc64_linux.cpp', - ] - --if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'): -+if CONFIG['OS_TEST'] in ('powerpc'): - if CONFIG['OS_ARCH'] == 'NetBSD': - SOURCES += [ - 'xptcinvoke_asm_ppc_netbsd.s', |