diff options
| author | ryoon <ryoon@pkgsrc.org> | 2014-04-30 15:07:17 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2014-04-30 15:07:17 +0000 |
| commit | 053f7336085d3bbdfc13c755e2c1d6b979dc4985 (patch) | |
| tree | 1c0ef0fb6122b97a628b10d51ee194d9c1b37b3c /www | |
| parent | c02d6057e6575e20ee54d9cd14b9ec9bf73155e6 (diff) | |
| download | pkgsrc-053f7336085d3bbdfc13c755e2c1d6b979dc4985.tar.gz | |
Update to 29.0
* Restore html5 audio playback under NetBSD
Changelog:
New
Significant new customization mode makes it easy to personalize your Web experience to access the features you use the most (learn more)
New
A new, easy to access menu sits in the right hand corner of Firefox and includes popular browser controls
New
Sleek new tabs provide an overall smoother look and fade into the background when not active
New
An interactive onboarding tour to guide users through the new Firefox changes
New
The ability to set up Firefox Sync by creating a Firefox account (learn more)
New
Gamepad API finalized and enabled (learn more)
New
HTTPS used for Yahoo Searches performed in en-US locale
New
Malay [ma] locale added
Changed
Clicking on a W3C Web Notification will switch to the originating tab
Developer
'box-sizing' (dropping the -moz- prefix) implemented (learn more)
Developer
Console object available in Web Workers (learn more)
Developer
Promises enabled by default (learn more)
Developer
SharedWorker enabled by default
Developer
<input type="number"> implemented and enabled
Developer
<input type="color"> implemented and enabled
Developer
Enabled ECMAScript Internationalization API
Developer
Add-on bar has been removed, content moved to navigation bar
Developer
Implemented URLSearchParams from the URL specification (see MDN for details )
Fixed
Various security fixes
Fixed in Firefox 29
MFSA 2014-47 Debugger can bypass XrayWrappers with JavaScript
MFSA 2014-46 Use-after-free in nsHostResolve
MFSA 2014-45 Incorrect IDNA domain name matching for wildcard certificates
MFSA 2014-44 Use-after-free in imgLoader while resizing images
MFSA 2014-43 Cross-site scripting (XSS) using history navigations
MFSA 2014-42 Privilege escalation through Web Notification API
MFSA 2014-41 Out-of-bounds write in Cairo
MFSA 2014-40 Firefox for Android addressbar suppression
MFSA 2014-39 Use-after-free in the Text Track Manager for HTML video
MFSA 2014-38 Buffer overflow when using non-XBL object as XBL
MFSA 2014-37 Out of bounds read while decoding JPG images
MFSA 2014-36 Web Audio memory corruption issues
MFSA 2014-35 Privilege escalation through Mozilla Maintenance Service Installer
MFSA 2014-34 Miscellaneous memory safety hazards (rv:29.0 / rv:24.5)
Diffstat (limited to 'www')
50 files changed, 761 insertions, 834 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 1410091a18f..f1d331b316b 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.161 2014/04/20 02:27:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.162 2014/04/30 15:07:17 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 28.0 +MOZ_BRANCH= 29.0 MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} -PKGREVISION= 5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 81f2dd5d07b..3917d74d9b3 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.78 2014/03/20 21:02:00 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.79 2014/04/30 15:07:17 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -26,8 +26,21 @@ 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 lib/firefox/browser/chrome/browser/content/browser/aboutSocialError.xhtml +lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.js lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutWelcomeBack.xhtml +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.css +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.js +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.xhtml +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/fonts.css +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/fonts/clearsans-regular.woff +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/fonts/firasans-light.woff +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/fonts/firasans-regular.woff +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/images/fox.png +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/images/graphic_sync_intro.png +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/images/graphic_sync_intro@2x.png +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/main.css +lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/normalize.css lib/firefox/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.css lib/firefox/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.js lib/firefox/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.xhtml @@ -72,6 +85,11 @@ lib/firefox/browser/chrome/browser/content/browser/certerror/aboutCertError.xhtm lib/firefox/browser/chrome/browser/content/browser/chatWindow.xul 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/customizableui/aboutCustomizing.xul +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/devtools/NetworkPanel.xhtml lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/connection-footer.js lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/connection-footer.xhtml @@ -87,20 +105,28 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/template lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/utils.js lib/firefox/browser/chrome/browser/content/browser/devtools/cleopatra.html lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/activeline.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/brace-fold.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/clike.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/closebrackets.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.css lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/comment-fold.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/comment.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/css.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.css lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/emacs.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/foldcode.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/foldgutter.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/htmlmixed.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/javascript.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/matchbrackets.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/mozilla.css lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/search.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/searchcursor.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/trailingspace.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/vim.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/xml-fold.js lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/xml.js lib/firefox/browser/chrome/browser/content/browser/devtools/commandline.css lib/firefox/browser/chrome/browser/content/browser/devtools/commandlineoutput.xhtml @@ -193,8 +219,6 @@ lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.js lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.xul lib/firefox/browser/chrome/browser/content/browser/newtab/preloaderContent.js lib/firefox/browser/chrome/browser/content/browser/nsContextMenu.js -lib/firefox/browser/chrome/browser/content/browser/openLocation.js -lib/firefox/browser/chrome/browser/content/browser/openLocation.xul 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 @@ -300,6 +324,9 @@ lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.js lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.xul lib/firefox/browser/chrome/browser/content/browser/sync/addDevice.js lib/firefox/browser/chrome/browser/content/browser/sync/addDevice.xul +lib/firefox/browser/chrome/browser/content/browser/sync/customize.css +lib/firefox/browser/chrome/browser/content/browser/sync/customize.js +lib/firefox/browser/chrome/browser/content/browser/sync/customize.xul lib/firefox/browser/chrome/browser/content/browser/sync/genericChange.js lib/firefox/browser/chrome/browser/content/browser/sync/genericChange.xul lib/firefox/browser/chrome/browser/content/browser/sync/key.xhtml @@ -324,12 +351,12 @@ 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/skin/classic/browser/Geolocation-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/Geolocation-64.png -lib/firefox/browser/chrome/browser/skin/classic/browser/Go-arrow.png lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png lib/firefox/browser/chrome/browser/skin/classic/browser/Privacy-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/Privacy-48.png lib/firefox/browser/chrome/browser/skin/classic/browser/Secure.png lib/firefox/browser/chrome/browser/skin/classic/browser/Security-broken.png +lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-inverted.png lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-small.png lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar.png lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError.css @@ -344,11 +371,30 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSyncTabs.css lib/firefox/browser/chrome/browser/skin/classic/browser/aboutTabCrashed.css lib/firefox/browser/chrome/browser/skin/classic/browser/aboutWelcomeBack.css lib/firefox/browser/chrome/browser/skin/classic/browser/actionicon-tab.png +lib/firefox/browser/chrome/browser/skin/classic/browser/browser-lightweightTheme.css lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css lib/firefox/browser/chrome/browser/skin/classic/browser/click-to-play-warning-stripes.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/background-noise-toolbar.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration-rtl.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customize-illustration.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeFavicon.ico +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-gridTexture.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/customizeMode-separatorVertical.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/info-icon-customizeTip.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/menuPanel-customizeFinish.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/panelUIOverlay.css +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/panelarrow-customizeTip.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy-bw.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy-bw@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy.png +lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/alerticon-warning.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/add.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/connection-footer.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/default-app-icon.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/device.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/error.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/help.css @@ -362,44 +408,30 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/roc lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/warning.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/arrow-e.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/background-noise-toolbar.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/blackBoxMessageEye.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-divider@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-end-selected-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-end-selected.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-end.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-middle-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-middle-selected.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-middle.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-start-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-start-selected-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-start-selected.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/ltr-start.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-end-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-end-selected-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-end-selected.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-end.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-middle-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-middle-selected.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-middle.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-start-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-start-selected-pressed.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-start-selected.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs/rtl-start.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/close.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/close@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-console.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-console@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-paintflashing.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-paintflashing@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-pick.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-pick@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-responsivemode.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-responsivemode@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-scratchpad.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-scratchpad@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-tilt.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-tilt@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/commandline-icon.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/commandline.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/computedview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/controls.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dark-theme.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox-eye.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-collapse.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-expand.png @@ -408,25 +440,33 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-play.p lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-in.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-out.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-over.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-toggleBreakpoints.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger.css -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-bottom.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-side.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-bottom@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dock-side@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dropmarker.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-breakpoint.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-debug-location.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/editor-error.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filters.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars-light.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/font-inspector.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/inspect-button.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/inspector.css -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-ltr.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-dark-rtl.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-ltr.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemArrow-rtl.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemToggle-light.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/itemToggle.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/layout-background-grid.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/layoutview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/light-theme.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass-light.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass-light@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glass@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/markup-view.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/netmonitor.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/noise.png @@ -446,15 +486,15 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.cs lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/splitview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger-paused.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-inspector.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-network.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-options.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-profiler.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-scratchpad.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-styleeditor.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-webconsole.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger-paused.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-inspector.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-network.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-options.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-profiler.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-scratchpad.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-styleeditor.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-webconsole.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png @@ -463,9 +503,13 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-v lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-vertical-light.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/undock.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tracer-icon.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tracer-icon@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/undock@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-delete.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-edit.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-lock.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/vview-open-inspector.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole_networkpanel.css @@ -473,7 +517,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/widgets.css lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/allDownloadsViewOverlay.css lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/buttons.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/contentAreaDownloadsView.css -lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow-small.png +lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow-menuPanel.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-finish.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-start.png @@ -495,6 +539,11 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https-mix lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https-mixed-display.png lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https.png lib/firefox/browser/chrome/browser/skin/classic/browser/identity.png +lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize.png +lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-exit.png +lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help.png +lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-small.png +lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel.png lib/firefox/browser/chrome/browser/skin/classic/browser/mixed-content-blocked-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/mixed-content-blocked-64.png lib/firefox/browser/chrome/browser/skin/classic/browser/monitor.png @@ -509,7 +558,10 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/notification-pluginNorma lib/firefox/browser/chrome/browser/skin/classic/browser/page-livemarks.png lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.css lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.png +lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-menu-arrow.png +lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.png +lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar-menuPanel.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/calendar.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/downloads.png @@ -517,11 +569,9 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/places/editBookmarkOverl 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/pageStarred.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/places.css lib/firefox/browser/chrome/browser/skin/classic/browser/places/query.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/star-icons.png -lib/firefox/browser/chrome/browser/skin/classic/browser/places/starPage.png 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 @@ -540,31 +590,46 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/p lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/mail.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png +lib/firefox/browser/chrome/browser/skin/classic/browser/reload-stop-go.png lib/firefox/browser/chrome/browser/skin/classic/browser/sanitizeDialog.css lib/firefox/browser/chrome/browser/skin/classic/browser/searchbar.css lib/firefox/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/social/chat-icons.png +lib/firefox/browser/chrome/browser/skin/classic/browser/social/gear_clicked.png +lib/firefox/browser/chrome/browser/skin/classic/browser/social/gear_default.png lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-64.png lib/firefox/browser/chrome/browser/skin/classic/browser/social/share-button-active.png lib/firefox/browser/chrome/browser/skin/classic/browser/social/share-button.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-128.png -lib/firefox/browser/chrome/browser/skin/classic/browser/sync-16-throbber.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-16.png -lib/firefox/browser/chrome/browser/skin/classic/browser/sync-24-throbber.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-32.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-bg.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-desktopIcon.png +lib/firefox/browser/chrome/browser/skin/classic/browser/sync-horizontalbar.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-mobileIcon.png lib/firefox/browser/chrome/browser/skin/classic/browser/sync-notification-24.png lib/firefox/browser/chrome/browser/skin/classic/browser/syncCommon.css +lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar.png +lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-menuPanel.png +lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar-inverted.png +lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar.png lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress.css lib/firefox/browser/chrome/browser/skin/classic/browser/syncQuota.css lib/firefox/browser/chrome/browser/skin/classic/browser/syncSetup.css lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-middle.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-start.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-overflow-border.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-end.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-selected-start.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-separator.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-end.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/edit-light.png @@ -582,6 +647,7 @@ lib/firefox/browser/chrome/en-US/locale/branding/brand.dtd lib/firefox/browser/chrome/en-US/locale/branding/brand.properties lib/firefox/browser/chrome/en-US/locale/branding/browserconfig.properties lib/firefox/browser/chrome/en-US/locale/browser-region/region.properties +lib/firefox/browser/chrome/en-US/locale/browser/aboutAccounts.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutCertError.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutDialog.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutHealthReport.dtd @@ -594,6 +660,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/appstrings.properties lib/firefox/browser/chrome/en-US/locale/browser/baseMenuOverlay.dtd lib/firefox/browser/chrome/en-US/locale/browser/browser.dtd lib/firefox/browser/chrome/en-US/locale/browser/browser.properties +lib/firefox/browser/chrome/en-US/locale/browser/customizableui/customizableWidgets.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/VariablesView.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/app-manager.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/app-manager.properties @@ -639,8 +706,6 @@ 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/openLocation.dtd -lib/firefox/browser/chrome/en-US/locale/browser/openLocation.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 @@ -680,6 +745,7 @@ 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/sitePermissions.properties lib/firefox/browser/chrome/en-US/locale/browser/syncBrand.dtd +lib/firefox/browser/chrome/en-US/locale/browser/syncCustomize.dtd lib/firefox/browser/chrome/en-US/locale/browser/syncGenericChange.properties lib/firefox/browser/chrome/en-US/locale/browser/syncKey.dtd lib/firefox/browser/chrome/en-US/locale/browser/syncProgress.dtd @@ -719,9 +785,13 @@ lib/firefox/browser/chrome/pdfjs/content/web/images/findbarButton-next-rtl.png lib/firefox/browser/chrome/pdfjs/content/web/images/findbarButton-next.png lib/firefox/browser/chrome/pdfjs/content/web/images/findbarButton-previous-rtl.png lib/firefox/browser/chrome/pdfjs/content/web/images/findbarButton-previous.png +lib/firefox/browser/chrome/pdfjs/content/web/images/grab.cur +lib/firefox/browser/chrome/pdfjs/content/web/images/grabbing.cur lib/firefox/browser/chrome/pdfjs/content/web/images/loading-icon.gif lib/firefox/browser/chrome/pdfjs/content/web/images/loading-small.png +lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-documentProperties.png lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-firstPage.png +lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-handTool.png lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-lastPage.png lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw.png lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.png @@ -751,7 +821,6 @@ lib/firefox/browser/chrome/pdfjs/content/web/l10n.js lib/firefox/browser/chrome/pdfjs/content/web/viewer.css lib/firefox/browser/chrome/pdfjs/content/web/viewer.html lib/firefox/browser/chrome/pdfjs/content/web/viewer.js -lib/firefox/browser/chrome/pdfjs/extension-files lib/firefox/browser/chrome/pdfjs/pdfjs.manifest lib/firefox/browser/components/ChromeProfileMigrator.js lib/firefox/browser/components/DownloadsStartup.js @@ -789,13 +858,20 @@ lib/firefox/browser/modules/AboutHome.jsm lib/firefox/browser/modules/BrowserNewTabPreloader.jsm lib/firefox/browser/modules/BrowserUITelemetry.jsm lib/firefox/browser/modules/ContentClick.jsm +lib/firefox/browser/modules/CustomizableUI.jsm +lib/firefox/browser/modules/CustomizableWidgets.jsm +lib/firefox/browser/modules/CustomizationTabPreloader.jsm +lib/firefox/browser/modules/CustomizeMode.jsm lib/firefox/browser/modules/DownloadsCommon.jsm lib/firefox/browser/modules/DownloadsLogger.jsm lib/firefox/browser/modules/DownloadsTaskbar.jsm +lib/firefox/browser/modules/DragPositionManager.jsm lib/firefox/browser/modules/MigrationUtils.jsm lib/firefox/browser/modules/NetworkPrioritizer.jsm +lib/firefox/browser/modules/PanelWideWidgetTracker.jsm lib/firefox/browser/modules/PlacesUIUtils.jsm lib/firefox/browser/modules/RecentWindow.jsm +lib/firefox/browser/modules/ScrollbarSampler.jsm lib/firefox/browser/modules/SharedFrame.jsm lib/firefox/browser/modules/SignInToWebsite.jsm lib/firefox/browser/modules/SitePermissions.jsm @@ -805,6 +881,7 @@ lib/firefox/browser/modules/UITour.jsm lib/firefox/browser/modules/devtools/AppCacheUtils.jsm lib/firefox/browser/modules/devtools/BreadcrumbsWidget.jsm lib/firefox/browser/modules/devtools/BuiltinCommands.jsm +lib/firefox/browser/modules/devtools/Chart.jsm lib/firefox/browser/modules/devtools/CmdDebugger.jsm lib/firefox/browser/modules/devtools/CmdEdit.jsm lib/firefox/browser/modules/devtools/CmdInspect.jsm @@ -818,9 +895,8 @@ lib/firefox/browser/modules/devtools/FloatingScrollbars.jsm lib/firefox/browser/modules/devtools/Jsbeautify.jsm lib/firefox/browser/modules/devtools/Parser.jsm lib/firefox/browser/modules/devtools/SideMenuWidget.jsm +lib/firefox/browser/modules/devtools/SimpleListWidget.jsm lib/firefox/browser/modules/devtools/SplitView.jsm -lib/firefox/browser/modules/devtools/StyleEditorDebuggee.jsm -lib/firefox/browser/modules/devtools/StyleEditorPanel.jsm lib/firefox/browser/modules/devtools/StyleEditorUI.jsm lib/firefox/browser/modules/devtools/StyleEditorUtil.jsm lib/firefox/browser/modules/devtools/StyleSheetEditor.jsm @@ -836,6 +912,7 @@ lib/firefox/browser/modules/devtools/app-manager/device-store.js lib/firefox/browser/modules/devtools/app-manager/simulators-store.js lib/firefox/browser/modules/devtools/app-manager/webapps-store.js lib/firefox/browser/modules/devtools/debugger/panel.js +lib/firefox/browser/modules/devtools/framework/selection.js lib/firefox/browser/modules/devtools/framework/sidebar.js lib/firefox/browser/modules/devtools/framework/target.js lib/firefox/browser/modules/devtools/framework/toolbox-hosts.js @@ -845,9 +922,7 @@ lib/firefox/browser/modules/devtools/framework/toolbox.js lib/firefox/browser/modules/devtools/gDevTools.jsm lib/firefox/browser/modules/devtools/gcli.jsm lib/firefox/browser/modules/devtools/inspector/breadcrumbs.js -lib/firefox/browser/modules/devtools/inspector/highlighter.js lib/firefox/browser/modules/devtools/inspector/inspector-panel.js -lib/firefox/browser/modules/devtools/inspector/selection.js lib/firefox/browser/modules/devtools/inspector/selector-search.js lib/firefox/browser/modules/devtools/main.js lib/firefox/browser/modules/devtools/markupview/html-editor.js @@ -870,10 +945,17 @@ lib/firefox/browser/modules/devtools/shared/observable-object.js lib/firefox/browser/modules/devtools/shared/telemetry.js lib/firefox/browser/modules/devtools/shared/theme-switching.js lib/firefox/browser/modules/devtools/shared/undo.js +lib/firefox/browser/modules/devtools/shared/widgets/CSSTransformPreviewer.js +lib/firefox/browser/modules/devtools/shared/widgets/FastListWidget.js lib/firefox/browser/modules/devtools/shared/widgets/Spectrum.js lib/firefox/browser/modules/devtools/shared/widgets/Tooltip.js +lib/firefox/browser/modules/devtools/sourceeditor/autocomplete.js +lib/firefox/browser/modules/devtools/sourceeditor/css-autocompleter.js +lib/firefox/browser/modules/devtools/sourceeditor/css-tokenizer.js lib/firefox/browser/modules/devtools/sourceeditor/debugger.js lib/firefox/browser/modules/devtools/sourceeditor/editor.js +lib/firefox/browser/modules/devtools/styleeditor/styleeditor-panel.js +lib/firefox/browser/modules/devtools/styleeditor/utils.js lib/firefox/browser/modules/devtools/styleinspector/computed-view.js lib/firefox/browser/modules/devtools/styleinspector/rule-view.js lib/firefox/browser/modules/devtools/styleinspector/style-inspector.js @@ -892,13 +974,16 @@ lib/firefox/browser/modules/devtools/webconsole/panel.js lib/firefox/browser/modules/devtools/webconsole/webconsole.js lib/firefox/browser/modules/distribution.js lib/firefox/browser/modules/offlineAppCache.jsm -lib/firefox/browser/modules/openLocationLastURL.jsm +lib/firefox/browser/modules/sessionstore/ContentRestore.jsm lib/firefox/browser/modules/sessionstore/DocShellCapabilities.jsm -lib/firefox/browser/modules/sessionstore/DocumentUtils.jsm -lib/firefox/browser/modules/sessionstore/Messenger.jsm +lib/firefox/browser/modules/sessionstore/FormData.jsm +lib/firefox/browser/modules/sessionstore/FrameTree.jsm +lib/firefox/browser/modules/sessionstore/GlobalState.jsm lib/firefox/browser/modules/sessionstore/PageStyle.jsm +lib/firefox/browser/modules/sessionstore/PrivacyFilter.jsm lib/firefox/browser/modules/sessionstore/PrivacyLevel.jsm lib/firefox/browser/modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm +lib/firefox/browser/modules/sessionstore/ScrollPosition.jsm lib/firefox/browser/modules/sessionstore/SessionCookies.jsm lib/firefox/browser/modules/sessionstore/SessionFile.jsm lib/firefox/browser/modules/sessionstore/SessionHistory.jsm @@ -910,7 +995,6 @@ lib/firefox/browser/modules/sessionstore/SessionWorker.js lib/firefox/browser/modules/sessionstore/TabAttributes.jsm lib/firefox/browser/modules/sessionstore/TabState.jsm lib/firefox/browser/modules/sessionstore/TabStateCache.jsm -lib/firefox/browser/modules/sessionstore/TextAndScrollData.jsm lib/firefox/browser/modules/sessionstore/Utils.jsm lib/firefox/browser/modules/sessionstore/XPathGenerator.jsm lib/firefox/browser/modules/tabview/utils.jsm @@ -1155,6 +1239,7 @@ lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js lib/firefox/chrome/toolkit/content/global/BrowserElementPanning.js lib/firefox/chrome/toolkit/content/global/XPCNativeWrapper.js +lib/firefox/chrome/toolkit/content/global/about.js lib/firefox/chrome/toolkit/content/global/about.xhtml lib/firefox/chrome/toolkit/content/global/aboutAbout.xhtml lib/firefox/chrome/toolkit/content/global/aboutCompartments.xhtml @@ -1170,6 +1255,7 @@ lib/firefox/chrome/toolkit/content/global/aboutSupport.xhtml lib/firefox/chrome/toolkit/content/global/aboutTelemetry.css lib/firefox/chrome/toolkit/content/global/aboutTelemetry.js lib/firefox/chrome/toolkit/content/global/aboutTelemetry.xhtml +lib/firefox/chrome/toolkit/content/global/aboutWebrtc.xhtml lib/firefox/chrome/toolkit/content/global/accessibility/AccessFu.css lib/firefox/chrome/toolkit/content/global/accessibility/clicked.ogg lib/firefox/chrome/toolkit/content/global/accessibility/content-script.js @@ -1395,6 +1481,7 @@ lib/firefox/chrome/toolkit/res/hiddenWindow.html lib/firefox/chrome/toolkit/res/html.css lib/firefox/chrome/toolkit/res/loading-image.png lib/firefox/chrome/toolkit/res/mathml.css +lib/firefox/chrome/toolkit/res/number-control.css lib/firefox/chrome/toolkit/res/plaintext.css lib/firefox/chrome/toolkit/res/quirk.css lib/firefox/chrome/toolkit/res/ua.css @@ -1428,9 +1515,9 @@ 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-sharp.gif lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up.gif -lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal-white.png +lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal-themed.svg lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal.svg -lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-vertical-white.png +lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-vertical-themed.svg lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-vertical.svg lib/firefox/chrome/toolkit/skin/classic/global/autocomplete.css lib/firefox/chrome/toolkit/skin/classic/global/button.css @@ -1477,7 +1564,11 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/Warning.png lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.png lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_favicon.png lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_large.png +lib/firefox/chrome/toolkit/skin/classic/global/icons/close-lunaBlue.png +lib/firefox/chrome/toolkit/skin/classic/global/icons/close-lunaOlive.png +lib/firefox/chrome/toolkit/skin/classic/global/icons/close-lunaSilver.png lib/firefox/chrome/toolkit/skin/classic/global/icons/close.png +lib/firefox/chrome/toolkit/skin/classic/global/icons/close.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/collapse.png lib/firefox/chrome/toolkit/skin/classic/global/icons/error-16.png lib/firefox/chrome/toolkit/skin/classic/global/icons/error-24.png @@ -1493,7 +1584,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/information-32.png lib/firefox/chrome/toolkit/skin/classic/global/icons/information-48.png lib/firefox/chrome/toolkit/skin/classic/global/icons/information-64.png lib/firefox/chrome/toolkit/skin/classic/global/icons/loading_16.png -lib/firefox/chrome/toolkit/skin/classic/global/icons/notloading_16.png lib/firefox/chrome/toolkit/skin/classic/global/icons/panelarrow-horizontal.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/panelarrow-vertical.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/question-16.png @@ -1537,6 +1627,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/media/videocontrols.css lib/firefox/chrome/toolkit/skin/classic/global/media/volume-empty.png lib/firefox/chrome/toolkit/skin/classic/global/media/volume-full.png lib/firefox/chrome/toolkit/skin/classic/global/menu.css +lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check.png lib/firefox/chrome/toolkit/skin/classic/global/menulist.css lib/firefox/chrome/toolkit/skin/classic/global/netError.css lib/firefox/chrome/toolkit/skin/classic/global/notification.css @@ -1693,7 +1784,7 @@ lib/firefox/components/SystemMessageManager.js lib/firefox/components/TCPServerSocket.js lib/firefox/components/TCPSocket.js lib/firefox/components/TCPSocketParentIntermediary.js -lib/firefox/components/TelemetryPing.js +lib/firefox/components/TelemetryStartup.js lib/firefox/components/Weave.js lib/firefox/components/WebVTTParserWrapper.js lib/firefox/components/Webapps.js @@ -1714,6 +1805,7 @@ lib/firefox/components/messageWakeupService.js lib/firefox/components/nsBlocklistService.js lib/firefox/components/nsContentDispatchChooser.js lib/firefox/components/nsContentPrefService.js +lib/firefox/components/nsCrashMonitor.js lib/firefox/components/nsDOMIdentity.js lib/firefox/components/nsDefaultCLH.js lib/firefox/components/nsDownloadManagerUI.js @@ -1826,6 +1918,8 @@ lib/firefox/modules/ContactService.jsm lib/firefox/modules/ContentPrefInstance.jsm lib/firefox/modules/ContentPrefService2.jsm lib/firefox/modules/ContentPrefStore.jsm +lib/firefox/modules/CrashMonitor.jsm +lib/firefox/modules/Credentials.jsm lib/firefox/modules/DOMIdentity.jsm lib/firefox/modules/DOMRequestHelper.jsm lib/firefox/modules/DataStore.jsm @@ -1857,6 +1951,8 @@ lib/firefox/modules/FrameWorkerContent.js lib/firefox/modules/FreeSpaceWatcher.jsm lib/firefox/modules/FxAccounts.jsm lib/firefox/modules/FxAccountsClient.jsm +lib/firefox/modules/FxAccountsCommon.js +lib/firefox/modules/FxAccountsUtils.jsm lib/firefox/modules/Geometry.jsm lib/firefox/modules/HealthReport.jsm lib/firefox/modules/Http.jsm @@ -1931,6 +2027,7 @@ lib/firefox/modules/Sqlite.jsm lib/firefox/modules/SystemMessagePermissionsChecker.jsm lib/firefox/modules/Task.jsm lib/firefox/modules/TelemetryFile.jsm +lib/firefox/modules/TelemetryPing.jsm lib/firefox/modules/TelemetryStopwatch.jsm lib/firefox/modules/TelemetryTimestamps.jsm lib/firefox/modules/ThirdPartyCookieProbe.jsm @@ -1957,6 +2054,19 @@ lib/firefox/modules/accessibility/Presentation.jsm lib/firefox/modules/accessibility/TouchAdapter.jsm lib/firefox/modules/accessibility/TraversalRules.jsm lib/firefox/modules/accessibility/Utils.jsm +lib/firefox/modules/commonjs/diffpatcher/History.md +lib/firefox/modules/commonjs/diffpatcher/License.md +lib/firefox/modules/commonjs/diffpatcher/Readme.md +lib/firefox/modules/commonjs/diffpatcher/diff.js +lib/firefox/modules/commonjs/diffpatcher/index.js +lib/firefox/modules/commonjs/diffpatcher/package.json +lib/firefox/modules/commonjs/diffpatcher/patch.js +lib/firefox/modules/commonjs/diffpatcher/rebase.js +lib/firefox/modules/commonjs/diffpatcher/test/common.js +lib/firefox/modules/commonjs/diffpatcher/test/diff.js +lib/firefox/modules/commonjs/diffpatcher/test/index.js +lib/firefox/modules/commonjs/diffpatcher/test/patch.js +lib/firefox/modules/commonjs/diffpatcher/test/tap.js lib/firefox/modules/commonjs/method/History.md lib/firefox/modules/commonjs/method/License.md lib/firefox/modules/commonjs/method/Readme.md @@ -1964,6 +2074,7 @@ lib/firefox/modules/commonjs/method/core.js lib/firefox/modules/commonjs/method/package.json lib/firefox/modules/commonjs/method/test/browser.js lib/firefox/modules/commonjs/method/test/common.js +lib/firefox/modules/commonjs/node/os.js lib/firefox/modules/commonjs/sdk/addon-page.js lib/firefox/modules/commonjs/sdk/addon/events.js lib/firefox/modules/commonjs/sdk/addon/host.js @@ -1980,7 +2091,7 @@ lib/firefox/modules/commonjs/sdk/content/content.js lib/firefox/modules/commonjs/sdk/content/events.js lib/firefox/modules/commonjs/sdk/content/loader.js lib/firefox/modules/commonjs/sdk/content/mod.js -lib/firefox/modules/commonjs/sdk/content/symbiont.js +lib/firefox/modules/commonjs/sdk/content/sandbox.js lib/firefox/modules/commonjs/sdk/content/thumbnail.js lib/firefox/modules/commonjs/sdk/content/utils.js lib/firefox/modules/commonjs/sdk/content/worker.js @@ -1990,7 +2101,6 @@ lib/firefox/modules/commonjs/sdk/core/heritage.js lib/firefox/modules/commonjs/sdk/core/namespace.js lib/firefox/modules/commonjs/sdk/core/promise.js lib/firefox/modules/commonjs/sdk/deprecated/api-utils.js -lib/firefox/modules/commonjs/sdk/deprecated/app-strings.js lib/firefox/modules/commonjs/sdk/deprecated/cortex.js lib/firefox/modules/commonjs/sdk/deprecated/errors.js lib/firefox/modules/commonjs/sdk/deprecated/events.js @@ -1998,8 +2108,8 @@ lib/firefox/modules/commonjs/sdk/deprecated/events/assembler.js lib/firefox/modules/commonjs/sdk/deprecated/light-traits.js lib/firefox/modules/commonjs/sdk/deprecated/list.js lib/firefox/modules/commonjs/sdk/deprecated/memory.js -lib/firefox/modules/commonjs/sdk/deprecated/observer-service.js -lib/firefox/modules/commonjs/sdk/deprecated/tab-browser.js +lib/firefox/modules/commonjs/sdk/deprecated/symbiont.js +lib/firefox/modules/commonjs/sdk/deprecated/traits-worker.js lib/firefox/modules/commonjs/sdk/deprecated/traits.js lib/firefox/modules/commonjs/sdk/deprecated/traits/core.js lib/firefox/modules/commonjs/sdk/deprecated/unit-test-finder.js @@ -2017,6 +2127,11 @@ lib/firefox/modules/commonjs/sdk/frame/utils.js lib/firefox/modules/commonjs/sdk/fs/path.js lib/firefox/modules/commonjs/sdk/hotkeys.js lib/firefox/modules/commonjs/sdk/indexed-db.js +lib/firefox/modules/commonjs/sdk/input/browser.js +lib/firefox/modules/commonjs/sdk/input/customizable-ui.js +lib/firefox/modules/commonjs/sdk/input/frame.js +lib/firefox/modules/commonjs/sdk/input/system.js +lib/firefox/modules/commonjs/sdk/input/window.js lib/firefox/modules/commonjs/sdk/io/buffer.js lib/firefox/modules/commonjs/sdk/io/byte-streams.js lib/firefox/modules/commonjs/sdk/io/data.js @@ -2042,6 +2157,7 @@ lib/firefox/modules/commonjs/sdk/loader/sandbox.js lib/firefox/modules/commonjs/sdk/net/url.js lib/firefox/modules/commonjs/sdk/net/xhr.js lib/firefox/modules/commonjs/sdk/notifications.js +lib/firefox/modules/commonjs/sdk/output/system.js lib/firefox/modules/commonjs/sdk/page-mod.js lib/firefox/modules/commonjs/sdk/page-mod/match-pattern.js lib/firefox/modules/commonjs/sdk/page-worker.js @@ -2100,13 +2216,21 @@ lib/firefox/modules/commonjs/sdk/test/assert.js lib/firefox/modules/commonjs/sdk/test/harness.js lib/firefox/modules/commonjs/sdk/test/httpd.js lib/firefox/modules/commonjs/sdk/test/loader.js +lib/firefox/modules/commonjs/sdk/test/memory.js lib/firefox/modules/commonjs/sdk/test/runner.js lib/firefox/modules/commonjs/sdk/test/tmp-file.js lib/firefox/modules/commonjs/sdk/test/utils.js lib/firefox/modules/commonjs/sdk/timers.js lib/firefox/modules/commonjs/sdk/ui.js -lib/firefox/modules/commonjs/sdk/ui/button.js +lib/firefox/modules/commonjs/sdk/ui/button/action.js +lib/firefox/modules/commonjs/sdk/ui/button/contract.js +lib/firefox/modules/commonjs/sdk/ui/button/toggle.js lib/firefox/modules/commonjs/sdk/ui/button/view.js +lib/firefox/modules/commonjs/sdk/ui/button/view/events.js +lib/firefox/modules/commonjs/sdk/ui/frame.js +lib/firefox/modules/commonjs/sdk/ui/frame/model.js +lib/firefox/modules/commonjs/sdk/ui/frame/view.html +lib/firefox/modules/commonjs/sdk/ui/frame/view.js lib/firefox/modules/commonjs/sdk/ui/id.js lib/firefox/modules/commonjs/sdk/ui/sidebar.js lib/firefox/modules/commonjs/sdk/ui/sidebar/actions.js @@ -2115,6 +2239,10 @@ lib/firefox/modules/commonjs/sdk/ui/sidebar/namespace.js lib/firefox/modules/commonjs/sdk/ui/sidebar/utils.js lib/firefox/modules/commonjs/sdk/ui/sidebar/view.js lib/firefox/modules/commonjs/sdk/ui/state.js +lib/firefox/modules/commonjs/sdk/ui/state/events.js +lib/firefox/modules/commonjs/sdk/ui/toolbar.js +lib/firefox/modules/commonjs/sdk/ui/toolbar/model.js +lib/firefox/modules/commonjs/sdk/ui/toolbar/view.js lib/firefox/modules/commonjs/sdk/url.js lib/firefox/modules/commonjs/sdk/url/utils.js lib/firefox/modules/commonjs/sdk/util/array.js @@ -2127,6 +2255,7 @@ lib/firefox/modules/commonjs/sdk/util/match-pattern.js lib/firefox/modules/commonjs/sdk/util/object.js lib/firefox/modules/commonjs/sdk/util/registry.js lib/firefox/modules/commonjs/sdk/util/rules.js +lib/firefox/modules/commonjs/sdk/util/sequence.js lib/firefox/modules/commonjs/sdk/util/uuid.js lib/firefox/modules/commonjs/sdk/view/core.js lib/firefox/modules/commonjs/sdk/widget.js @@ -2171,7 +2300,9 @@ lib/firefox/modules/devtools/pretty-fast.js lib/firefox/modules/devtools/server/actors/childtab.js lib/firefox/modules/devtools/server/actors/device.js lib/firefox/modules/devtools/server/actors/gcli.js +lib/firefox/modules/devtools/server/actors/highlighter.js lib/firefox/modules/devtools/server/actors/inspector.js +lib/firefox/modules/devtools/server/actors/memory.js lib/firefox/modules/devtools/server/actors/pretty-print-worker.js lib/firefox/modules/devtools/server/actors/profiler.js lib/firefox/modules/devtools/server/actors/root.js @@ -2179,6 +2310,7 @@ lib/firefox/modules/devtools/server/actors/script.js lib/firefox/modules/devtools/server/actors/string.js lib/firefox/modules/devtools/server/actors/styleeditor.js lib/firefox/modules/devtools/server/actors/styles.js +lib/firefox/modules/devtools/server/actors/stylesheets.js lib/firefox/modules/devtools/server/actors/tracer.js lib/firefox/modules/devtools/server/actors/webapps.js lib/firefox/modules/devtools/server/actors/webbrowser.js @@ -2194,6 +2326,7 @@ lib/firefox/modules/devtools/toolkit/webconsole/client.js lib/firefox/modules/devtools/toolkit/webconsole/network-helper.js lib/firefox/modules/devtools/toolkit/webconsole/utils.js lib/firefox/modules/devtools/touch-events.js +lib/firefox/modules/identity/FirefoxAccounts.jsm lib/firefox/modules/identity/Identity.jsm lib/firefox/modules/identity/IdentityProvider.jsm lib/firefox/modules/identity/IdentityStore.jsm @@ -2224,6 +2357,7 @@ lib/firefox/modules/osfile/ospath_win.jsm lib/firefox/modules/reflect.jsm lib/firefox/modules/services-common/async.js lib/firefox/modules/services-common/bagheeraclient.js +lib/firefox/modules/services-common/hawk.js lib/firefox/modules/services-common/observers.js lib/firefox/modules/services-common/rest.js lib/firefox/modules/services-common/storageservice.js @@ -2234,6 +2368,7 @@ lib/firefox/modules/services-crypto/WeaveCrypto.js lib/firefox/modules/services-crypto/utils.js lib/firefox/modules/services-sync/addonsreconciler.js lib/firefox/modules/services-sync/addonutils.js +lib/firefox/modules/services-sync/browserid_identity.js lib/firefox/modules/services-sync/constants.js lib/firefox/modules/services-sync/engines.js lib/firefox/modules/services-sync/engines/addons.js @@ -2244,6 +2379,7 @@ lib/firefox/modules/services-sync/engines/history.js lib/firefox/modules/services-sync/engines/passwords.js lib/firefox/modules/services-sync/engines/prefs.js lib/firefox/modules/services-sync/engines/tabs.js +lib/firefox/modules/services-sync/healthreport.jsm lib/firefox/modules/services-sync/identity.js lib/firefox/modules/services-sync/jpakeclient.js lib/firefox/modules/services-sync/keys.js @@ -2255,6 +2391,7 @@ lib/firefox/modules/services-sync/resource.js lib/firefox/modules/services-sync/rest.js lib/firefox/modules/services-sync/service.js lib/firefox/modules/services-sync/stages/cluster.js +lib/firefox/modules/services-sync/stages/declined.js lib/firefox/modules/services-sync/stages/enginesync.js lib/firefox/modules/services-sync/status.js lib/firefox/modules/services-sync/userapi.js @@ -2267,7 +2404,10 @@ lib/firefox/modules/services/healthreport/providers.jsm lib/firefox/modules/services/metrics/dataprovider.jsm lib/firefox/modules/services/metrics/providermanager.jsm lib/firefox/modules/services/metrics/storage.jsm +lib/firefox/modules/sqlite/sqlite_internal.js lib/firefox/modules/vtt.jsm +lib/firefox/modules/workers/lz4.js +lib/firefox/modules/workers/lz4_internal.js lib/firefox/modules/workers/require.js lib/firefox/mozilla-xremote-client lib/firefox/platform.ini diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 2e172711877..c635a21190e 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,107 +1,105 @@ -$NetBSD: distinfo,v 1.137 2014/04/19 23:16:39 ryoon Exp $ +$NetBSD: distinfo,v 1.138 2014/04/30 15:07:17 ryoon Exp $ -SHA1 (firefox-28.0.source.tar.bz2) = f78517836ceca0cd2a0d3db1f282985c616e3fae -RMD160 (firefox-28.0.source.tar.bz2) = 71124b36dca319eaa0de268ce4f6133f0ceca4f9 -Size (firefox-28.0.source.tar.bz2) = 134968426 bytes -SHA1 (patch-aa) = c50d30d8bf2f8dbba938e4f5542b9d8b6e395e4e +SHA1 (firefox-29.0.source.tar.bz2) = db8fa9a4863bd7427115adec01b7db0e494dffa6 +RMD160 (firefox-29.0.source.tar.bz2) = f98208b799067e6fb688713035f32cce0d32f84b +Size (firefox-29.0.source.tar.bz2) = 143163777 bytes +SHA1 (patch-aa) = 156ae389f81c19e8dbd776ef4b154b453ca5f1fe SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be -SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2 +SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 -SHA1 (patch-as) = 3ce6e71d638ac1b6dec6737c92246e2dc7ff5d84 +SHA1 (patch-as) = fd8d7ad61f5557693af96bb5fe9439f8cdb347db SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 +SHA1 (patch-browser_app_nsBrowserApp.cpp) = 93e7fef0f27a755204429e2b436f44b1ba93c5eb SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3 SHA1 (patch-browser_installer_package-manifest.in) = d5792a3c5dd7498d24ac0426aacf7d0b9a842c67 SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac868e95041b5d87611ee32c2b6330 SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f -SHA1 (patch-browser_themes_shared_devtools_common.css) = 37947ab5b523af83b58fd2dce3ed13599e5da9ef -SHA1 (patch-browser_themes_shared_devtools_highlighter.inc.css) = 7c2a81b9f62a34d6d93b142508771f90954a6080 SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7 +SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518 SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c -SHA1 (patch-config_Makefile.in) = 5ceb934dfc4bb02c8b1968a7bf8d004348a7ced1 -SHA1 (patch-config_baseconfig.mk) = 9056301a239b7a927ee06a8f53702aece9780dc4 -SHA1 (patch-config_external_moz.build) = 52de4e24f4aa7446554c5906f9b475dbe956be5c +SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1 +SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075 +SHA1 (patch-config_external_moz.build) = 03b9351b72938b5a339bd923e6e945a87afbdcbd SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b -SHA1 (patch-config_system-headers) = d74398cc427ebd436f6c3871f123feec7afa5926 +SHA1 (patch-config_system-headers) = e6d68f60e24a29fd72c7d40c3001cabd5ea17361 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 SHA1 (patch-content_base_src_Makefile.in) = 44016467828b787343444ba62c12637988e0f903 -SHA1 (patch-content_media_Makefile.in) = 56ecae4124aad54cffeba63c6e094e7a305c5b4e -SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 1659560ccc68ef5e3d1b41be98a489d53d9e359f +SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157 +SHA1 (patch-content_media_AudioStream.h) = 905a0ff67c131fbf50670b5836bff84f1284d0c4 +SHA1 (patch-content_media_Makefile.in) = 7aaac3bac94c9463ca324e05ebab4b9858f46fc5 +SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = ad6921fc0481a59be7988e4f03099412c1c5a4ff SHA1 (patch-content_media_gstreamer_GStreamerAllocator.h) = c2dd30332b3a13aea81d0e60ae2da535973cdc57 SHA1 (patch-content_media_gstreamer_GStreamerFormatHelper.cpp) = 5728aad1f00f8600dd5c512c727640883c2bf225 -SHA1 (patch-content_media_gstreamer_GStreamerFunctionList.h) = 6bbcf08a4f5c710bf08a0e94945fcbf1b3e8e6bf +SHA1 (patch-content_media_gstreamer_GStreamerFunctionList.h) = 50ee48661c4491e45385c7b16da0e6012a22519d SHA1 (patch-content_media_gstreamer_GStreamerLoader.cpp) = a86bc37efb7012a9a360dd41b9f84d87c783bdda SHA1 (patch-content_media_gstreamer_GStreamerLoader.h) = 0458ab4ecab7f76133c31af2ed952e0eeff71164 -SHA1 (patch-content_media_gstreamer_GStreamerReader-0.10.cpp) = ed9853effc8ee2999bdad34a6d59eb9e2897c43a -SHA1 (patch-content_media_gstreamer_GStreamerReader.cpp) = bf26c4e2bdf3cfa644470d0a0dc8ff48f1ad42a1 +SHA1 (patch-content_media_gstreamer_GStreamerReader-0.10.cpp) = c6d97000395bbf16187c6f2d985f51edda1aab9f +SHA1 (patch-content_media_gstreamer_GStreamerReader.cpp) = 99fd1f24ed5f3f350fdbc39d56694fa77039a2d3 SHA1 (patch-content_media_gstreamer_GStreamerReader.h) = 118f83ebdec7bcda4f0ced8064a9b3c6cad78172 SHA1 (patch-content_media_gstreamer_moz.build) = c38bd0d432577b55429ae5466b1b02c7b6fd1901 SHA1 (patch-content_media_test_manifest.js) = 5b98d9eb16f898211fc0e30d821303bf72e8aaeb SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e -SHA1 (patch-dom_system_OSFileConstants.cpp) = 1a3db7a122363c4caba2627bcb5a52b66272820d +SHA1 (patch-dom_system_OSFileConstants.cpp) = 6c45e3d5fa3369432ff59871a8cbc6176f297794 SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a2a0652d0eac018fda06e729bf5ba786dd8a3866 SHA1 (patch-gfx__skia__include__core__SkPreConfig.h) = 6f99cf0eb5d4617d529c378707f537bc1e5cb28f SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9 SHA1 (patch-gfx_skia_Makefile.in) = df1592fcab275a13e7015c9d73283f4326898186 SHA1 (patch-gfx_skia_moz.build) = 1eb1b2c8948f7faaab267cace79f179fb258523c -SHA1 (patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp) = 916d61bd9613df0fe2b6cfd0d6b1e49ffc40da5f -SHA1 (patch-gfx_thebes_Makefile.in) = 42c12be1c2064d448c88edb542cdea0451f8f372 +SHA1 (patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp) = 19342e66383e224b34f98c9d58ad05d4041dd9f4 +SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574 SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee -SHA1 (patch-intl_unicharutil_util_Makefile.in) = 6ea0831e6cdcae43f8253a97766e783ad7b84b55 +SHA1 (patch-intl_unicharutil_util_Makefile.in) = c8f37cc420ba26b63c66fbbf69b13a8b4fea43fc SHA1 (patch-ipc_chromium_Makefile.in) = 3a1f5b218217fc8e5e9a07195054618071c38059 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 7bc83577a9678542db4dff7dda19d751ff6d78c1 SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 677f0b5ccdcde7a8551f2d07d2a472361a5da03f SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9d6d074b1692c6b4e722bfac8d67c66040a6fa76 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 43645104f62ecd6e1aa4b17078d6719e5eda8896 -SHA1 (patch-ipc_chromium_src_base_file__version__info.h) = 4096226b2586863a4106bfb5cfadd95bffb9d717 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 12f3e063cf3fef23f0e3e0fdba5d5a4c1fc32af3 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = e386bfd56ae6f77ef1aaadd0fa81af147a09f75d SHA1 (patch-ipc_chromium_src_base_process__util.h) = 31b592d69d3c4f63642dae3c81c771ee3dfa8502 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 6b2611cc902f17e726aabcf4fb5fff2c71852408 -SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 30646e3cd2d010a75e2a385cfa1f1f57eb74fac2 +SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 27890c56194e483fc0758ed767ca5795cc5112eb SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 337a0b4a5d51d68c7699b79c7591b953ea23ca67 SHA1 (patch-ipc_chromium_src_build_build__config.h) = af5a10df7d8fe9715f0e43cd6be14f8f20c53517 SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b144a225bacf41833e059cb400 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 0fccd3224433017c7214b2615aa2c6c2d8ed658f -SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905 -SHA1 (patch-js__src__vm__SPSProfiler.cpp) = ac6da8a477cd0a768a513462b7bc3b871fd280f1 +SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475 SHA1 (patch-js_src_Makefile.in) = f6ce5f02a9292e3e524424c5e810850232efe524 -SHA1 (patch-js_src_config_system-headers) = db1389af40dc0386ed8c3491a377668f5d29b6a1 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc SHA1 (patch-js_src_gc_Memory.cpp) = 3db31553ec6f7b1fac4fd4ce11b77be1ea4208b8 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 SHA1 (patch-mb) = b661abce429a88554fca6c930b4dbf71ba6bb5cb +SHA1 (patch-media_libcubeb_src_Makefile.in) = 671fff09dedc1aa7aea251b4856c12d78b19b23b SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 5ef0de0ac875334e959ff0d4bfa43a2e5ab087b9 SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a -SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = 061b46d1ee33c055a5b39e6b20f47b80bcde0c86 +SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696 SHA1 (patch-media_libtheora_Makefile.in) = 80ac9cb20760fe4d94047f7cb1c6a16bbdd6b505 SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53 -SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = 056172e54652caa60b6fee26e3073a6da83e734c -SHA1 (patch-media_webrtc_signaling_signaling.gyp) = ed52bb96a7ba6d7126b09871fe5ac81983cefdc1 -SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 4a9f9d3e4be79d711aa1f44f2982ec660ce5b15a -SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = ac7250e37f30353af0a7789b7234f3bc56a3ecd7 -SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = f67c537662a994101125d8a10d0432c68d28f2ea -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 3cb1d688a19a9c211cc79fcf1c6879d8a5565433 -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = be78d8d723c0560e08476a8d60b909772da49579 +SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 087e8788c72b96d2059ca82ce4282d78aed546da +SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = 12a0d9c3f558c8e84ac865458206c33708b9e684 +SHA1 (patch-media_webrtc_signaling_signaling.gyp) = 91d5fcc2409b1398c84dedc9697107f815de48fc +SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 509e07cba9aeca256ef28674862ce81bac7253bd +SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 4ff5796e15d9aa6adb8495d6f2e5a7f0445a0fac +SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = ae0fcc32f7d146d2a494b42a58a9fcbb73c2a74c +SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9e555f0bafccfdc3d645bb51c036de32f61cf866 +SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 71ecd6dc95134f86a7a823a1b186b1136ebd51c9 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 4721f01a89ef353c9b743b3cfefda4877d5283d9 SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 78a9522f0e37cfc3ec8267e6c15de9dba0ec7ff3 SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543 -SHA1 (patch-memory_mozalloc_fallible.h) = 8a60151465a07570db9636313f504004d73941d5 -SHA1 (patch-memory_mozalloc_mozalloc.cpp) = 802af1da05f60fcf8c206568c2adc396e3bb0e06 -SHA1 (patch-memory_mozalloc_mozalloc.h) = f2d9fd333ec28c075dfde8a6ee414b67b7f2cd26 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9d9036ddd28c7b8ce37860e0120df2997a3a0c59 SHA1 (patch-mfbt_Poison.cpp) = b582943c02f57835451c9eecd004c9912d42ce84 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a -SHA1 (patch-netwerk_dns_Makefile.in) = 64b7ba4ec4f984e07c8c911cfb2261b08ea6aa55 +SHA1 (patch-netwerk_dns_Makefile.in) = b6bd9814d909dd6f7cff10dbeac3bedd79c2508e SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 31d49db31b1e130f1b455f883e5b7c606d438771 SHA1 (patch-netwerk_sctp_src_netinet_sctp__os__userspace.h) = b3f94ac0f2bd652371fef22c642b14bf30162998 SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = 421b6e071a9934567ccba337033a42208e6e4bd5 @@ -113,12 +111,10 @@ SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = c5711adc111dc8413a7234e7d58 SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4 SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 -SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452 -SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm) = b809c17231d1d5eecaed6f6aa0ddb34685fb6800 +SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm) = 12f5722de5d59f06236cad3d188c9503387805c1 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 274b06bd4bfea5b6d7d67c0d39a484d179ed560c -SHA1 (patch-toolkit_library_Makefile.in) = ccd62ca282cf41eeb6637672920083ab269e1c33 -SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa +SHA1 (patch-toolkit_library_Makefile.in) = 481172e5c62b862633708106a1708a941c9ffb9d SHA1 (patch-toolkit_toolkit.mozbuild) = 0993d50cc02c2b421e6de087dfb0a9cb30562c6b SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa @@ -128,7 +124,7 @@ SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488 SHA1 (patch-xl) = 9555b86c72b2e144e341d6af1dbfbc07cc8c94db SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657 -SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 330635b2b0ad1efec6f2296ac1dedd458c9248dc +SHA1 (patch-xpcom_base_nsStackWalk.cpp) = b4a21504a6884ba08005c34ee7d7cc9dfeeaf9b4 SHA1 (patch-xpcom_base_nscore.h) = b1a190d8ef4478b882daeceda51584f947555a28 SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30 SHA1 (patch-xpcom_io_nsLocalFileUnix.cpp) = 3de3345eb98ffe78628d5bac672ce4ab5806270e diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index 41abe1454fa..bcb91af3b38 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.28 2014/04/09 06:13:50 obache Exp $ +# $NetBSD: mozilla-common.mk,v 1.29 2014/04/30 15:07:17 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -26,7 +26,7 @@ GCC_REQD+= 4.5 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh - +CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure CONFIGURE_ARGS+= --disable-tests CONFIGURE_ARGS+= --disable-pedantic @@ -35,6 +35,7 @@ CONFIGURE_ARGS+= --with-pthreads CONFIGURE_ARGS+= --disable-javaxpcom CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 CONFIGURE_ARGS+= --enable-gstreamer +#CONFIGURE_ARGS+= --disable-gstreamer CONFIGURE_ARGS+= --enable-svg CONFIGURE_ARGS+= --enable-mathml CONFIGURE_ARGS+= --enable-pango @@ -49,6 +50,15 @@ CONFIGURE_ARGS+= --with-system-nspr CONFIGURE_ARGS+= --with-system-jpeg CONFIGURE_ARGS+= --with-system-zlib CONFIGURE_ARGS+= --with-system-bz2 +# 1.2 or later is required. +#CONFIGURE_ARGS+= --with-system-theora +#CONFIGURE_ARGS+= --with-system-ogg +#CONFIGURE_ARGS+= --with-system-tremor +#CONFIGURE_ARGS+= --with-system-vorbis +# opus support requires Ogg Theora support +#CONFIGURE_ARGS+= --with-system-opus +CONFIGURE_ARGS+= --with-system-graphite2 +CONFIGURE_ARGS+= --with-system-harfbuzz CONFIGURE_ARGS+= --with-system-libevent=${BUILDLINK_PREFIX.libevent} CONFIGURE_ARGS+= --enable-system-sqlite CONFIGURE_ARGS+= --disable-crashreporter @@ -165,6 +175,9 @@ PREFER.bzip2?= pkgsrc .endif .include "../../archivers/bzip2/buildlink3.mk" +#.include "../../audio/libopus/buildlink3.mk" +#.include "../../audio/tremor/buildlink3.mk" +#.include "../../audio/libvorbis/buildlink3.mk" BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.0.2 CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al .include "../../databases/sqlite3/buildlink3.mk" @@ -181,6 +194,9 @@ BUILDLINK_API_DEPENDS.nss+= nss>=3.15.4 .include "../../graphics/MesaLib/buildlink3.mk" BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 .include "../../graphics/cairo/buildlink3.mk" +.include "../../graphics/graphite2/buildlink3.mk" +#.include "../../multimedia/libogg/buildlink3.mk" +#.include "../../multimedia/libtheora/buildlink3.mk" .include "../../multimedia/libvpx/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" .include "../../textproc/hunspell/buildlink3.mk" diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index 1356e8e81f2..5d4c4a69d32 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-aa,v 1.22 2014/04/30 15:07:18 ryoon Exp $ ---- configure.in.orig 2014-03-15 05:19:10.000000000 +0000 +--- configure.in.orig 2014-04-18 02:02:39.000000000 +0000 +++ configure.in -@@ -2544,118 +2544,15 @@ MOZ_CXX11 +@@ -2534,118 +2534,15 @@ MOZ_CXX11 AC_LANG_C @@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ fi # GNU_CC # visibility hidden flag for Sun Studio on Solaris -@@ -3724,6 +3621,14 @@ if test -n "$YASM"; then +@@ -3711,6 +3608,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -143,7 +143,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3751,11 +3656,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -3738,11 +3643,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -156,7 +156,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -3921,6 +3822,22 @@ fi +@@ -3940,6 +3841,22 @@ fi AC_SUBST(MOZ_NATIVE_ICU) dnl ======================================================== @@ -179,7 +179,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ dnl Java SDK support dnl ======================================================== -@@ -3955,6 +3872,7 @@ MOZ_SAMPLE_TYPE_FLOAT32= +@@ -3974,6 +3891,7 @@ MOZ_SAMPLE_TYPE_FLOAT32= MOZ_SAMPLE_TYPE_S16= MOZ_OPUS=1 MOZ_WEBM=1 @@ -187,9 +187,9 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ MOZ_DIRECTSHOW= MOZ_WMF= MOZ_FMP4= -@@ -5136,6 +5054,9 @@ if test -n "$MOZ_WEBRTC"; then - MOZ_VP8=1 - MOZ_VP8_ERROR_CONCEALMENT=1 +@@ -5135,6 +5053,9 @@ if test -n "$MOZ_WEBRTC"; then + MOZ_VPX=1 + MOZ_VPX_ERROR_CONCEALMENT=1 + dnl with libv4l2 we can support more cameras + PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2) @@ -197,13 +197,13 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5158,15 +5079,18 @@ AC_SUBST(MOZ_SRTP) +@@ -5157,15 +5078,18 @@ AC_SUBST(MOZ_SRTP) dnl Use integers over floats for audio on B2G and Android, because audio dnl backends for those platforms don't support floats. -if test "$OS_TARGET" = "Android"; then +case "$OS_TARGET" in -+ndroid|DragonFly|FreeBSD|NetBSD|OpenBSD) ++Android|DragonFly|FreeBSD|OpenBSD) MOZ_SAMPLE_TYPE_S16=1 AC_DEFINE(MOZ_SAMPLE_TYPE_S16) AC_SUBST(MOZ_SAMPLE_TYPE_S16) @@ -219,7 +219,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ dnl ======================================================== dnl = Disable Speech API code -@@ -5230,6 +5154,40 @@ if test -n "$MOZ_OGG"; then +@@ -5229,6 +5153,57 @@ if test -n "$MOZ_OGG"; then fi dnl ======================================================== @@ -229,7 +229,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ +MOZ_ARG_WITH_BOOL(system-ogg, +[ --with-system-ogg Use system libogg (located with pkgconfig)], +MOZ_NATIVE_OGG=1, -+MOZ_NATIVE_OGG= ) ++MOZ_NATIVE_OGG=) + +if test -n "$MOZ_NATIVE_OGG"; then + PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1) @@ -246,7 +246,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ +MOZ_ARG_WITH_BOOL(system-vorbis, +[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], +MOZ_NATIVE_VORBIS=1, -+MOZ_NATIVE_VORBIS= ) ++MOZ_NATIVE_VORBIS=) + +if test -n "$MOZ_NATIVE_VORBIS"; then + PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4) @@ -257,10 +257,27 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ +AC_SUBST(MOZ_VORBIS_LIBS) + +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_NATIVE_TREMOR=1, ++MOZ_NATIVE_TREMOR=) ++ ++if test -n "$MOZ_NATIVE_TREMOR"; then ++ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) ++fi ++ ++AC_SUBST(MOZ_NATIVE_TREMOR) ++AC_SUBST(MOZ_TREMOR_CFLAGS) ++AC_SUBST(MOZ_TREMOR_LIBS) ++ ++dnl ======================================================== dnl = Disable Opus audio codec support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(opus, -@@ -5238,6 +5196,25 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5237,6 +5212,76 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -270,7 +287,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ +MOZ_ARG_WITH_BOOL(system-opus, +[ --with-system-opus Use system libopus (located with pkgconfig)], +MOZ_NATIVE_OPUS=1, -+MOZ_NATIVE_OPUS= ) ++MOZ_NATIVE_OPUS=) + +if test -n "$MOZ_NATIVE_OPUS"; then + PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1) @@ -283,15 +300,67 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ +AC_SUBST(MOZ_OPUS_LIBS) + +dnl ======================================================== ++dnl Check for libtheora ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-theora, ++[ --with-system-theora Use system libtheora (located with pkgconfig)], ++MOZ_NATIVE_THEORA=1, ++MOZ_NATIVE_THEORA=) ++ ++if test -n "$MOZ_NATIVE_THEORA"; then ++ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) ++fi ++ ++AC_SUBST(MOZ_NATIVE_THEORA) ++AC_SUBST(MOZ_THEORA_CFLAGS) ++AC_SUBST(MOZ_THEORA_LIBS) ++ ++dnl ======================================================== ++dnl Check for libspeex resampler ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-speex, ++[ --with-system-speex Use system libspeex (located with pkgconfig)], ++MOZ_NATIVE_SPEEX=1, ++MOZ_NATIVE_SPEEX=) ++ ++if test -n "$MOZ_NATIVE_SPEEX"; then ++ PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2) ++fi ++ ++AC_SUBST(MOZ_NATIVE_SPEEX) ++AC_SUBST(MOZ_SPEEX_CFLAGS) ++AC_SUBST(MOZ_SPEEX_LIBS) ++ ++dnl ======================================================== ++dnl Check for libsoundtouch ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-soundtouch, ++[ --with-system-soundtouch Use system libsoundtouch (located with pkgconfig)], ++MOZ_NATIVE_SOUNDTOUCH=1, ++MOZ_NATIVE_SOUNDTOUCH=) ++ ++if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then ++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0) ++fi ++ ++AC_SUBST(MOZ_NATIVE_SOUNDTOUCH) ++AC_SUBST(MOZ_SOUNDTOUCH_CFLAGS) ++AC_SUBST(MOZ_SOUNDTOUCH_LIBS) ++ ++dnl ======================================================== dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -@@ -5606,43 +5583,60 @@ dnl = Enable GStreamer - dnl ======================================================== - if test "$OS_TARGET" = "Linux"; then - MOZ_GSTREAMER=1 -+ GST_API_VERSION=0.10 - fi +@@ -5615,44 +5660,61 @@ WINNT|Darwin|Android) + ;; + *) + MOZ_GSTREAMER=1 ++ GST_API_VERSION=0.10 + ;; + esac -MOZ_ARG_ENABLE_BOOL(gstreamer, -[ --enable-gstreamer Enable GStreamer support], @@ -371,44 +440,51 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ fi -@@ -7424,7 +7418,10 @@ dnl ==================================== - dnl = Support for gcc stack unwinding (from gcc 3.3) - dnl ======================================================== - if test -z "$SKIP_LIBRARY_CHECKS"; then -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS - MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace)) -+ AC_LANG_RESTORE +@@ -7939,6 +8001,52 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== -@@ -7870,6 +7867,34 @@ if test "$USE_FC_FREETYPE"; then - fi - - dnl ======================================================== -+dnl Check for graphite2 and harfbuzz ++dnl Check for harfbuzz +dnl ======================================================== + +MOZ_ARG_WITH_BOOL(system-harfbuzz, +[ --with-system-harfbuzz Use system harfbuzz (located with pkgconfig)], +MOZ_NATIVE_HARFBUZZ=1, -+MOZ_NATIVE_HARFBUZZ= ) ++MOZ_NATIVE_HARFBUZZ=) + +if test -n "$MOZ_NATIVE_HARFBUZZ"; then + PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25) +fi ++ +AC_SUBST(MOZ_NATIVE_HARFBUZZ) +AC_SUBST(MOZ_HARFBUZZ_CFLAGS) +AC_SUBST(MOZ_HARFBUZZ_LIBS) + ++dnl ======================================================== ++dnl Check for graphite2 ++dnl ======================================================== +MOZ_ARG_WITH_BOOL(system-graphite2, +[ --with-system-graphite2 Use system graphite2 (located with pkgconfig)], +MOZ_NATIVE_GRAPHITE2=1, -+MOZ_NATIVE_GRAPHITE2= ) ++MOZ_NATIVE_GRAPHITE2=) + +if test -n "$MOZ_NATIVE_GRAPHITE2"; then -+ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2 >= 1.2.4) ++ PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2) ++ ++ dnl graphite2.pc has bogus version, check manually ++ 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,2,4) ++ #error "Insufficient graphite2 version." ++ #endif ++ ], [], ++ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) +fi ++ +AC_SUBST(MOZ_NATIVE_GRAPHITE2) +AC_SUBST(MOZ_GRAPHITE2_CFLAGS) +AC_SUBST(MOZ_GRAPHITE2_LIBS) @@ -417,7 +493,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ dnl Check for pixman and cairo dnl ======================================================== -@@ -8118,7 +8143,7 @@ case "$OS_TARGET" in +@@ -8189,7 +8297,7 @@ case "$OS_TARGET" in NECKO_WIFI=1 fi ;; @@ -426,7 +502,7 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ NECKO_WIFI=1 ;; Linux) -@@ -8665,6 +8690,20 @@ AC_SUBST(MOZ_ENABLE_SZIP) +@@ -8736,6 +8844,20 @@ AC_SUBST(MOZ_ENABLE_SZIP) AC_SUBST(MOZ_SZIP_FLAGS) if test -n "$COMPILE_ENVIRONMENT"; then @@ -447,14 +523,3 @@ $NetBSD: patch-aa,v 1.21 2014/03/20 21:02:00 ryoon Exp $ AC_MSG_CHECKING([for posix_fallocate]) AC_TRY_LINK([#define _XOPEN_SOURCE 600 #include <fcntl.h>], -@@ -8918,6 +8957,10 @@ if test -n "$INTEL_ARCHITECTURE"; then - fi - fi - -+if test -n "$MOZ_LIBV4L2_LIBS"; then -+ EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D use_libv4l2=1" -+fi -+ - if test -n "$MOZ_WEBRTC"; then - AC_MSG_RESULT("generating WebRTC Makefiles...") - diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al index f5de5db33e7..cd6b9df7e35 100644 --- a/www/firefox/patches/patch-al +++ b/www/firefox/patches/patch-al @@ -1,10 +1,10 @@ -$NetBSD: patch-al,v 1.11 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-al,v 1.12 2014/04/30 15:07:18 ryoon Exp $ ---- storage/src/mozStorageConnection.cpp.orig 2013-01-04 23:44:44.000000000 +0000 +--- storage/src/mozStorageConnection.cpp.orig 2014-04-18 02:04:20.000000000 +0000 +++ storage/src/mozStorageConnection.cpp @@ -584,6 +584,11 @@ Connection::initialize(nsIFile *aDatabas - break; - } + + mDatabaseFile = aDatabaseFile; + // XXX tnn: the configure script demands that sqlite3 is compiled with + // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that, diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as index 3da0733fcb3..e8c4a8b151e 100644 --- a/www/firefox/patches/patch-as +++ b/www/firefox/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.9 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-as,v 1.10 2014/04/30 15:07:18 ryoon Exp $ Treat DragonFly like FreeBSD. ---- js/src/configure.in.orig 2014-03-15 05:19:19.000000000 +0000 +--- js/src/configure.in.orig 2014-04-18 02:03:06.000000000 +0000 +++ js/src/configure.in -@@ -2148,116 +2148,13 @@ AC_LANG_CPLUSPLUS +@@ -2165,116 +2165,13 @@ AC_LANG_CPLUSPLUS MOZ_CXX11 @@ -111,7 +111,7 @@ Treat DragonFly like FreeBSD. - ]) - if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ - "$ac_cv_have_visibility_class_bug" = "no"; then -- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h' +- VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' - WRAP_SYSTEM_INCLUDES=1 - else - VISIBILITY_FLAGS='-fvisibility=hidden' @@ -121,21 +121,12 @@ Treat DragonFly like FreeBSD. - fi # have visibility(hidden) attribute + AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) + AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE) -+ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h' ++ VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' + WRAP_SYSTEM_INCLUDES=1 fi # GNU_CC # visibility hidden flag for Sun Studio on Solaris -@@ -2456,7 +2353,7 @@ then - fi - - case "$target" in -- *-*-freebsd*) -+ *-*-freebsd*|*-dragonfly*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) - dnl -pthread links in -lpthread, so don't specify it explicitly. -@@ -3270,7 +3167,7 @@ if test "$MOZ_MEMORY"; then +@@ -3280,7 +3177,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; @@ -144,18 +135,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) -@@ -3632,7 +3529,10 @@ dnl ==================================== - dnl = Support for gcc stack unwinding (from gcc 3.3) - dnl ======================================================== - if test -z "$SKIP_LIBRARY_CHECKS"; then -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS - MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace)) -+ AC_LANG_RESTORE - fi - - dnl ======================================================== -@@ -4086,6 +3986,20 @@ AC_SUBST(CXX_VERSION) +@@ -4144,6 +4041,20 @@ AC_SUBST(CXX_VERSION) AC_SUBST(MSMANIFEST_TOOL) AC_SUBST(MOZ_LINKER) @@ -176,7 +156,7 @@ Treat DragonFly like FreeBSD. AC_MSG_CHECKING([for posix_fallocate]) AC_TRY_LINK([#define _XOPEN_SOURCE 600 #include <fcntl.h>], -@@ -4436,6 +4350,16 @@ fi +@@ -4512,6 +4423,16 @@ fi dnl ======================================================== dnl JavaScript shell dnl ======================================================== diff --git a/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp new file mode 100644 index 00000000000..3f6672bff6c --- /dev/null +++ b/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-browser_app_nsBrowserApp.cpp,v 1.3 2014/04/30 15:07:18 ryoon Exp $ + +--- browser/app/nsBrowserApp.cpp.orig 2014-04-18 02:02:30.000000000 +0000 ++++ browser/app/nsBrowserApp.cpp +@@ -586,6 +586,7 @@ int main(int argc, char* argv[]) + TriggerQuirks(); + #endif + ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + int gotCounters; + #if defined(XP_UNIX) + struct rusage initialRUsage; diff --git a/www/firefox/patches/patch-browser_themes_shared_devtools_common.css b/www/firefox/patches/patch-browser_themes_shared_devtools_common.css deleted file mode 100644 index 7e1a7176526..00000000000 --- a/www/firefox/patches/patch-browser_themes_shared_devtools_common.css +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-browser_themes_shared_devtools_common.css,v 1.1 2014/03/20 21:02:00 ryoon Exp $ - ---- browser/themes/shared/devtools/common.css.orig 2014-03-15 05:19:09.000000000 +0000 -+++ browser/themes/shared/devtools/common.css -@@ -11,13 +11,13 @@ - .devtools-monospace { - %ifdef XP_MACOSX - font-family: Menlo, monospace; --%endif --%ifdef XP_LINUX -+%elifdef XP_WIN -+ font-family: Consolas, monospace; -+%else - font-family: monospace; -- font-size: 80%; - %endif --%ifdef XP_WIN -- font-family: Consolas, monospace; -+%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) -+ font-size: 80%; - %endif - } - -@@ -62,7 +62,7 @@ - background-image: linear-gradient(to bottom, hsla(209,18%,18%,0.9), hsl(210,11%,16%)); - border-radius: 3px; - overflow-x: hidden; --%ifdef XP_LINUX -+%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) - max-height: 32rem; - %else - max-height: 40rem; diff --git a/www/firefox/patches/patch-browser_themes_shared_devtools_highlighter.inc.css b/www/firefox/patches/patch-browser_themes_shared_devtools_highlighter.inc.css deleted file mode 100644 index bde96910327..00000000000 --- a/www/firefox/patches/patch-browser_themes_shared_devtools_highlighter.inc.css +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-browser_themes_shared_devtools_highlighter.inc.css,v 1.1 2014/03/20 21:02:00 ryoon Exp $ - ---- browser/themes/shared/devtools/highlighter.inc.css.orig 2014-03-15 05:19:09.000000000 +0000 -+++ browser/themes/shared/devtools/highlighter.inc.css -@@ -54,7 +54,7 @@ html|*.highlighter-nodeinfobar-pseudo-cl - padding: 0; - width: 26px; - min-height: 26px; --%ifndef XP_LINUX -+%if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) - background-color: transparent; - %endif - } diff --git a/www/firefox/patches/patch-build_gyp.mozbuild b/www/firefox/patches/patch-build_gyp.mozbuild new file mode 100644 index 00000000000..a3b49a79ce1 --- /dev/null +++ b/www/firefox/patches/patch-build_gyp.mozbuild @@ -0,0 +1,12 @@ +$NetBSD: patch-build_gyp.mozbuild,v 1.1 2014/04/30 15:07:18 ryoon Exp $ + +--- build/gyp.mozbuild.orig 2014-04-18 02:02:38.000000000 +0000 ++++ build/gyp.mozbuild +@@ -11,6 +11,7 @@ gyp_vars = { + '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_use_chrome_plugins': 0, diff --git a/www/firefox/patches/patch-config_Makefile.in b/www/firefox/patches/patch-config_Makefile.in index b6fe6db4832..9dd50a2d21f 100644 --- a/www/firefox/patches/patch-config_Makefile.in +++ b/www/firefox/patches/patch-config_Makefile.in @@ -1,16 +1,20 @@ -$NetBSD: patch-config_Makefile.in,v 1.3 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-config_Makefile.in,v 1.4 2014/04/30 15:07:18 ryoon Exp $ ---- config/Makefile.in.orig 2014-03-15 05:19:09.000000000 +0000 +--- config/Makefile.in.orig 2014-04-18 02:02:39.000000000 +0000 +++ config/Makefile.in -@@ -73,6 +73,11 @@ export:: $(export-preqs) +@@ -77,6 +77,15 @@ export:: $(export-preqs) -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ + -DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \ + -DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \ + -DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \ ++ -DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \ + -DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \ ++ -DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \ + -DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \ ++ -DMOZ_NATIVE_SPEEX=$(MOZ_NATIVE_SPEEX) \ ++ -DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers $(INSTALL) system_wrappers $(DIST) diff --git a/www/firefox/patches/patch-config_baseconfig.mk b/www/firefox/patches/patch-config_baseconfig.mk index 9390be0d84b..0c7b2f24732 100644 --- a/www/firefox/patches/patch-config_baseconfig.mk +++ b/www/firefox/patches/patch-config_baseconfig.mk @@ -1,8 +1,11 @@ -$NetBSD: patch-config_baseconfig.mk,v 1.5 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-config_baseconfig.mk,v 1.6 2014/04/30 15:07:18 ryoon Exp $ ---- config/baseconfig.mk.orig 2013-12-05 16:07:23.000000000 +0000 +--- config/baseconfig.mk.orig 2014-04-18 02:02:39.000000000 +0000 +++ config/baseconfig.mk -@@ -1,7 +1,7 @@ +@@ -2,10 +2,10 @@ + # directly in python/mozbuild/mozbuild/base.py for gmake validation. + # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending + # whether a normal build is happening or whether the check is running. -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) @@ -10,7 +13,7 @@ $NetBSD: patch-config_baseconfig.mk,v 1.5 2014/02/20 13:19:03 ryoon Exp $ +includedir := $(includedir)/${MOZILLA_PKG_NAME} +idldir = $(datadir)/idl/${MOZILLA_PKG_NAME} +installdir = $(libdir)/${MOZILLA_PKG_NAME} -+sdkdir = $(libdir)/${MOZILLA_PKG_NAME}-sdk - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't ++sdkdir = $(libdir)/${MOZILLA_PKG_NAME} + ifndef TOP_DIST + TOP_DIST = dist + endif diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build index 4199ee392ce..e25707598fb 100644 --- a/www/firefox/patches/patch-config_external_moz.build +++ b/www/firefox/patches/patch-config_external_moz.build @@ -1,6 +1,6 @@ -$NetBSD: patch-config_external_moz.build,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-config_external_moz.build,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- config/external/moz.build.orig 2014-03-15 05:19:09.000000000 +0000 +--- config/external/moz.build.orig 2014-04-18 02:02:39.000000000 +0000 +++ config/external/moz.build @@ -15,13 +15,13 @@ if CONFIG['MOZ_UPDATER']: if not CONFIG['MOZ_NATIVE_BZ2']: @@ -10,7 +10,8 @@ $NetBSD: patch-config_external_moz.build,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']: external_dirs += ['media/libvorbis'] - if CONFIG['MOZ_TREMOR']: +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']: external_dirs += ['media/libtremor'] -if CONFIG['MOZ_OPUS']: @@ -18,14 +19,30 @@ $NetBSD: patch-config_external_moz.build,v 1.1 2014/03/20 21:02:00 ryoon Exp $ external_dirs += ['media/libopus'] if CONFIG['MOZ_WEBM']: -@@ -31,7 +31,9 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ +@@ -34,16 +34,23 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ external_dirs += ['media/libvpx'] if CONFIG['MOZ_OGG']: - external_dirs += ['media/libogg', 'media/libtheora'] + if not CONFIG['MOZ_NATIVE_OGG']: + external_dirs += ['media/libogg'] -+ external_dirs += ['media/libtheora'] ++ if not CONFIG['MOZ_NATIVE_THEORA']: ++ external_dirs += ['media/libtheora'] if not CONFIG['MOZ_NATIVE_PNG']: external_dirs += ['media/libpng'] + ++if not CONFIG['MOZ_NATIVE_SPEEX']: ++ external_dirs += ['media/libspeex_resampler'] ++ ++if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']: ++ external_dirs += ['media/libsoundtouch'] ++ + external_dirs += [ + 'media/kiss_fft', + 'media/libcubeb', +- 'media/libspeex_resampler', +- 'media/libsoundtouch', + ] + + PARALLEL_DIRS += ['../../' + i for i in external_dirs] diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers index be8339eb3a4..66f4d47a86c 100644 --- a/www/firefox/patches/patch-config_system-headers +++ b/www/firefox/patches/patch-config_system-headers @@ -1,11 +1,29 @@ -$NetBSD: patch-config_system-headers,v 1.7 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-config_system-headers,v 1.8 2014/04/30 15:07:18 ryoon Exp $ ---- config/system-headers.orig 2014-03-15 05:19:09.000000000 +0000 +--- config/system-headers.orig 2014-04-18 02:02:39.000000000 +0000 +++ config/system-headers -@@ -1144,4 +1144,28 @@ unicode/unum.h - unicode/ustring.h - unicode/utypes.h +@@ -1051,8 +1051,6 @@ X11/Xutil.h + xpt_struct.h + xpt_xdr.h + zmouse.h +-speex/speex_resampler.h +-soundtouch/SoundTouch.h + #if MOZ_NATIVE_PNG==1 + png.h #endif +@@ -1118,6 +1116,8 @@ ogg/ogg.h + ogg/os_types.h + nestegg/nestegg.h + cubeb/cubeb.h ++speex/speex_resampler.h ++soundtouch/SoundTouch.h + #endif + gst/gst.h + gst/app/gstappsink.h +@@ -1146,3 +1146,39 @@ unicode/utypes.h + #endif + libutil.h + unwind.h +cairo-qt.h +#if MOZ_NATIVE_GRAPHITE2==1 +unwind.h @@ -20,14 +38,25 @@ $NetBSD: patch-config_system-headers,v 1.7 2014/03/20 21:02:00 ryoon Exp $ +ogg/ogg.h +ogg/os_types.h +#endif ++#if MOZ_NATIVE_THEORA==1 ++theora/theoradec.h ++#endif +#if MOZ_NATIVE_VORBIS==1 +vorbis/codec.h +vorbis/vorbisenc.h +#endif ++#if MOZ_NATIVE_TREMOR==1 ++tremor/ivorbiscodec.h ++#endif +#if MOZ_NATIVE_OPUS==1 +opus.h +opus_multistream.h +opus/opus.h +opus/opus_multistream.h +#endif - libutil.h ++#if MOZ_NATIVE_SPEEX==1 ++speex/speex_resampler.h ++#endif ++#if MOZ_NATIVE_SOUNDTOUCH==1 ++soundtouch/SoundTouch.h ++#endif diff --git a/www/firefox/patches/patch-content_media_AudioStream.cpp b/www/firefox/patches/patch-content_media_AudioStream.cpp new file mode 100644 index 00000000000..52aa4c6e14f --- /dev/null +++ b/www/firefox/patches/patch-content_media_AudioStream.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-content_media_AudioStream.cpp,v 1.3 2014/04/30 15:07:18 ryoon Exp $ + +--- content/media/AudioStream.cpp.orig 2014-04-18 02:02:42.000000000 +0000 ++++ content/media/AudioStream.cpp +@@ -13,7 +13,6 @@ + #include "mozilla/Mutex.h" + #include <algorithm> + #include "mozilla/Preferences.h" +-#include "soundtouch/SoundTouch.h" + #include "Latency.h" + + namespace mozilla { diff --git a/www/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h new file mode 100644 index 00000000000..2dced5bf353 --- /dev/null +++ b/www/firefox/patches/patch-content_media_AudioStream.h @@ -0,0 +1,12 @@ +$NetBSD: patch-content_media_AudioStream.h,v 1.1 2014/04/30 15:07:18 ryoon Exp $ + +--- content/media/AudioStream.h.orig 2014-04-18 02:02:42.000000000 +0000 ++++ content/media/AudioStream.h +@@ -15,6 +15,7 @@ + #include "mozilla/StaticMutex.h" + + #include "cubeb/cubeb.h" ++#include "soundtouch/SoundTouch.h" + + template <> + class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream> diff --git a/www/firefox/patches/patch-content_media_Makefile.in b/www/firefox/patches/patch-content_media_Makefile.in index 281c780283c..46bcd6989ec 100644 --- a/www/firefox/patches/patch-content_media_Makefile.in +++ b/www/firefox/patches/patch-content_media_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-content_media_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-content_media_Makefile.in,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- content/media/Makefile.in.orig 2014-03-15 05:19:11.000000000 +0000 +--- content/media/Makefile.in.orig 2014-04-18 02:02:42.000000000 +0000 +++ content/media/Makefile.in -@@ -7,4 +7,16 @@ include $(topsrcdir)/config/rules.mk +@@ -7,4 +7,32 @@ include $(topsrcdir)/config/rules.mk CFLAGS += $(GSTREAMER_CFLAGS) CXXFLAGS += $(GSTREAMER_CFLAGS) @@ -10,12 +10,28 @@ $NetBSD: patch-content_media_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +CXXFLAGS += $(MOZ_OGG_CFLAGS) +endif + ++ifdef MOZ_NATIVE_THEORA ++CXXFLAGS += $(MOZ_THEORA_CFLAGS) ++endif ++ +ifdef MOZ_NATIVE_VORBIS +CXXFLAGS += $(MOZ_VORBIS_CFLAGS) +endif + ++ifdef MOZ_NATIVE_TREMOR ++CXXFLAGS += $(MOZ_TREMOR_CFLAGS) ++endif ++ +ifdef MOZ_NATIVE_OPUS +CXXFLAGS += $(MOZ_OPUS_CFLAGS) +endif + ++ifdef MOZ_NATIVE_SPEEX ++CXXFLAGS += $(MOZ_SPEEX_CFLAGS) ++endif ++ ++ifdef MOZ_NATIVE_SOUNDTOUCH ++CXXFLAGS += $(MOZ_SOUNDTOUCH_CFLAGS) ++endif ++ AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon diff --git a/www/firefox/patches/patch-content_media_gstreamer_GStreamerAllocator.cpp b/www/firefox/patches/patch-content_media_gstreamer_GStreamerAllocator.cpp index ab175dc7d15..41685651dd3 100644 --- a/www/firefox/patches/patch-content_media_gstreamer_GStreamerAllocator.cpp +++ b/www/firefox/patches/patch-content_media_gstreamer_GStreamerAllocator.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-content_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-content_media_gstreamer_GStreamerAllocator.cpp,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- content/media/gstreamer/GStreamerAllocator.cpp.orig 2014-03-20 11:09:40.000000000 +0000 +--- content/media/gstreamer/GStreamerAllocator.cpp.orig 2014-04-28 00:05:17.000000000 +0000 +++ content/media/gstreamer/GStreamerAllocator.cpp -@@ -0,0 +1,198 @@ +@@ -0,0 +1,197 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif @@ -61,8 +61,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2014/03/20 2 + mem->image->Release(); + + ImageContainer* container = ((MozGfxMemoryAllocator*) mem->memory.allocator)->reader->GetImageContainer(); -+ ImageFormat format = PLANAR_YCBCR; -+ mem->image = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get()); ++ mem->image = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(ImageFormat::PLANAR_YCBCR).get()); + mem->data = mem->image->AllocateAndGetNewBuffer(mem->memory.size); +} + diff --git a/www/firefox/patches/patch-content_media_gstreamer_GStreamerFunctionList.h b/www/firefox/patches/patch-content_media_gstreamer_GStreamerFunctionList.h index c697e0143a6..9d2f5c2dd33 100644 --- a/www/firefox/patches/patch-content_media_gstreamer_GStreamerFunctionList.h +++ b/www/firefox/patches/patch-content_media_gstreamer_GStreamerFunctionList.h @@ -1,6 +1,6 @@ -$NetBSD: patch-content_media_gstreamer_GStreamerFunctionList.h,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-content_media_gstreamer_GStreamerFunctionList.h,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- content/media/gstreamer/GStreamerFunctionList.h.orig 2014-03-15 05:19:11.000000000 +0000 +--- content/media/gstreamer/GStreamerFunctionList.h.orig 2014-04-18 02:02:42.000000000 +0000 +++ content/media/gstreamer/GStreamerFunctionList.h @@ -9,7 +9,6 @@ * List of symbol names we need to dlsym from the gstreamer library. @@ -71,7 +71,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerFunctionList.h,v 1.1 2014/03/20 GST_FUNC(LIBGSTREAMER, gst_segment_to_stream_time) GST_FUNC(LIBGSTREAMER, gst_static_caps_get) GST_FUNC(LIBGSTREAMER, gst_structure_copy) -@@ -86,11 +73,82 @@ GST_FUNC(LIBGSTREAMER, gst_structure_get +@@ -86,11 +73,83 @@ GST_FUNC(LIBGSTREAMER, gst_structure_get GST_FUNC(LIBGSTREAMER, gst_structure_get_value) GST_FUNC(LIBGSTREAMER, gst_structure_new) GST_FUNC(LIBGSTREAMER, gst_util_uint64_scale) @@ -123,6 +123,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerFunctionList.h,v 1.1 2014/03/20 +GST_FUNC(LIBGSTREAMER, gst_buffer_unmap) +GST_FUNC(LIBGSTREAMER, gst_element_factory_get_metadata) +GST_FUNC(LIBGSTREAMER, gst_event_parse_segment) ++GST_FUNC(LIBGSTREAMER, gst_event_type_get_name) +GST_FUNC(LIBGSTREAMER, gst_memory_init) +GST_FUNC(LIBGSTREAMER, gst_memory_map) +GST_FUNC(LIBGSTREAMER, gst_memory_unmap) @@ -154,7 +155,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerFunctionList.h,v 1.1 2014/03/20 /* * Functions that have been defined in the header file. We replace them so that -@@ -100,6 +158,11 @@ GST_FUNC(LIBGSTVIDEO, gst_video_format_p +@@ -100,6 +159,11 @@ GST_FUNC(LIBGSTVIDEO, gst_video_format_p REPLACE_FUNC(gst_buffer_ref); REPLACE_FUNC(gst_buffer_unref); REPLACE_FUNC(gst_message_unref); diff --git a/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader-0.10.cpp b/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader-0.10.cpp index b126ae850bf..7113ac8029c 100644 --- a/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader-0.10.cpp +++ b/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader-0.10.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-content_media_gstreamer_GStreamerReader-0.10.cpp,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-content_media_gstreamer_GStreamerReader-0.10.cpp,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- content/media/gstreamer/GStreamerReader-0.10.cpp.orig 2014-03-20 11:09:40.000000000 +0000 +--- content/media/gstreamer/GStreamerReader-0.10.cpp.orig 2014-04-28 00:05:17.000000000 +0000 +++ content/media/gstreamer/GStreamerReader-0.10.cpp -@@ -0,0 +1,203 @@ +@@ -0,0 +1,200 @@ +#include "nsError.h" +#include "MediaDecoderStateMachine.h" +#include "AbstractMediaDecoder.h" @@ -47,13 +47,10 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader-0.10.cpp,v 1.1 2014/03/20 +{ + /* allocate an image using the container */ + ImageContainer* container = mDecoder->GetImageContainer(); -+ if (!container) { -+ // We don't have an ImageContainer. We probably belong to an <audio> -+ // element. -+ return GST_FLOW_NOT_SUPPORTED; ++ if (container == nullptr) { ++ return GST_FLOW_ERROR; + } -+ ImageFormat format = PLANAR_YCBCR; -+ PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get()); ++ PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(ImageFormat::PLANAR_YCBCR).get()); + nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img); + + /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */ @@ -131,16 +128,16 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader-0.10.cpp,v 1.1 2014/03/20 + + PlanarYCbCrImage::Data data; + data.mPicX = data.mPicY = 0; -+ data.mPicSize = nsIntSize(mPicture.width, mPicture.height); -+ data.mStereoMode = STEREO_MODE_MONO; ++ data.mPicSize = gfx::IntSize(mPicture.width, mPicture.height); ++ data.mStereoMode = StereoMode::MONO; + + data.mYChannel = GST_BUFFER_DATA(aBuffer); + data.mYStride = gst_video_format_get_row_stride(mFormat, 0, mPicture.width); -+ data.mYSize = nsIntSize(data.mYStride, ++ data.mYSize = gfx::IntSize(data.mYStride, + gst_video_format_get_component_height(mFormat, 0, mPicture.height)); + data.mYSkip = 0; + data.mCbCrStride = gst_video_format_get_row_stride(mFormat, 1, mPicture.width); -+ data.mCbCrSize = nsIntSize(data.mCbCrStride, ++ data.mCbCrSize = gfx::IntSize(data.mCbCrStride, + gst_video_format_get_component_height(mFormat, 1, mPicture.height)); + data.mCbChannel = data.mYChannel + gst_video_format_get_component_offset(mFormat, 1, + mPicture.width, mPicture.height); diff --git a/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader.cpp b/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader.cpp index a0e8bd8567a..fab6759e13b 100644 --- a/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader.cpp +++ b/www/firefox/patches/patch-content_media_gstreamer_GStreamerReader.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- content/media/gstreamer/GStreamerReader.cpp.orig 2014-03-15 05:19:11.000000000 +0000 +--- content/media/gstreamer/GStreamerReader.cpp.orig 2014-04-18 02:02:42.000000000 +0000 +++ content/media/gstreamer/GStreamerReader.cpp @@ -10,8 +10,10 @@ #include "AbstractMediaDecoder.h" @@ -168,7 +168,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 g_object_set(mPlayBin, "uri", "appsrc://", "video-sink", mVideoSink, -@@ -331,7 +340,7 @@ nsresult GStreamerReader::ReadMetadata(M +@@ -331,13 +340,12 @@ nsresult GStreamerReader::ReadMetadata(M /* Little trick: set the target caps to "skip" so that playbin2 fails to * find a decoder for the stream we want to skip. */ @@ -177,7 +177,13 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 g_object_set(filter, "caps", filterCaps, nullptr); gst_caps_unref(filterCaps); gst_object_unref(filter); -@@ -358,6 +367,7 @@ nsresult GStreamerReader::ReadMetadata(M + } + +- /* start the pipeline */ + LOG(PR_LOG_DEBUG, "starting metadata pipeline"); + gst_element_set_state(mPlayBin, GST_STATE_PAUSED); + +@@ -358,6 +366,7 @@ nsresult GStreamerReader::ReadMetadata(M gst_message_unref(message); ret = NS_ERROR_FAILURE; } else { @@ -185,7 +191,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 gst_message_unref(message); ret = NS_OK; break; -@@ -371,23 +381,8 @@ nsresult GStreamerReader::ReadMetadata(M +@@ -371,23 +380,8 @@ nsresult GStreamerReader::ReadMetadata(M /* we couldn't get this to play */ return ret; @@ -209,7 +215,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 if (isMP3 && mMP3FrameParser.IsMP3()) { // The MP3FrameParser has reported a duration; use that over the gstreamer -@@ -396,17 +391,25 @@ nsresult GStreamerReader::ReadMetadata(M +@@ -396,17 +390,25 @@ nsresult GStreamerReader::ReadMetadata(M mUseParserDuration = true; mLastParserDuration = mMP3FrameParser.GetDuration(); mDecoder->SetMediaDuration(mLastParserDuration); @@ -245,7 +251,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 } int n_video = 0, n_audio = 0; -@@ -419,7 +422,11 @@ nsresult GStreamerReader::ReadMetadata(M +@@ -419,7 +421,11 @@ nsresult GStreamerReader::ReadMetadata(M *aTags = nullptr; // Watch the pipeline for fatal errors @@ -257,7 +263,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 /* set the pipeline to PLAYING so that it starts decoding and queueing data in * the appsinks */ -@@ -433,19 +440,35 @@ nsresult GStreamerReader::CheckSupported +@@ -433,19 +439,35 @@ nsresult GStreamerReader::CheckSupported bool done = false; bool unsupported = false; @@ -297,7 +303,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 if (caps) { /* check for demuxers but ignore elements like id3demux */ -@@ -460,7 +483,11 @@ nsresult GStreamerReader::CheckSupported +@@ -460,7 +482,11 @@ nsresult GStreamerReader::CheckSupported } } @@ -309,7 +315,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 done = unsupported; break; } -@@ -484,6 +511,8 @@ nsresult GStreamerReader::ResetDecode() +@@ -484,6 +510,8 @@ nsresult GStreamerReader::ResetDecode() { nsresult res = NS_OK; @@ -318,7 +324,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 if (NS_FAILED(MediaDecoderReader::ResetDecode())) { res = NS_ERROR_FAILURE; } -@@ -494,6 +523,11 @@ nsresult GStreamerReader::ResetDecode() +@@ -494,6 +522,11 @@ nsresult GStreamerReader::ResetDecode() mVideoSinkBufferCount = 0; mAudioSinkBufferCount = 0; mReachedEos = false; @@ -330,7 +336,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 return res; } -@@ -517,11 +551,11 @@ bool GStreamerReader::DecodeAudioData() +@@ -517,11 +550,11 @@ bool GStreamerReader::DecodeAudioData() /* We have nothing decoded so it makes no sense to return to the state machine * as it will call us back immediately, we'll return again and so on, wasting * CPU cycles for no job done. So, block here until there is either video or @@ -344,7 +350,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 * something else has happened (Eos, etc...). Return to the state machine * to process it. */ -@@ -533,24 +567,43 @@ bool GStreamerReader::DecodeAudioData() +@@ -533,24 +566,44 @@ bool GStreamerReader::DecodeAudioData() } } @@ -362,8 +368,9 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 int64_t timestamp = GST_BUFFER_TIMESTAMP(buffer); timestamp = gst_segment_to_stream_time(&mAudioSegment, GST_FORMAT_TIME, timestamp); -+ ++ timestamp = GST_TIME_AS_USECONDS(timestamp); ++ int64_t duration = 0; if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer))) duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer)); @@ -430,7 +437,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 if ((aKeyFrameSkip && !isKeyframe)) { gst_buffer_unref(buffer); return true; -@@ -618,73 +677,55 @@ bool GStreamerReader::DecodeVideoFrame(b +@@ -618,10 +677,18 @@ bool GStreamerReader::DecodeVideoFrame(b "frame has invalid timestamp"); timestamp = GST_TIME_AS_USECONDS(timestamp); @@ -443,16 +450,14 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 + if (timestamp < aTimeThreshold) { LOG(PR_LOG_DEBUG, "skipping frame %" GST_TIME_FORMAT -- " threshold %" GST_TIME_FORMAT, + " threshold %" GST_TIME_FORMAT, - GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)); -+ " threshold %" GST_TIME_FORMAT, -+ GST_TIME_ARGS(timestamp * 1000), -+ GST_TIME_ARGS(aTimeThreshold * 1000)); ++ GST_TIME_ARGS(timestamp * 1000), ++ GST_TIME_ARGS(aTimeThreshold * 1000)); gst_buffer_unref(buffer); return true; } -- - if (!buffer) +@@ -630,61 +697,36 @@ bool GStreamerReader::DecodeVideoFrame(b /* no more frames */ return false; @@ -532,7 +537,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 gst_buffer_unref(buffer); return true; -@@ -707,6 +748,10 @@ nsresult GStreamerReader::Seek(int64_t a +@@ -707,6 +749,10 @@ nsresult GStreamerReader::Seek(int64_t a return NS_ERROR_FAILURE; } LOG(PR_LOG_DEBUG, "seek succeeded"); @@ -543,7 +548,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 return DecodeToTarget(aTarget); } -@@ -718,7 +763,9 @@ nsresult GStreamerReader::GetBuffered(do +@@ -718,7 +764,9 @@ nsresult GStreamerReader::GetBuffered(do return NS_OK; } @@ -553,7 +558,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 MediaResource* resource = mDecoder->GetResource(); nsTArray<MediaByteRange> ranges; resource->GetCachedRanges(ranges); -@@ -740,12 +787,21 @@ nsresult GStreamerReader::GetBuffered(do +@@ -740,12 +788,21 @@ nsresult GStreamerReader::GetBuffered(do int64_t endOffset = ranges[index].mEnd; gint64 startTime, endTime; @@ -575,7 +580,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 double start = (double) GST_TIME_AS_USECONDS (startTime) / GST_MSECOND; double end = (double) GST_TIME_AS_USECONDS (endTime) / GST_MSECOND; -@@ -766,7 +822,13 @@ void GStreamerReader::ReadAndPushData(gu +@@ -766,7 +823,13 @@ void GStreamerReader::ReadAndPushData(gu nsresult rv = NS_OK; GstBuffer* buffer = gst_buffer_new_and_alloc(aLength); @@ -589,7 +594,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 uint32_t size = 0, bytesRead = 0; while(bytesRead < aLength) { rv = resource->Read(reinterpret_cast<char*>(data + bytesRead), -@@ -780,7 +842,12 @@ void GStreamerReader::ReadAndPushData(gu +@@ -780,7 +843,12 @@ void GStreamerReader::ReadAndPushData(gu int64_t offset2 = resource->Tell(); unused << offset2; @@ -602,7 +607,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 GstFlowReturn ret = gst_app_src_push_buffer(mSource, gst_buffer_ref(buffer)); if (ret != GST_FLOW_OK) { -@@ -813,8 +880,13 @@ int64_t GStreamerReader::QueryDuration() +@@ -813,8 +881,13 @@ int64_t GStreamerReader::QueryDuration() gint64 duration = 0; GstFormat format = GST_FORMAT_TIME; @@ -616,7 +621,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 if (format == GST_FORMAT_TIME) { LOG(PR_LOG_DEBUG, "pipeline duration %" GST_TIME_FORMAT, GST_TIME_ARGS (duration)); -@@ -893,108 +965,6 @@ gboolean GStreamerReader::SeekData(GstAp +@@ -893,109 +966,6 @@ gboolean GStreamerReader::SeekData(GstAp return NS_SUCCEEDED(rv); } @@ -680,8 +685,9 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 - // element. - return GST_FLOW_NOT_SUPPORTED; - } -- ImageFormat format = PLANAR_YCBCR; -- PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get()); +- PlanarYCbCrImage* img = +- reinterpret_cast<PlanarYCbCrImage*>( +- container->CreateImage(ImageFormat::PLANAR_YCBCR).get()); - nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img); - - /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */ @@ -725,7 +731,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 GstFlowReturn GStreamerReader::NewPrerollCb(GstAppSink* aSink, gpointer aUserData) { -@@ -1011,8 +981,12 @@ void GStreamerReader::AudioPreroll() +@@ -1012,8 +982,12 @@ void GStreamerReader::AudioPreroll() { /* The first audio buffer has reached the audio sink. Get rate and channels */ LOG(PR_LOG_DEBUG, "Audio preroll"); @@ -739,7 +745,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 GstStructure* s = gst_caps_get_structure(caps, 0); mInfo.mAudio.mRate = mInfo.mAudio.mChannels = 0; gst_structure_get_int(s, "rate", (gint*) &mInfo.mAudio.mRate); -@@ -1030,9 +1004,18 @@ void GStreamerReader::VideoPreroll() +@@ -1031,9 +1005,18 @@ void GStreamerReader::VideoPreroll() { /* The first video buffer has reached the video sink. Get width and height */ LOG(PR_LOG_DEBUG, "Video preroll"); @@ -759,7 +765,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 GstStructure* structure = gst_caps_get_structure(caps, 0); gst_structure_get_fraction(structure, "framerate", &fpsNum, &fpsDen); NS_ASSERTION(mPicture.width && mPicture.height, "invalid video resolution"); -@@ -1061,6 +1044,7 @@ void GStreamerReader::NewVideoBuffer() +@@ -1062,6 +1045,7 @@ void GStreamerReader::NewVideoBuffer() /* We have a new video buffer queued in the video sink. Increment the counter * and notify the decode thread potentially blocked in DecodeVideoFrame */ @@ -767,7 +773,7 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 mDecoder->NotifyDecodedFrames(1, 0); mVideoSinkBufferCount++; mon.NotifyAll(); -@@ -1197,5 +1181,199 @@ void GStreamerReader::NotifyDataArrived( +@@ -1198,5 +1182,199 @@ void GStreamerReader::NotifyDataArrived( } } @@ -908,16 +914,16 @@ $NetBSD: patch-content_media_gstreamer_GStreamerReader.cpp,v 1.1 2014/03/20 21:0 + "Unsupported number of components in video frame"); + + aData->mPicX = aData->mPicY = 0; -+ aData->mPicSize = nsIntSize(mPicture.width, mPicture.height); -+ aData->mStereoMode = STEREO_MODE_MONO; ++ aData->mPicSize = gfx::IntSize(mPicture.width, mPicture.height); ++ aData->mStereoMode = StereoMode::MONO; + + aData->mYChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 0); + aData->mYStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 0); -+ aData->mYSize = nsIntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 0), ++ aData->mYSize = gfx::IntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 0), + GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 0)); + aData->mYSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 0) - 1; + aData->mCbCrStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 1); -+ aData->mCbCrSize = nsIntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 1), ++ aData->mCbCrSize = gfx::IntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 1), + GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 1)); + aData->mCbChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 1); + aData->mCrChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 2); diff --git a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp b/www/firefox/patches/patch-dom_system_OSFileConstants.cpp index b2bc0639dc5..61765715da5 100644 --- a/www/firefox/patches/patch-dom_system_OSFileConstants.cpp +++ b/www/firefox/patches/patch-dom_system_OSFileConstants.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2014/03/30 01:03:22 ryoon Exp $ +$NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.2 2014/04/30 15:07:18 ryoon Exp $ * NetBSD 5 does not support posix_spawn(3) ---- dom/system/OSFileConstants.cpp.orig 2014-03-15 05:19:14.000000000 +0000 +--- dom/system/OSFileConstants.cpp.orig 2014-04-18 02:02:50.000000000 +0000 +++ dom/system/OSFileConstants.cpp -@@ -9,11 +9,15 @@ +@@ -9,13 +9,17 @@ #include "prsystem.h" @@ -19,9 +19,12 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2014/03/30 01:03:22 ryoon Ex -#if !defined(ANDROID) +#if !defined(ANDROID) && (defined(__NetBSD_) && (__NetBSD_Version__ < 600000000)) #include <spawn.h> - #endif // !defined(ANDROID) +-#endif // !defined(ANDROID) ++#endif // !defined(ANDROID) && NetBSD 5.* #endif // defined(XP_UNIX) -@@ -508,7 +512,7 @@ static const dom::ConstantSpec gLibcProp + + #if defined(XP_LINUX) +@@ -526,10 +530,10 @@ static const dom::ConstantSpec gLibcProp // The size of |time_t|. { "OSFILE_SIZEOF_TIME_T", INT_TO_JSVAL(sizeof (time_t)) }, @@ -29,4 +32,8 @@ $NetBSD: patch-dom_system_OSFileConstants.cpp,v 1.1 2014/03/30 01:03:22 ryoon Ex +#if !defined(ANDROID) && (defined(__NetBSD_) && (__NetBSD_Version__ < 600000000)) // The size of |posix_spawn_file_actions_t|. { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", INT_TO_JSVAL(sizeof (posix_spawn_file_actions_t)) }, - #endif // !defined(ANDROID) +-#endif // !defined(ANDROID) ++#endif // !defined(ANDROID) && NetBSD 5.* + + // Defining |dirent|. + // Size diff --git a/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp b/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp index 514bd8cf5c0..f55e216ba88 100644 --- a/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp +++ b/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp,v 1.5 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp,v 1.6 2014/04/30 15:07:18 ryoon Exp $ * Use cpuset(3) for NetBSD. From rmind@. ---- gfx/skia/src/utils/SkThreadUtils_pthread_linux.cpp.orig 2013-10-25 22:27:18.000000000 +0000 +--- gfx/skia/src/utils/SkThreadUtils_pthread_linux.cpp.orig 2014-04-18 02:02:58.000000000 +0000 +++ gfx/skia/src/utils/SkThreadUtils_pthread_linux.cpp -@@ -12,26 +12,47 @@ +@@ -12,16 +12,20 @@ #include "SkThreadUtils.h" #include "SkThreadUtils_pthread.h" @@ -26,13 +26,11 @@ $NetBSD: patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp,v 1.5 2014/0 static int CPU_COUNT(cpu_set_t *set) { int count = 0; for (int i = 0; i < CPU_SETSIZE; i++) { - if (CPU_ISSET(i, set)) { - count++; -- } -+ } -+ } -+ return count; -+} +@@ -31,7 +35,24 @@ static int CPU_COUNT(cpu_set_t *set) { + } + return count; + } +-#endif /* !CPU_COUNT */ +#endif + +#if defined(__NetBSD__) @@ -47,10 +45,9 @@ $NetBSD: patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp,v 1.5 2014/0 + if (cpuset_isset(i, set)) { + count++; + } - } - return count; - } --#endif /* !CPU_COUNT */ ++ } ++ return count; ++ } +#endif static int nth_set_cpu(unsigned int n, cpu_set_t* cpuSet) { diff --git a/www/firefox/patches/patch-gfx_thebes_Makefile.in b/www/firefox/patches/patch-gfx_thebes_Makefile.in index f27dff74010..feaca8e8f95 100644 --- a/www/firefox/patches/patch-gfx_thebes_Makefile.in +++ b/www/firefox/patches/patch-gfx_thebes_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-gfx_thebes_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-gfx_thebes_Makefile.in,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- gfx/thebes/Makefile.in.orig 2014-03-15 05:19:16.000000000 +0000 +--- gfx/thebes/Makefile.in.orig 2014-04-18 02:02:58.000000000 +0000 +++ gfx/thebes/Makefile.in @@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFI - CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) - CFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) + CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) + CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) +ifdef MOZ_NATIVE_GRAPHITE2 +CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS) diff --git a/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in b/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in index 6bc3763cd28..d854df35093 100644 --- a/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in +++ b/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in @@ -1,12 +1,12 @@ -$NetBSD: patch-intl_unicharutil_util_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-intl_unicharutil_util_Makefile.in,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- intl/unicharutil/util/Makefile.in.orig 2014-03-15 05:19:19.000000000 +0000 +--- intl/unicharutil/util/Makefile.in.orig 2014-04-18 02:03:03.000000000 +0000 +++ intl/unicharutil/util/Makefile.in -@@ -19,3 +19,7 @@ ifdef _MSC_VER +@@ -23,3 +23,7 @@ ifdef _MSC_VER OS_COMPILE_CXXFLAGS += -Zl OS_COMPILE_CFLAGS += -Zl endif + +ifdef MOZ_NATIVE_HARFBUZZ -+nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) +endif diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h b/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h deleted file mode 100644 index e705e182ce7..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_file__version__info.h,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - -* Treat Solaris/SunOS like Linux, fix build. - ---- ipc/chromium/src/base/file_version_info.h.orig 2013-09-11 03:22:31.000000000 +0000 -+++ ipc/chromium/src/base/file_version_info.h -@@ -86,7 +86,7 @@ class FileVersionInfo { - explicit FileVersionInfo(NSBundle *bundle); - - NSBundle *bundle_; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_SOLARIS) - FileVersionInfo(); - #endif - diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc index e99017a71c8..bea5cf321f2 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc +++ b/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.3 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.4 2014/04/30 15:07:18 ryoon Exp $ ---- ipc/chromium/src/base/sys_info_posix.cc.orig 2013-05-11 19:19:32.000000000 +0000 +--- ipc/chromium/src/base/sys_info_posix.cc.orig 2014-04-18 02:03:04.000000000 +0000 +++ ipc/chromium/src/base/sys_info_posix.cc @@ -119,7 +119,11 @@ std::wstring SysInfo::GetEnvVar(const wc @@ -26,15 +26,3 @@ $NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.3 2014/02/20 13:19: if (uname(&info) < 0) { NOTREACHED(); return ""; -@@ -139,7 +147,11 @@ std::string SysInfo::OperatingSystemVers - - // static - std::string SysInfo::CPUArchitecture() { -+#ifdef OS_SOLARIS -+ struct utsname info; -+#else - utsname info; -+#endif - if (uname(&info) < 0) { - NOTREACHED(); - return ""; diff --git a/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py b/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py deleted file mode 100644 index 4e91b7e2539..00000000000 --- a/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- ipc/ipdl/ipdl/lower.py.orig 2013-01-04 23:44:34.000000000 +0000 -+++ ipc/ipdl/ipdl/lower.py -@@ -1797,7 +1797,7 @@ def _generateMessageClass(clsname, msgid - StmtExpr(ExprCall( - ExprVar('StringAppendF'), - args=[ ExprAddrOf(msgvar), -- ExprLiteral.String('[time:%" PRId64 "][%d]'), -+ ExprLiteral.String('[time:%\\" PRId64 \\"][%d]'), - ExprCall(ExprVar('PR_Now')), - ExprCall(ExprVar('base::GetCurrentProcId')) ])), - appendToMsg(pfxvar), diff --git a/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp b/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp index 62318bd727d..30b61d3f60f 100644 --- a/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp +++ b/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp @@ -1,12 +1,12 @@ -$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.6 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.7 2014/04/30 15:07:18 ryoon Exp $ Unclear fallout from our version of bug 840242, attachment v1: some architectures fail to link if we do not add the inlines here - might be compiler/arch specific. ---- js/src/vm/SPSProfiler.cpp.orig 2013-12-05 16:07:40.000000000 +0000 +--- js/src/vm/SPSProfiler.cpp.orig 2014-04-18 02:03:21.000000000 +0000 +++ js/src/vm/SPSProfiler.cpp -@@ -4,12 +4,15 @@ +@@ -4,6 +4,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -15,10 +15,3 @@ fail to link if we do not add the inlines here - might be compiler/arch specific #include "vm/SPSProfiler.h" #include "mozilla/DebugOnly.h" - - #include "jsnum.h" - #include "jsscript.h" -+#include "jscntxtinlines.h" - - #include "jit/BaselineJIT.h" - #include "vm/StringBuffer.h" diff --git a/www/firefox/patches/patch-js_src_config_system-headers b/www/firefox/patches/patch-js_src_config_system-headers deleted file mode 100644 index d6dd1050732..00000000000 --- a/www/firefox/patches/patch-js_src_config_system-headers +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-js_src_config_system-headers,v 1.7 2014/03/20 21:02:00 ryoon Exp $ - ---- js/src/config/system-headers.orig 2014-03-15 05:19:19.000000000 +0000 -+++ js/src/config/system-headers -@@ -1145,3 +1145,5 @@ unicode/ustring.h - unicode/utypes.h - #endif - libutil.h -+unwind.h -+cairo-qt.h diff --git a/www/firefox/patches/patch-media_libcubeb_src_Makefile.in b/www/firefox/patches/patch-media_libcubeb_src_Makefile.in new file mode 100644 index 00000000000..3141e460ea4 --- /dev/null +++ b/www/firefox/patches/patch-media_libcubeb_src_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-media_libcubeb_src_Makefile.in,v 1.1 2014/04/30 15:07:18 ryoon Exp $ + +--- media/libcubeb/src/Makefile.in.orig 2014-04-18 02:03:46.000000000 +0000 ++++ media/libcubeb/src/Makefile.in +@@ -10,6 +10,10 @@ CFLAGS += \ + $(MOZ_PULSEAUDIO_CFLAGS) \ + $(NULL) + ++ifdef MOZ_NATIVE_SPEEX ++CFLAGS += $(MOZ_SPEEX_CFLAGS) ++endif ++ + ifeq ($(MOZ_WIDGET_TOOLKIT),gonk) + LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/frameworks/wilhelm/include \ + -I$(ANDROID_SOURCE)/system/media/wilhelm/include diff --git a/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp b/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp index 8d136a05636..ddc03f5517e 100644 --- a/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp +++ b/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp @@ -1,11 +1,12 @@ -$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.4 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.5 2014/04/30 15:07:18 ryoon Exp $ ---- media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2013-06-17 22:13:19.000000000 +0000 +--- media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2014-04-18 02:03:48.000000000 +0000 +++ media/libsoundtouch/src/cpu_detect_x86.cpp -@@ -131,6 +131,9 @@ uint detectCPUextensions(void) +@@ -130,7 +130,9 @@ uint detectCPUextensions(void) + #endif return res & ~_dwDisabledISA; - +- +#elif defined(__GNUC__) + // No cpuid.h --> no cpuid support + return 0; diff --git a/www/firefox/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c b/www/firefox/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c new file mode 100644 index 00000000000..56ca2980c42 --- /dev/null +++ b/www/firefox/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c @@ -0,0 +1,18 @@ +$NetBSD: patch-media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.4 2014/04/30 15:07:18 ryoon Exp $ + +--- media/mtransport/third_party/nICEr/src/util/mbslen.c.orig 2014-04-18 02:03:49.000000000 +0000 ++++ media/mtransport/third_party/nICEr/src/util/mbslen.c +@@ -54,6 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # endif + #endif + ++#ifdef __DragonFly__ ++#include <osreldate.h> ++# if __DragonFly_version > 300502 ++# define HAVE_XLOCALE ++# endif ++#endif ++ + #ifdef HAVE_XLOCALE + #include <xlocale.h> + #endif /* HAVE_XLOCALE */ diff --git a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h b/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h index a03e20bedcd..1f64f6ea975 100644 --- a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h +++ b/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h @@ -1,14 +1,18 @@ -$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.5 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.6 2014/04/30 15:07:18 ryoon Exp $ ---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2013-12-05 16:07:48.000000000 +0000 +--- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2014-04-18 02:03:49.000000000 +0000 +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -30,12 +30,15 @@ +@@ -30,12 +30,19 @@ * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $ */ -#ifndef _SYS_QUEUE_H_ +#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN) +#include_next <sys/queue.h> ++# if defined(__DragonFly__) ++#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE ++#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE ++# endif +#elif !defined(_SYS_QUEUE_H_) #define _SYS_QUEUE_H_ @@ -21,7 +25,7 @@ $NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_s #endif #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \ -@@ -43,8 +46,6 @@ +@@ -43,8 +50,6 @@ (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \ (var) = (tvar)) @@ -30,7 +34,7 @@ $NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_s /* * This file defines four types of data structures: singly-linked lists, * singly-linked tail queues, lists and tail queues. -@@ -285,7 +286,7 @@ struct { \ +@@ -285,7 +290,7 @@ struct { \ (STAILQ_EMPTY((head)) ? \ NULL : \ ((struct type *) \ diff --git a/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp b/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp index e4404b2fe30..fbd19cf4aec 100644 --- a/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp +++ b/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp @@ -1,28 +1,8 @@ -$NetBSD: patch-media_webrtc_signaling_signaling.gyp,v 1.4 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-media_webrtc_signaling_signaling.gyp,v 1.5 2014/04/30 15:07:18 ryoon Exp $ ---- media/webrtc/signaling/signaling.gyp.orig 2013-12-05 16:07:48.000000000 +0000 +--- media/webrtc/signaling/signaling.gyp.orig 2014-04-18 02:03:50.000000000 +0000 +++ media/webrtc/signaling/signaling.gyp -@@ -244,6 +244,19 @@ - 'cflags_mozilla': [ - ], - }], -+ ['os_bsd==1', { -+ 'include_dirs': [ -+ ], -+ 'defines': [ -+ # avoiding pointless ifdef churn -+ 'SIP_OS_OSX', -+ 'OSX', -+ 'SECLIB_OPENSSL', -+ ], -+ -+ 'cflags_mozilla': [ -+ ], -+ }], - ['OS=="mac"', { - 'include_dirs': [ - ], -@@ -823,14 +836,13 @@ +@@ -825,14 +825,13 @@ ['OS=="mac"', { 'defines' : [ 'SIP_OS_OSX', diff --git a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in b/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in index c7f51747815..570fad93a08 100644 --- a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in +++ b/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in @@ -1,16 +1,16 @@ -$NetBSD: patch-media_webrtc_signaling_test_Makefile.in,v 1.5 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-media_webrtc_signaling_test_Makefile.in,v 1.6 2014/04/30 15:07:18 ryoon Exp $ ---- media/webrtc/signaling/test/Makefile.in.orig 2014-03-15 05:19:29.000000000 +0000 +--- media/webrtc/signaling/test/Makefile.in.orig 2014-04-18 02:03:51.000000000 +0000 +++ media/webrtc/signaling/test/Makefile.in -@@ -8,6 +8,7 @@ LIBS = \ +@@ -7,6 +7,7 @@ LIBS = \ + $(NSPR_LIBS) \ $(NSS_LIBS) \ $(REALTIME_LIBS) \ - $(MOZ_JS_LIBS) \ + $(MOZ_LIBV4L2_LIBS) \ $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \ $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ -@@ -40,6 +41,12 @@ LIBS += \ +@@ -43,6 +44,12 @@ LIBS += \ $(NULL) endif diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi index e9fe3cfb678..56cf7c3fe42 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi @@ -1,20 +1,8 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.6 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.7 2014/04/30 15:07:18 ryoon Exp $ ---- media/webrtc/trunk/webrtc/build/common.gypi.orig 2013-12-05 16:07:49.000000000 +0000 +--- media/webrtc/trunk/webrtc/build/common.gypi.orig 2014-04-18 02:03:52.000000000 +0000 +++ media/webrtc/trunk/webrtc/build/common.gypi -@@ -78,9 +78,9 @@ - 'enable_protobuf%': 1, - - # Disable these to not build components which can be externally provided. -- 'build_libjpeg%': 1, -+ 'build_libjpeg%': 0, - 'build_libyuv%': 1, -- 'build_libvpx%': 1, -+ 'build_libvpx%': 0, - - # Enable to use the Mozilla internal settings. - 'build_with_mozilla%': 0, -@@ -241,7 +241,7 @@ +@@ -256,7 +256,7 @@ }], ['OS=="dragonfly" or OS=="netbsd"', { 'defines': [ diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi index da26accd9c3..1ab122f74f9 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi @@ -1,13 +1,13 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.orig 2014-03-15 05:19:30.000000000 +0000 +--- media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.orig 2014-04-18 02:03:52.000000000 +0000 +++ media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi @@ -14,9 +14,9 @@ 'conditions': [ ['build_with_mozilla==1', { # Mozilla provides its own build of the opus library. - 'include_dirs': [ -- '$(DIST)/include/opus', +- '/media/libopus/include', - ] + 'cflags_mozilla': [ + '$(MOZ_OPUS_CFLAGS)', diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc index 231103c6ced..20332f5ab8f 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.6 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.7 2014/04/30 15:07:18 ryoon Exp $ ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2014-03-15 05:19:30.000000000 +0000 +--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2014-04-18 02:03:54.000000000 +0000 +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -@@ -18,17 +18,37 @@ +@@ -18,17 +18,28 @@ #include <sys/stat.h> #include <unistd.h> //v4l includes @@ -29,19 +29,10 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__in +#define mmap v4l2_mmap +#define munmap v4l2_munmap +#endif -+ -+#ifdef HAVE_LIBV4L2 -+#define open v4l2_open -+#define close v4l2_close -+#define dup v4l2_dup -+#define ioctl v4l2_ioctl -+#define mmap v4l2_mmap -+#define munmap v4l2_munmap -+#endif namespace webrtc { -@@ -136,6 +156,11 @@ int32_t DeviceInfoLinux::GetDeviceName( +@@ -136,6 +147,11 @@ int32_t DeviceInfoLinux::GetDeviceName( memset(deviceNameUTF8, 0, deviceNameLength); memcpy(cameraName, cap.card, sizeof(cap.card)); diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc index 10847fdf84f..616e97ba83e 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.6 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.7 2014/04/30 15:07:18 ryoon Exp $ ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2014-03-15 05:19:30.000000000 +0000 +--- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2014-04-18 02:03:54.000000000 +0000 +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -18,13 +18,16 @@ #include <unistd.h> @@ -20,7 +20,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__cap #include <new> -@@ -34,6 +37,24 @@ +@@ -34,6 +37,15 @@ #include "webrtc/system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/trace.h" @@ -33,15 +33,6 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__cap +#define munmap v4l2_munmap +#endif + -+#ifdef HAVE_LIBV4L2 -+#define open v4l2_open -+#define close v4l2_close -+#define dup v4l2_dup -+#define ioctl v4l2_ioctl -+#define mmap v4l2_mmap -+#define munmap v4l2_munmap -+#endif -+ namespace webrtc { namespace videocapturemodule diff --git a/www/firefox/patches/patch-memory_mozalloc_fallible.h b/www/firefox/patches/patch-memory_mozalloc_fallible.h deleted file mode 100644 index 002dd46ec06..00000000000 --- a/www/firefox/patches/patch-memory_mozalloc_fallible.h +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-memory_mozalloc_fallible.h,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- memory/mozalloc/fallible.h.orig 2013-11-18 16:22:30.000000000 +0000 -+++ memory/mozalloc/fallible.h -@@ -5,9 +5,22 @@ - #ifndef mozilla_fallible_h - #define mozilla_fallible_h - -+#if defined(MOZALLOC_EXPORT) -+/* do nothing: it's been defined to __declspec(dllexport) by -+ * mozalloc*.cpp on platforms where that's required. */ -+#elif defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) -+# define MOZALLOC_EXPORT __declspec(dllimport) -+#elif defined(HAVE_VISIBILITY_ATTRIBUTE) -+/* Make sure symbols are still exported even if we're wrapped in a -+ * |visibility push(hidden)| blanket. */ -+# define MOZALLOC_EXPORT __attribute__ ((visibility ("default"))) -+#else -+# define MOZALLOC_EXPORT -+#endif -+ - namespace mozilla { - --struct fallible_t { }; -+struct MOZALLOC_EXPORT fallible_t { }; - - } // namespace mozilla - diff --git a/www/firefox/patches/patch-memory_mozalloc_mozalloc.cpp b/www/firefox/patches/patch-memory_mozalloc_mozalloc.cpp deleted file mode 100644 index e2e710ebd76..00000000000 --- a/www/firefox/patches/patch-memory_mozalloc_mozalloc.cpp +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-memory_mozalloc_mozalloc.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=928808 - ---- memory/mozalloc/mozalloc.cpp.orig 2013-10-25 22:27:35.000000000 +0000 -+++ memory/mozalloc/mozalloc.cpp -@@ -229,3 +229,76 @@ namespace mozilla { - const fallible_t fallible = fallible_t(); - - } // namespace mozilla -+ -+ -+MOZALLOC_EXPORT -+void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC -+{ -+ return moz_xmalloc(size); -+} -+ -+MOZALLOC_EXPORT -+void* operator new(size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_malloc(size); -+} -+ -+MOZALLOC_EXPORT -+void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC -+{ -+ return moz_xmalloc(size); -+} -+ -+MOZALLOC_EXPORT -+void* operator new[](size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_malloc(size); -+} -+ -+MOZALLOC_EXPORT -+void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_free(ptr); -+} -+ -+MOZALLOC_EXPORT -+void operator delete(void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_free(ptr); -+} -+ -+MOZALLOC_EXPORT -+void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_free(ptr); -+} -+ -+MOZALLOC_EXPORT -+void operator delete[](void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_free(ptr); -+} -+ -+MOZALLOC_EXPORT -+void* operator new(size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_malloc(size); -+} -+ -+MOZALLOC_EXPORT -+void* operator new[](size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ return moz_malloc(size); -+} -+ -+MOZALLOC_EXPORT -+void operator delete(void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ moz_free(ptr); -+} -+ -+MOZALLOC_EXPORT -+void operator delete[](void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS -+{ -+ moz_free(ptr); -+} diff --git a/www/firefox/patches/patch-memory_mozalloc_mozalloc.h b/www/firefox/patches/patch-memory_mozalloc_mozalloc.h deleted file mode 100644 index a400d5ac340..00000000000 --- a/www/firefox/patches/patch-memory_mozalloc_mozalloc.h +++ /dev/null @@ -1,156 +0,0 @@ -$NetBSD: patch-memory_mozalloc_mozalloc.h,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=928808 - ---- memory/mozalloc/mozalloc.h.orig 2013-10-25 22:27:35.000000000 +0000 -+++ memory/mozalloc/mozalloc.h -@@ -39,15 +39,6 @@ - # define MOZALLOC_EXPORT - #endif - -- --#if defined(MOZ_ALWAYS_INLINE_EVEN_DEBUG) --# define MOZALLOC_INLINE MOZ_ALWAYS_INLINE_EVEN_DEBUG --#elif defined(HAVE_FORCEINLINE) --# define MOZALLOC_INLINE __forceinline --#else --# define MOZALLOC_INLINE inline --#endif -- - /* Workaround build problem with Sun Studio 12 */ - #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) - # undef NS_WARN_UNUSED_RESULT -@@ -171,15 +162,6 @@ MOZALLOC_EXPORT void* moz_valloc(size_t - * that |::operator new() throw(std::bad_alloc)| will never return NULL. - */ - --/* NB: This is defined just to silence vacuous warnings about symbol -- * visibility on OS X/gcc. These symbols are force-inline and not -- * exported. */ --#if defined(XP_MACOSX) --# define MOZALLOC_EXPORT_NEW MOZALLOC_EXPORT --#else --# define MOZALLOC_EXPORT_NEW --#endif -- - #if defined(ANDROID) || defined(_MSC_VER) - /* - * Android doesn't fully support exceptions, so its <new> header -@@ -195,53 +177,29 @@ MOZALLOC_EXPORT void* moz_valloc(size_t - - #define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS - --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC --{ -- return moz_xmalloc(size); --} -- --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void* operator new(size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_malloc(size); --} -- --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC --{ -- return moz_xmalloc(size); --} -- --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void* operator new[](size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_malloc(size); --} -- --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_free(ptr); --} -- --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void operator delete(void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_free(ptr); --} -- --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_free(ptr); --} -- --MOZALLOC_EXPORT_NEW MOZALLOC_INLINE --void operator delete[](void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_free(ptr); --} -+MOZALLOC_EXPORT -+void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC; -+ -+MOZALLOC_EXPORT -+void* operator new(size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC; -+ -+MOZALLOC_EXPORT -+void* operator new[](size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void operator delete(void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void operator delete[](void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; - - - /* -@@ -263,29 +221,17 @@ void operator delete[](void* ptr, const - * (4) the matching system |operator delete(void*) throw(std::bad_alloc)| - */ - --MOZALLOC_INLINE --void* operator new(size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_malloc(size); --} -- --MOZALLOC_INLINE --void* operator new[](size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- return moz_malloc(size); --} -- --MOZALLOC_INLINE --void operator delete(void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- moz_free(ptr); --} -- --MOZALLOC_INLINE --void operator delete[](void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS --{ -- moz_free(ptr); --} -+MOZALLOC_EXPORT -+void* operator new(size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void* operator new[](size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void operator delete(void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; -+ -+MOZALLOC_EXPORT -+void operator delete[](void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS; - - #endif /* ifdef __cplusplus */ - diff --git a/www/firefox/patches/patch-netwerk_dns_Makefile.in b/www/firefox/patches/patch-netwerk_dns_Makefile.in index 61579517fc4..a2611eb5813 100644 --- a/www/firefox/patches/patch-netwerk_dns_Makefile.in +++ b/www/firefox/patches/patch-netwerk_dns_Makefile.in @@ -1,12 +1,15 @@ -$NetBSD: patch-netwerk_dns_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-netwerk_dns_Makefile.in,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- netwerk/dns/Makefile.in.orig 2014-03-15 05:19:32.000000000 +0000 +--- netwerk/dns/Makefile.in.orig 2014-04-18 02:04:03.000000000 +0000 +++ netwerk/dns/Makefile.in -@@ -9,3 +9,7 @@ include $(topsrcdir)/config/rules.mk - # for effective TLD data. - etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat - $(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc -+ +@@ -5,6 +5,10 @@ + + include $(topsrcdir)/config/rules.mk + +ifdef MOZ_NATIVE_HARFBUZZ -+nsIDNService.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS) ++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) +endif ++ + # Generate the include file containing compact, static definitions + # for effective TLD data. + etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat diff --git a/www/firefox/patches/patch-security_manager_ssl_src_JARSignatureVerification.cpp b/www/firefox/patches/patch-security_manager_ssl_src_JARSignatureVerification.cpp deleted file mode 100644 index 1e9ee42f1e9..00000000000 --- a/www/firefox/patches/patch-security_manager_ssl_src_JARSignatureVerification.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-security_manager_ssl_src_JARSignatureVerification.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- security/manager/ssl/src/JARSignatureVerification.cpp.orig 2013-09-10 03:43:51.000000000 +0000 -+++ security/manager/ssl/src/JARSignatureVerification.cpp -@@ -596,9 +596,9 @@ OpenSignedJARFile(nsIFile * aJarFile, - } - - // Verify that the signature file is a valid signature of the SF file -- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner, -- &sfCalculatedDigest.get(), -- HASH_AlgSHA1, false, PR_Now())) { -+ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner, -+ &sfCalculatedDigest.get(), HASH_AlgSHA1, -+ false)) { - PRErrorCode error = PR_GetError(); - const char * errorName = PR_ErrorToName(error); - PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s", diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm index 0484c0e325f..20866868b25 100644 --- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm +++ b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm @@ -1,13 +1,13 @@ -$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm,v 1.1 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__allthreads.jsm,v 1.2 2014/04/30 15:07:18 ryoon Exp $ ---- toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig 2014-03-15 05:19:36.000000000 +0000 +--- toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig 2014-04-18 02:04:23.000000000 +0000 +++ toolkit/components/osfile/modules/osfile_unix_allthreads.jsm -@@ -41,7 +41,7 @@ let Const = SharedAll.Constants.libc; +@@ -41,6 +41,8 @@ let Const = SharedAll.Constants.libc; // Open libc let libc; - let libc_candidates = [ "libSystem.B.dylib", -- "libc.so.6", + let libc_candidates = [ "libc.so", ++ "libc.so.6", + "libc.so.7", - "libc.so" ]; + "libSystem.B.dylib", + "a.out" ]; for (let i = 0; i < libc_candidates.length; ++i) { - try { diff --git a/www/firefox/patches/patch-toolkit_library_Makefile.in b/www/firefox/patches/patch-toolkit_library_Makefile.in index 38c60e0f543..b421a74e89a 100644 --- a/www/firefox/patches/patch-toolkit_library_Makefile.in +++ b/www/firefox/patches/patch-toolkit_library_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_library_Makefile.in,v 1.5 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-toolkit_library_Makefile.in,v 1.6 2014/04/30 15:07:18 ryoon Exp $ ---- toolkit/library/Makefile.in.orig 2014-03-15 05:19:37.000000000 +0000 +--- toolkit/library/Makefile.in.orig 2014-04-18 02:04:27.000000000 +0000 +++ toolkit/library/Makefile.in -@@ -164,6 +164,18 @@ ifdef MOZ_NATIVE_HUNSPELL +@@ -149,6 +149,34 @@ ifdef MOZ_NATIVE_HUNSPELL EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS) endif @@ -10,18 +10,34 @@ $NetBSD: patch-toolkit_library_Makefile.in,v 1.5 2014/03/20 21:02:00 ryoon Exp $ +EXTRA_DSO_LDOPTS += $(MOZ_OGG_LIBS) +endif + ++ifdef MOZ_NATIVE_THEORA ++EXTRA_DSO_LDOPTS += $(MOZ_THEORA_LIBS) ++endif ++ +ifdef MOZ_NATIVE_VORBIS +EXTRA_DSO_LDOPTS += $(MOZ_VORBIS_LIBS) +endif + ++ifdef MOZ_NATIVE_TREMOR ++EXTRA_DSO_LDOPTS += $(MOZ_TREMOR_LIBS) ++endif ++ +ifdef MOZ_NATIVE_OPUS +EXTRA_DSO_LDOPTS += $(MOZ_OPUS_LIBS) +endif + ++ifdef MOZ_NATIVE_SPEEX ++EXTRA_DSO_LDOPTS += $(MOZ_SPEEX_LIBS) ++endif ++ ++ifdef MOZ_NATIVE_SOUNDTOUCH ++EXTRA_DSO_LDOPTS += $(MOZ_SOUNDTOUCH_LIBS) ++endif ++ ifdef MOZ_NATIVE_LIBEVENT EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS) endif -@@ -176,6 +188,14 @@ ifndef MOZ_TREE_PIXMAN +@@ -161,12 +189,24 @@ ifndef MOZ_TREE_PIXMAN EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) endif @@ -36,11 +52,13 @@ $NetBSD: patch-toolkit_library_Makefile.in,v 1.5 2014/03/20 21:02:00 ryoon Exp $ ifdef MOZ_DMD EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib) endif -@@ -183,6 +203,7 @@ endif + EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) - ifdef MOZ_WEBRTC ++ifdef MOZ_LIBV4L2_LIBS +EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS) - ifdef MOZ_WEBRTC_SIGNALING - SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/webrtc/signaling/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ ++endif ++ + ifdef MOZ_WEBRTC + ifeq (WINNT,$(OS_TARGET)) + EXTRA_DSO_LDOPTS += \ diff --git a/www/firefox/patches/patch-toolkit_mozapps_update_updater_updater.cpp b/www/firefox/patches/patch-toolkit_mozapps_update_updater_updater.cpp deleted file mode 100644 index 0511567a4b0..00000000000 --- a/www/firefox/patches/patch-toolkit_mozapps_update_updater_updater.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-toolkit_mozapps_update_updater_updater.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- toolkit/mozapps/update/updater/updater.cpp.orig 2013-08-20 13:38:52.000000000 +0000 -+++ toolkit/mozapps/update/updater/updater.cpp -@@ -123,7 +123,10 @@ static bool sUseHardLinks = true; - // declare it here to avoid including that entire header file. - #define BZ2_CRC32TABLE_UNDECLARED - --#if MOZ_IS_GCC -+#if defined(__clang__) -+extern "C" __attribute__((visibility("default"))) unsigned int BZ2_crc32Table[256]; -+#undef BZ2_CRC32TABLE_UNDECLARED -+#elif MOZ_IS_GCC - #if MOZ_GCC_VERSION_AT_LEAST(3, 3, 0) - extern "C" __attribute__((visibility("default"))) unsigned int BZ2_crc32Table[256]; - #undef BZ2_CRC32TABLE_UNDECLARED diff --git a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp index 1d877e7db6f..68e410f4662 100644 --- a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp +++ b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.4 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.5 2014/04/30 15:07:18 ryoon Exp $ ---- xpcom/base/nsStackWalk.cpp.orig 2014-03-15 05:19:39.000000000 +0000 +--- xpcom/base/nsStackWalk.cpp.orig 2014-04-18 02:04:36.000000000 +0000 +++ xpcom/base/nsStackWalk.cpp @@ -23,6 +23,12 @@ struct CriticalAddress { }; @@ -15,16 +15,16 @@ $NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.4 2014/03/20 21:02:00 ryoon Exp $ #if defined(HAVE_DLOPEN) || defined(XP_MACOSX) #include <dlfcn.h> #endif -@@ -874,7 +880,7 @@ void DemangleSymbol(const char * aSymbol - } +@@ -36,7 +42,7 @@ static CriticalAddress gCriticalAddress; + ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ + defined(HAVE__UNWIND_BACKTRACE))) +-#define NSSTACKWALK_SUPPORTS_SOLARIS \ ++#define notNSSTACKWALK_SUPPORTS_SOLARIS \ + (defined(__sun) && \ + (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) --#if NSSTACKWALK_SUPPORTS_SOLARIS -+#if notNSSTACKWALK_SUPPORTS_SOLARIS - - /* - * Stack walking code for Solaris courtesy of Bart Smaalder's "memtrak". -@@ -1223,9 +1229,6 @@ NS_StackWalk(NS_WalkStackCallback aCallb +@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 |