diff options
Diffstat (limited to 'www/firefox')
59 files changed, 1458 insertions, 577 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 55ef654e3c0..b118e105f4b 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.186 2014/11/20 15:01:47 wiz Exp $ +# $NetBSD: Makefile,v 1.187 2014/12/01 18:11:14 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 33.1.1 -MOZ_BRANCH_MINOR= +MOZ_BRANCH= 34.0 +MOZ_BRANCH_MINOR= .5 DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} diff --git a/www/firefox/PLIST b/www/firefox/PLIST index fc317e49c6f..093454696a4 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.89 2014/11/15 22:04:59 szptvlfn Exp $ +@comment $NetBSD: PLIST,v 1.90 2014/12/01 18:11:14 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -19,6 +19,7 @@ lib/firefox/browser/chrome/browser/content/branding/identity-icons-brand@2x.png lib/firefox/browser/chrome/browser/content/browser/aboutDialog.css lib/firefox/browser/chrome/browser/content/browser/aboutDialog.js lib/firefox/browser/chrome/browser/content/browser/aboutDialog.xul +lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.css lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutRobots-icon.png lib/firefox/browser/chrome/browser/content/browser/aboutRobots-widget-left.png @@ -67,6 +68,7 @@ lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2.png lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2@2x.png lib/firefox/browser/chrome/browser/content/browser/abouthome/sync.png lib/firefox/browser/chrome/browser/content/browser/abouthome/sync@2x.png +lib/firefox/browser/chrome/browser/content/browser/aboutneterror/alert.svg lib/firefox/browser/chrome/browser/content/browser/aboutneterror/info.svg lib/firefox/browser/chrome/browser/content/browser/aboutneterror/netError.css lib/firefox/browser/chrome/browser/content/browser/aboutneterror/netError.xhtml @@ -89,6 +91,26 @@ 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/defaultthemes/1.footer.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.header.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.icon.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.preview.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.footer.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.header.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.icon.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.preview.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.footer.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.header.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.icon.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.preview.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.footer.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.header.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.icon.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.preview.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.footer.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.header.png +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.icon.jpg +lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.preview.jpg lib/firefox/browser/chrome/browser/content/browser/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 @@ -104,7 +126,6 @@ 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/canvasdebugger.js lib/firefox/browser/chrome/browser/content/browser/devtools/canvasdebugger.xul -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 @@ -157,6 +178,10 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/eyedropper/nocursor. lib/firefox/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.css lib/firefox/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.js lib/firefox/browser/chrome/browser/content/browser/devtools/fontinspector/font-inspector.xhtml +lib/firefox/browser/chrome/browser/content/browser/devtools/frame-script-utils.js +lib/firefox/browser/chrome/browser/content/browser/devtools/framework/dev-edition-logo.png +lib/firefox/browser/chrome/browser/content/browser/devtools/framework/dev-edition-promo.css +lib/firefox/browser/chrome/browser/content/browser/devtools/framework/dev-edition-promo.xul lib/firefox/browser/chrome/browser/content/browser/devtools/framework/options-panel.css lib/firefox/browser/chrome/browser/content/browser/devtools/framework/toolbox-options.js lib/firefox/browser/chrome/browser/content/browser/devtools/framework/toolbox-options.xul @@ -176,21 +201,8 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/netmonitor-controlle lib/firefox/browser/chrome/browser/content/browser/devtools/netmonitor-view.js lib/firefox/browser/chrome/browser/content/browser/devtools/netmonitor.css lib/firefox/browser/chrome/browser/content/browser/devtools/netmonitor.xul +lib/firefox/browser/chrome/browser/content/browser/devtools/profiler.js lib/firefox/browser/chrome/browser/content/browser/devtools/profiler.xul -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/css/devtools.css -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/css/tree.css -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/css/ui.css -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/images/circlearrow.svg -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/images/noise.png -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/images/throbber.svg -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/images/treetwisty.svg -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/ProgressReporter.js -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/devtools.js -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/parser.js -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/parserWorker.js -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/strings.js -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/tree.js -lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/ui.js lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-loader.js lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-loader.xul lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-test.xul @@ -206,9 +218,12 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/shadereditor.xul lib/firefox/browser/chrome/browser/content/browser/devtools/spectrum-frame.xhtml lib/firefox/browser/chrome/browser/content/browser/devtools/spectrum.css lib/firefox/browser/chrome/browser/content/browser/devtools/splitview.css +lib/firefox/browser/chrome/browser/content/browser/devtools/storage.xul lib/firefox/browser/chrome/browser/content/browser/devtools/styleeditor.css lib/firefox/browser/chrome/browser/content/browser/devtools/styleeditor.xul lib/firefox/browser/chrome/browser/content/browser/devtools/theme-switching.js +lib/firefox/browser/chrome/browser/content/browser/devtools/ui-profile.js +lib/firefox/browser/chrome/browser/content/browser/devtools/ui-recordings.js lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor-controller.js lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor-view.js lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor.xul @@ -237,8 +252,10 @@ lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul lib/firefox/browser/chrome/browser/content/browser/license.html lib/firefox/browser/chrome/browser/content/browser/loop/conversation.html lib/firefox/browser/chrome/browser/content/browser/loop/js/client.js +lib/firefox/browser/chrome/browser/content/browser/loop/js/contacts.js lib/firefox/browser/chrome/browser/content/browser/loop/js/conversation.js -lib/firefox/browser/chrome/browser/content/browser/loop/js/desktopRouter.js +lib/firefox/browser/chrome/browser/content/browser/loop/js/conversationViews.js +lib/firefox/browser/chrome/browser/content/browser/loop/js/otconfig.js lib/firefox/browser/chrome/browser/content/browser/loop/js/panel.js lib/firefox/browser/chrome/browser/content/browser/loop/libs/l10n.js lib/firefox/browser/chrome/browser/content/browser/loop/libs/sdk.js @@ -259,29 +276,51 @@ lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/s lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/speaker-on.png lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/js/dynamic_config.min.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/common.css +lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/contacts.css lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/conversation.css lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/panel.css +lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/reset.css +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-call-avatar.svg lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14@2x.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/beta-ribbon.svg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/dropdown-inverse.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/dropdown-inverse@2x.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/facemute-14x14.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/facemute-14x14@2x.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/hangup-inverse-14x14.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/hangup-inverse-14x14@2x.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/happy.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/icon_32.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/icon_64.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/icons-10x10.svg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/icons-14x14.svg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/icons-16x16.svg lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/loading-icon.gif lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-14x14.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-14x14@2x.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/sad.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-account-16x16.svg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-settings-16x16.svg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-signin-16x16.svg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-signout-16x16.svg lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/video-inverse-14x14.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/video-inverse-14x14@2x.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/actions.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/conversationStore.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/dispatcher.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/feedbackApiClient.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/mixins.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/models.js -lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/router.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/otSdkDriver.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/utils.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/validate.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/views.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/websocket.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/backbone-1.1.2.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/jquery-2.1.0.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/lodash-2.4.1.js -lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/react-0.10.0.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/react-0.11.1.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/Firefox-Long.ogg lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png lib/firefox/browser/chrome/browser/content/browser/migration/migration.js @@ -345,6 +384,8 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/main.j lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.js lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.xul lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/privacy.js +lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/search.css +lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/search.js lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/security.js lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/subdialogs.js lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/sync.js @@ -354,11 +395,15 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/main.js lib/firefox/browser/chrome/browser/content/browser/preferences/main.xul lib/firefox/browser/chrome/browser/content/browser/preferences/permissions.js lib/firefox/browser/chrome/browser/content/browser/preferences/permissions.xul +lib/firefox/browser/chrome/browser/content/browser/preferences/preferences.js lib/firefox/browser/chrome/browser/content/browser/preferences/preferences.xul lib/firefox/browser/chrome/browser/content/browser/preferences/privacy.js lib/firefox/browser/chrome/browser/content/browser/preferences/privacy.xul lib/firefox/browser/chrome/browser/content/browser/preferences/sanitize.js lib/firefox/browser/chrome/browser/content/browser/preferences/sanitize.xul +lib/firefox/browser/chrome/browser/content/browser/preferences/search.css +lib/firefox/browser/chrome/browser/content/browser/preferences/search.js +lib/firefox/browser/chrome/browser/content/browser/preferences/search.xul lib/firefox/browser/chrome/browser/content/browser/preferences/security.js lib/firefox/browser/chrome/browser/content/browser/preferences/security.xul lib/firefox/browser/chrome/browser/content/browser/preferences/selectBookmark.js @@ -425,7 +470,6 @@ 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/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 @@ -436,7 +480,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionCo lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionCollapsed.png lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionExpanded.png lib/firefox/browser/chrome/browser/skin/classic/browser/aboutNetError.css -lib/firefox/browser/chrome/browser/skin/classic/browser/aboutPrivateBrowsing.css lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore-window-icon.png lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore.css lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSocialError.css @@ -444,6 +487,10 @@ 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/bad-content-blocked-16.png +lib/firefox/browser/chrome/browser/skin/classic/browser/bad-content-blocked-64.png +lib/firefox/browser/chrome/browser/skin/classic/browser/bad-content-unblocked-16.png +lib/firefox/browser/chrome/browser/skin/classic/browser/badge-add-engine.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 @@ -493,6 +540,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-console lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-console@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-eyedropper.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-eyedropper@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-frames.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/command-frames@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 @@ -545,6 +594,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/eyedropper.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-close.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-dir-open.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-globe.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filetype-store.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/filters.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars-light.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/floating-scrollbars.css @@ -564,6 +614,10 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/magnifying-glas 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/newtab-inverted.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/newtab-inverted@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/newtab.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/newtab@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/noise.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch-checked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch.svg @@ -576,6 +630,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-r lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-se-resizer@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-vertical-resizer@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-home.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-rotate@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-screenshot.png @@ -586,6 +641,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/ruleview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/scratchpad.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/splitview.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/storage.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools@2x.png @@ -596,6 +652,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-network.sv 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-storage.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-styleeditor.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-webaudio.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-webconsole.svg @@ -624,6 +681,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/webconsole_networkpanel.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/widgets.css +lib/firefox/browser/chrome/browser/skin/classic/browser/dots.png +lib/firefox/browser/chrome/browser/skin/classic/browser/dots@2x.png 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 @@ -649,14 +708,18 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https-mix lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https-mixed-display.png lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icons-https.png lib/firefox/browser/chrome/browser/skin/classic/browser/identity.png -lib/firefox/browser/chrome/browser/skin/classic/browser/in-content/common.css +lib/firefox/browser/chrome/browser/skin/classic/browser/loop/menuPanel.png +lib/firefox/browser/chrome/browser/skin/classic/browser/loop/toolbar-inverted.png +lib/firefox/browser/chrome/browser/skin/classic/browser/loop/toolbar.png +lib/firefox/browser/chrome/browser/skin/classic/browser/magnifier.png +lib/firefox/browser/chrome/browser/skin/classic/browser/magnifier@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/mask.png +lib/firefox/browser/chrome/browser/skin/classic/browser/mask@2x.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 lib/firefox/browser/chrome/browser/skin/classic/browser/monitor_16-10.png lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/controls.svg @@ -700,31 +763,23 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/check.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/check@2x.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown-disabled.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown-disabled@2x.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dropdown@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/header.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/header@2x.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/help-glyph.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/help-glyph@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/sorter.png -lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/sorter@2x.png 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/search-engine-placeholder.png +lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-add-engine.png +lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator.png +lib/firefox/browser/chrome/browser/skin/classic/browser/search-pref.png 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/chat-icons.svg 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 @@ -769,6 +824,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/search.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/stack-expander.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/tabview.css lib/firefox/browser/chrome/browser/skin/classic/browser/tabview/tabview.png +lib/firefox/browser/chrome/browser/skin/classic/browser/theme-switcher-icon.png lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16.png @@ -837,6 +893,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/devtools/shadereditor.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/shadereditor.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/sourceeditor.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/sourceeditor.properties +lib/firefox/browser/chrome/en-US/locale/browser/devtools/storage.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/styleeditor.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/styleeditor.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/styleinspector.dtd @@ -847,6 +904,8 @@ lib/firefox/browser/chrome/en-US/locale/browser/devtools/webConsole.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/webaudioeditor.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/webaudioeditor.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/webconsole.properties +lib/firefox/browser/chrome/en-US/locale/browser/devtools/webide.dtd +lib/firefox/browser/chrome/en-US/locale/browser/devtools/webide.properties lib/firefox/browser/chrome/en-US/locale/browser/downloads/downloads.dtd lib/firefox/browser/chrome/en-US/locale/browser/downloads/downloads.properties lib/firefox/browser/chrome/en-US/locale/browser/downloads/settingsChange.dtd @@ -854,6 +913,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/engineManager.dtd lib/firefox/browser/chrome/en-US/locale/browser/engineManager.properties lib/firefox/browser/chrome/en-US/locale/browser/feeds/subscribe.dtd lib/firefox/browser/chrome/en-US/locale/browser/feeds/subscribe.properties +lib/firefox/browser/chrome/en-US/locale/browser/lightweightThemes.properties lib/firefox/browser/chrome/en-US/locale/browser/loop/loop.properties lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.dtd lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.properties @@ -1185,6 +1245,8 @@ lib/firefox/browser/chrome/webide/content/addons.js lib/firefox/browser/chrome/webide/content/addons.xhtml lib/firefox/browser/chrome/webide/content/details.js lib/firefox/browser/chrome/webide/content/details.xhtml +lib/firefox/browser/chrome/webide/content/monitor.js +lib/firefox/browser/chrome/webide/content/monitor.xhtml lib/firefox/browser/chrome/webide/content/newapp.js lib/firefox/browser/chrome/webide/content/newapp.xul lib/firefox/browser/chrome/webide/content/permissionstable.js @@ -1193,16 +1255,17 @@ lib/firefox/browser/chrome/webide/content/prefs.js lib/firefox/browser/chrome/webide/content/prefs.xhtml lib/firefox/browser/chrome/webide/content/runtimedetails.js lib/firefox/browser/chrome/webide/content/runtimedetails.xhtml -lib/firefox/browser/chrome/webide/content/webide.dtd lib/firefox/browser/chrome/webide/content/webide.js -lib/firefox/browser/chrome/webide/content/webide.properties lib/firefox/browser/chrome/webide/content/webide.xul lib/firefox/browser/chrome/webide/skin/addons.css +lib/firefox/browser/chrome/webide/skin/deck.css lib/firefox/browser/chrome/webide/skin/details.css lib/firefox/browser/chrome/webide/skin/icons.png +lib/firefox/browser/chrome/webide/skin/monitor.css lib/firefox/browser/chrome/webide/skin/newapp.css +lib/firefox/browser/chrome/webide/skin/permissionstable.css lib/firefox/browser/chrome/webide/skin/prefs.css -lib/firefox/browser/chrome/webide/skin/tabledoc.css +lib/firefox/browser/chrome/webide/skin/runtimedetails.css lib/firefox/browser/chrome/webide/skin/throbber.svg lib/firefox/browser/chrome/webide/skin/webide.css lib/firefox/browser/components/ChromeProfileMigrator.js @@ -1214,6 +1277,7 @@ lib/firefox/browser/components/FeedWriter.js lib/firefox/browser/components/FirefoxProfileMigrator.js lib/firefox/browser/components/PlacesProtocolHandler.js lib/firefox/browser/components/ProfileMigrator.js +lib/firefox/browser/components/SelfSupportService.js lib/firefox/browser/components/WebContentConverter.js lib/firefox/browser/components/components.manifest lib/firefox/browser/components/devtools-clhandler.js @@ -1255,6 +1319,8 @@ lib/firefox/browser/modules/DownloadsLogger.jsm lib/firefox/browser/modules/DownloadsTaskbar.jsm lib/firefox/browser/modules/DragPositionManager.jsm lib/firefox/browser/modules/Feeds.jsm +lib/firefox/browser/modules/FormSubmitObserver.jsm +lib/firefox/browser/modules/FormValidationHandler.jsm lib/firefox/browser/modules/MigrationUtils.jsm lib/firefox/browser/modules/NetworkPrioritizer.jsm lib/firefox/browser/modules/PanelFrame.jsm @@ -1269,6 +1335,7 @@ lib/firefox/browser/modules/Social.jsm lib/firefox/browser/modules/TabCrashReporter.jsm lib/firefox/browser/modules/UITour.jsm lib/firefox/browser/modules/WebappManager.jsm +lib/firefox/browser/modules/devtools/AbstractTreeItem.jsm lib/firefox/browser/modules/devtools/AppCacheUtils.jsm lib/firefox/browser/modules/devtools/BreadcrumbsWidget.jsm lib/firefox/browser/modules/devtools/Chart.jsm @@ -1319,12 +1386,11 @@ lib/firefox/browser/modules/devtools/main.js lib/firefox/browser/modules/devtools/markupview/html-editor.js lib/firefox/browser/modules/devtools/markupview/markup-view.js lib/firefox/browser/modules/devtools/netmonitor/panel.js -lib/firefox/browser/modules/devtools/profiler/cleopatra.js -lib/firefox/browser/modules/devtools/profiler/commands.js -lib/firefox/browser/modules/devtools/profiler/consts.js -lib/firefox/browser/modules/devtools/profiler/controller.js +lib/firefox/browser/modules/devtools/profiler/global.js lib/firefox/browser/modules/devtools/profiler/panel.js -lib/firefox/browser/modules/devtools/profiler/sidebar.js +lib/firefox/browser/modules/devtools/profiler/shared.js +lib/firefox/browser/modules/devtools/profiler/tree-model.js +lib/firefox/browser/modules/devtools/profiler/tree-view.js lib/firefox/browser/modules/devtools/projecteditor/editors.js lib/firefox/browser/modules/devtools/projecteditor/helpers/event.js lib/firefox/browser/modules/devtools/projecteditor/helpers/file-picker.js @@ -1357,6 +1423,9 @@ lib/firefox/browser/modules/devtools/scratchpad/scratchpad-commands.js lib/firefox/browser/modules/devtools/scratchpad/scratchpad-panel.js lib/firefox/browser/modules/devtools/shadereditor/panel.js lib/firefox/browser/modules/devtools/shared/autocomplete-popup.js +lib/firefox/browser/modules/devtools/shared/d3.js +lib/firefox/browser/modules/devtools/shared/doorhanger.js +lib/firefox/browser/modules/devtools/shared/frame-script-utils.js lib/firefox/browser/modules/devtools/shared/inplace-editor.js lib/firefox/browser/modules/devtools/shared/observable-object.js lib/firefox/browser/modules/devtools/shared/telemetry.js @@ -1373,6 +1442,8 @@ 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/storage/panel.js +lib/firefox/browser/modules/devtools/storage/ui.js lib/firefox/browser/modules/devtools/styleeditor/styleeditor-commands.js lib/firefox/browser/modules/devtools/styleeditor/styleeditor-panel.js lib/firefox/browser/modules/devtools/styleeditor/utils.js @@ -1403,6 +1474,10 @@ lib/firefox/browser/modules/devtools/webide/remote-resources.js lib/firefox/browser/modules/devtools/webide/runtimes.js lib/firefox/browser/modules/distribution.js lib/firefox/browser/modules/experiments/Experiments.jsm +lib/firefox/browser/modules/loop/CardDavImporter.jsm +lib/firefox/browser/modules/loop/GoogleImporter.jsm +lib/firefox/browser/modules/loop/LoopContacts.jsm +lib/firefox/browser/modules/loop/LoopStorage.jsm lib/firefox/browser/modules/loop/MozLoopAPI.jsm lib/firefox/browser/modules/loop/MozLoopPushHandler.jsm lib/firefox/browser/modules/loop/MozLoopService.jsm @@ -1416,6 +1491,7 @@ 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/RunState.jsm lib/firefox/browser/modules/sessionstore/SessionCookies.jsm lib/firefox/browser/modules/sessionstore/SessionFile.jsm lib/firefox/browser/modules/sessionstore/SessionHistory.jsm @@ -1473,9 +1549,9 @@ lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.dtd lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.properties lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.dtd lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.properties -lib/firefox/chrome/en-US/locale/en-US/global/actions.dtd lib/firefox/chrome/en-US/locale/en-US/global/appPicker.dtd lib/firefox/chrome/en-US/locale/en-US/global/appstrings.properties +lib/firefox/chrome/en-US/locale/en-US/global/autocomplete.properties lib/firefox/chrome/en-US/locale/en-US/global/brand.dtd lib/firefox/chrome/en-US/locale/en-US/global/browser.properties lib/firefox/chrome/en-US/locale/en-US/global/charsetMenu.dtd @@ -1706,6 +1782,7 @@ lib/firefox/chrome/toolkit/content/global/alerts/alert.js lib/firefox/chrome/toolkit/content/global/alerts/alert.xul lib/firefox/chrome/toolkit/content/global/appPicker.js lib/firefox/chrome/toolkit/content/global/appPicker.xul +lib/firefox/chrome/toolkit/content/global/autocomplete.css lib/firefox/chrome/toolkit/content/global/backgroundPageThumbsContent.js lib/firefox/chrome/toolkit/content/global/bindings/autocomplete.xml lib/firefox/chrome/toolkit/content/global/bindings/browser.xml @@ -1817,9 +1894,6 @@ lib/firefox/chrome/toolkit/content/global/svg/svgBindings.xml lib/firefox/chrome/toolkit/content/global/tabprompts.css lib/firefox/chrome/toolkit/content/global/tabprompts.xml lib/firefox/chrome/toolkit/content/global/test-ipc.xul -lib/firefox/chrome/toolkit/content/global/test-ipcbrowser-chrome.js -lib/firefox/chrome/toolkit/content/global/test-ipcbrowser-content.js -lib/firefox/chrome/toolkit/content/global/test-ipcbrowser.xul lib/firefox/chrome/toolkit/content/global/textbox.css lib/firefox/chrome/toolkit/content/global/treeUtils.js lib/firefox/chrome/toolkit/content/global/viewPartialSource.js @@ -2039,11 +2113,21 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/webapps-16.png lib/firefox/chrome/toolkit/skin/classic/global/icons/webapps-64.png lib/firefox/chrome/toolkit/skin/classic/global/icons/windowControls.png lib/firefox/chrome/toolkit/skin/classic/global/icons/wrap.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/check.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/check@2x.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/common.css +lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown-disabled.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown-disabled@2x.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown@2x.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/help-glyph.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/help-glyph@2x.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/sorter.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/sorter@2x.png lib/firefox/chrome/toolkit/skin/classic/global/inContentUI.css lib/firefox/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png lib/firefox/chrome/toolkit/skin/classic/global/linkTree.css lib/firefox/chrome/toolkit/skin/classic/global/listbox.css -lib/firefox/chrome/toolkit/skin/classic/global/loop/loop-call.png lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css lib/firefox/chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png @@ -2205,6 +2289,7 @@ lib/firefox/components/DataStoreImpl.js lib/firefox/components/DownloadLegacy.js lib/firefox/components/FeedProcessor.js lib/firefox/components/FormAutofillContentService.js +lib/firefox/components/FormAutofillStartup.js lib/firefox/components/FormHistoryStartup.js lib/firefox/components/MozKeyboard.js lib/firefox/components/NetworkGeolocationProvider.js @@ -2230,13 +2315,13 @@ lib/firefox/components/UnifiedComplete.js lib/firefox/components/Weave.js lib/firefox/components/WebVTTParserWrapper.js lib/firefox/components/Webapps.js +lib/firefox/components/XULStore.js lib/firefox/components/addonManager.js lib/firefox/components/amContentHandler.js lib/firefox/components/amInstallTrigger.js lib/firefox/components/amWebInstallListener.js lib/firefox/components/components.manifest lib/firefox/components/contentAreaDropListener.js -lib/firefox/components/contentSecurityPolicy.js lib/firefox/components/crypto-SDR.js lib/firefox/components/interfaces.xpt lib/firefox/components/jsconsole-clhandler.js @@ -2348,10 +2433,17 @@ lib/firefox/modules/BookmarkJSONUtils.jsm lib/firefox/modules/BrowserElementParent.jsm lib/firefox/modules/BrowserElementPromptService.jsm lib/firefox/modules/BrowserUtils.jsm -lib/firefox/modules/CSPUtils.jsm lib/firefox/modules/CertUtils.jsm lib/firefox/modules/CharsetMenu.jsm lib/firefox/modules/ChromeManifestParser.jsm +lib/firefox/modules/CloudSync.jsm +lib/firefox/modules/CloudSyncAdapters.jsm +lib/firefox/modules/CloudSyncBookmarks.jsm +lib/firefox/modules/CloudSyncBookmarksFolderCache.jsm +lib/firefox/modules/CloudSyncEventSource.jsm +lib/firefox/modules/CloudSyncLocal.jsm +lib/firefox/modules/CloudSyncPlacesWrapper.jsm +lib/firefox/modules/CloudSyncTabs.jsm lib/firefox/modules/ClusterLib.js lib/firefox/modules/ColorAnalyzer_worker.js lib/firefox/modules/ColorConversion.js @@ -2360,7 +2452,10 @@ lib/firefox/modules/ContactDB.jsm lib/firefox/modules/ContactService.jsm lib/firefox/modules/ContentPrefInstance.jsm lib/firefox/modules/ContentPrefService2.jsm +lib/firefox/modules/ContentPrefServiceChild.jsm +lib/firefox/modules/ContentPrefServiceParent.jsm lib/firefox/modules/ContentPrefStore.jsm +lib/firefox/modules/ContentPrefUtils.jsm lib/firefox/modules/CrashMonitor.jsm lib/firefox/modules/Credentials.jsm lib/firefox/modules/DOMIdentity.jsm @@ -2397,6 +2492,8 @@ lib/firefox/modules/FreeSpaceWatcher.jsm lib/firefox/modules/FxAccounts.jsm lib/firefox/modules/FxAccountsClient.jsm lib/firefox/modules/FxAccountsCommon.js +lib/firefox/modules/FxAccountsOAuthClient.jsm +lib/firefox/modules/FxAccountsProfileClient.jsm lib/firefox/modules/GMPInstallManager.jsm lib/firefox/modules/Geometry.jsm lib/firefox/modules/HealthReport.jsm @@ -2442,12 +2539,12 @@ lib/firefox/modules/PhoneNumberNormalizer.jsm lib/firefox/modules/PhoneNumberUtils.jsm lib/firefox/modules/PlacesBackups.jsm lib/firefox/modules/PlacesDBUtils.jsm +lib/firefox/modules/PlacesSearchAutocompleteProvider.jsm lib/firefox/modules/PlacesTransactions.jsm lib/firefox/modules/PlacesUtils.jsm lib/firefox/modules/PluralForm.jsm lib/firefox/modules/PopupNotifications.jsm lib/firefox/modules/Preferences.jsm -lib/firefox/modules/PriorityUrlProvider.jsm lib/firefox/modules/PrivateBrowsingUtils.jsm lib/firefox/modules/Promise-backend.js lib/firefox/modules/Promise.jsm @@ -2468,13 +2565,13 @@ lib/firefox/modules/ResourceStatsService.jsm lib/firefox/modules/SafeBrowsing.jsm lib/firefox/modules/ScriptPreloader.jsm lib/firefox/modules/ScrollPosition.jsm +lib/firefox/modules/SearchStaticData.jsm lib/firefox/modules/SearchSuggestionController.jsm lib/firefox/modules/SelectContentHelper.jsm lib/firefox/modules/SelectParentHelper.jsm lib/firefox/modules/Services.jsm -lib/firefox/modules/SettingsChangeNotifier.jsm lib/firefox/modules/SettingsDB.jsm -lib/firefox/modules/SettingsQueue.jsm +lib/firefox/modules/SettingsRequestManager.jsm lib/firefox/modules/SharedPromptUtils.jsm lib/firefox/modules/ShortcutUtils.jsm lib/firefox/modules/Sntp.jsm @@ -2492,10 +2589,12 @@ lib/firefox/modules/TelemetryTimestamps.jsm lib/firefox/modules/ThirdPartyCookieProbe.jsm lib/firefox/modules/Timer.jsm lib/firefox/modules/Troubleshoot.jsm +lib/firefox/modules/TrustedHostedAppsUtils.jsm lib/firefox/modules/UITelemetry.jsm lib/firefox/modules/UpdateChannel.jsm lib/firefox/modules/UserAgentOverrides.jsm lib/firefox/modules/UserAgentUpdates.jsm +lib/firefox/modules/WebChannel.jsm lib/firefox/modules/WebappOSUtils.jsm lib/firefox/modules/Webapps.jsm lib/firefox/modules/WindowDraggingUtils.jsm @@ -2525,6 +2624,13 @@ lib/firefox/modules/addons/PluginProvider.jsm lib/firefox/modules/addons/SpellCheckDictionaryBootstrap.js lib/firefox/modules/addons/XPIProvider.jsm lib/firefox/modules/addons/XPIProviderUtils.js +lib/firefox/modules/commonjs/dev/debuggee.js +lib/firefox/modules/commonjs/dev/frame-script.js +lib/firefox/modules/commonjs/dev/panel.js +lib/firefox/modules/commonjs/dev/ports.js +lib/firefox/modules/commonjs/dev/toolbox.js +lib/firefox/modules/commonjs/dev/utils.js +lib/firefox/modules/commonjs/dev/volcan.js lib/firefox/modules/commonjs/diffpatcher/History.md lib/firefox/modules/commonjs/diffpatcher/License.md lib/firefox/modules/commonjs/diffpatcher/Readme.md @@ -2634,6 +2740,7 @@ lib/firefox/modules/commonjs/sdk/lang/type.js lib/firefox/modules/commonjs/sdk/lang/weak-set.js lib/firefox/modules/commonjs/sdk/loader/cuddlefish.js lib/firefox/modules/commonjs/sdk/loader/sandbox.js +lib/firefox/modules/commonjs/sdk/messaging.js lib/firefox/modules/commonjs/sdk/model/core.js lib/firefox/modules/commonjs/sdk/net/url.js lib/firefox/modules/commonjs/sdk/net/xhr.js @@ -2705,6 +2812,7 @@ 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/options.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 @@ -2790,6 +2898,7 @@ lib/firefox/modules/devtools/dbg-server.jsm lib/firefox/modules/devtools/deprecated-sync-thenables.js lib/firefox/modules/devtools/discovery/discovery.js lib/firefox/modules/devtools/event-emitter.js +lib/firefox/modules/devtools/event-parsers.js lib/firefox/modules/devtools/gcli.jsm lib/firefox/modules/devtools/gcli/api.js lib/firefox/modules/devtools/gcli/cli.js @@ -2917,6 +3026,8 @@ 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/utils/make-debugger.js +lib/firefox/modules/devtools/server/actors/utils/map-uri-to-addon-id.js lib/firefox/modules/devtools/server/actors/webapps.js lib/firefox/modules/devtools/server/actors/webaudio.js lib/firefox/modules/devtools/server/actors/webbrowser.js @@ -2978,6 +3089,8 @@ lib/firefox/modules/osfile/ospath_unix.jsm lib/firefox/modules/osfile/ospath_win.jsm lib/firefox/modules/reflect.jsm lib/firefox/modules/sdk/bootstrap.js +lib/firefox/modules/sdk/system/Startup.js +lib/firefox/modules/sdk/system/XulApp.js lib/firefox/modules/services-common/async.js lib/firefox/modules/services-common/bagheeraclient.js lib/firefox/modules/services-common/hawkclient.js @@ -3085,10 +3198,15 @@ lib/firefox/webapprt/chrome.manifest lib/firefox/webapprt/chrome/chrome.manifest lib/firefox/webapprt/chrome/en-US/locale/webapprt/appstrings.properties lib/firefox/webapprt/chrome/en-US/locale/webapprt/dom.properties +lib/firefox/webapprt/chrome/en-US/locale/webapprt/downloads/downloads.dtd lib/firefox/webapprt/chrome/en-US/locale/webapprt/getUserMediaDialog.dtd lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.dtd lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.properties lib/firefox/webapprt/chrome/webapprt/content/dbg-webapp-actors.js +lib/firefox/webapprt/chrome/webapprt/content/downloads/download.xml +lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.css +lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.js +lib/firefox/webapprt/chrome/webapprt/content/downloads/downloads.xul lib/firefox/webapprt/chrome/webapprt/content/getUserMediaDialog.js lib/firefox/webapprt/chrome/webapprt/content/getUserMediaDialog.xul lib/firefox/webapprt/chrome/webapprt/content/mochitest-shared.js @@ -3096,12 +3214,16 @@ lib/firefox/webapprt/chrome/webapprt/content/mochitest.js lib/firefox/webapprt/chrome/webapprt/content/mochitest.xul lib/firefox/webapprt/chrome/webapprt/content/webapp.js lib/firefox/webapprt/chrome/webapprt/content/webapp.xul +lib/firefox/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloadButtons.png +lib/firefox/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloadIcon.png +lib/firefox/webapprt/chrome/webapprt/skin/classic/webapprt/downloads/downloads.css lib/firefox/webapprt/components/CommandLineHandler.js lib/firefox/webapprt/components/ContentPermission.js lib/firefox/webapprt/components/DirectoryProvider.js lib/firefox/webapprt/components/PaymentUIGlue.js lib/firefox/webapprt/components/components.manifest lib/firefox/webapprt/defaults/preferences/prefs.js +lib/firefox/webapprt/modules/DownloadView.jsm lib/firefox/webapprt/modules/RemoteDebugger.jsm lib/firefox/webapprt/modules/Startup.jsm lib/firefox/webapprt/modules/WebRTCHandler.jsm diff --git a/www/firefox/distinfo b/www/firefox/distinfo index a4610715a10..86aab1f88ae 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.172 2014/11/26 14:56:28 ryoon Exp $ +$NetBSD: distinfo,v 1.173 2014/12/01 18:11:14 ryoon Exp $ -SHA1 (firefox-33.1.1.source.tar.bz2) = 1e9e3176e7d221c4f2ce479f37ee7c432236a0ec -RMD160 (firefox-33.1.1.source.tar.bz2) = 25cb102648b2ea1b00b0339cedaabf4c97d59c23 -Size (firefox-33.1.1.source.tar.bz2) = 155323530 bytes -SHA1 (patch-aa) = 9975c507837d3894ca4915e5c5fd65264f1cd526 +SHA1 (firefox-34.0.5.source.tar.bz2) = 33654d38268d1d1f71105f48bbe97cf720f47be2 +RMD160 (firefox-34.0.5.source.tar.bz2) = a246a94fe7c921a732b64034b6ff0d5164628e5f +Size (firefox-34.0.5.source.tar.bz2) = 164333716 bytes +SHA1 (patch-aa) = af3387a18a30d90c6f4741de2b7c9e14318a7cd0 SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 -SHA1 (patch-as) = e20234ba1ce89035132c436fd3f77d0170cb3b42 -SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d94 +SHA1 (patch-as) = 28042411e39f7490150c504fe7dfa8b30b6f5064 SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 @@ -21,31 +20,34 @@ SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518 SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f6c SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1 SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075 -SHA1 (patch-config_external_moz.build) = 99b10ed0e04f78f97678bd81cbc5da09aecf88e4 -SHA1 (patch-config_rules.mk) = ec74e2e385e95252a1325c8c9c859a0b2dcee693 +SHA1 (patch-config_external_moz.build) = c87cecac33f4d0e671e72d55aeef570af8515f17 +SHA1 (patch-config_rules.mk) = e076a6572db9579a05ee9093d34bf3353c50de58 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b -SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949 +SHA1 (patch-config_system-headers) = 923e9f6e4adbb8af4686e5c07cb4520e6f981f93 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 -SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44 -SHA1 (patch-content_media_AudioStream.h) = 255cf76824d96fe907f30414e4ba15ae841d304f -SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13 +SHA1 (patch-content_base_src_moz.build) = 91a7ab80fd1d28882bd1b0ee50f6cc5e55148f46 +SHA1 (patch-content_media_AudioStream.h) = 189ca0059d35dfbe12ea1b71105a242abb005403 SHA1 (patch-content_media_gmp_GMPChild.cpp) = 45ef3a46c624c38dbb5b81deb6409277997c7239 -SHA1 (patch-content_media_gmp_GMPParent.cpp) = ff5ff0d044874ea9cf5cbe27aebc91b24d30c803 +SHA1 (patch-content_media_gmp_GMPParent.cpp) = 765adc26af771aea3e7db094b21c793780465672 SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb +SHA1 (patch-content_media_moz.build) = d7c41801b9325d7d7eb756e5b0de8c6d78460a4f SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4 SHA1 (patch-dom_system_OSFileConstants.cpp) = fec01c3c2c1b7e1c57abe9ec269067ee98eede3d SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a2a0652d0eac018fda06e729bf5ba786dd8a3866 +SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = b987dad1bd4513b8a04fb280bd1c5280a03af746 SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9 -SHA1 (patch-gfx_skia_Makefile.in) = 03349db0ff9b14c2012c36d746adf2ee6cb87e62 -SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0 -SHA1 (patch-gfx_ycbcr_yuv__row__arm.s) = e9bcb52b892da1f7c4dd891fedf3cd918b5c7732 +SHA1 (patch-gfx_skia_generate__mozbuild.py) = e0bf45842ae74f896678b1c29d97606165cf5914 +SHA1 (patch-gfx_skia_moz.build) = ce83717ec6e386d52af75a0f5592fa866b83b3bc +SHA1 (patch-gfx_thebes_moz.build) = f64917350eaf693866b0e7196cb7f1cc9e9470fc +SHA1 (patch-gfx_ycbcr_moz.build) = 121386ef62ff7425e6f93bc624555199f2ac3485 +SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = f9909ded72762b2c3547dd002707db43745f2b9d SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574 -SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee -SHA1 (patch-intl_unicharutil_util_Makefile.in) = 77ee18c5a8d5745f6350862109e0ccf028736d9f +SHA1 (patch-intl_hyphenation_hnjalloc.h) = 5b5ac622ed2dd8711f00be0af59c95ebc86a8a78 +SHA1 (patch-intl_unicharutil_util_moz.build) = d8e4f9c0b013e4b0c9fdb41eaf65336963c2d633 SHA1 (patch-ipc_chromium_Makefile.in) = edd85b79cd3879f7595b932442bb0e93505d5506 SHA1 (patch-ipc_chromium_moz.build) = de12255865e45cfdf0f7dc57ce101be75ac8ad54 SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a @@ -72,34 +74,33 @@ SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8 SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105 SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475 -SHA1 (patch-js_src_Makefile.in) = fffae52dcb5f267e6553a7de69c21fdfec0f3072 -SHA1 (patch-js_src_assembler_jit_ExecutableAllocator.h) = 166a6d0ff566af3032c009498a4d4b43ddc10413 +SHA1 (patch-js_src_Makefile.in) = 4f90e74c19b379bf756210a0cebda265876a2fa1 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc SHA1 (patch-js_src_gc_Memory.cpp) = f2ee54f0a05d870651a3235b95bbb346586f3c3c -SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = 67e02c42753d7ffd982ade192a5beb8c5140573c SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 -SHA1 (patch-js_src_vm_WeakMapPtr.cpp) = c1778892afa6fb97de911221715a14f6dd9cab2f SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 3406e02342d8a890b83a241ee2cc8cd9b3fefdaa SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af -SHA1 (patch-media_libcubeb_src_Makefile.in) = fe880774789b0be54dec6fd83b89457fc8c2cabc SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db -SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 833a7d863de5099aa8f860142b33ea11d2a26582 -SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = d662f0f4c4a326071f59f7fff14018c6239c64ee -SHA1 (patch-media_libcubeb_src_moz.build) = a56289d1387e93bc62d7852520a488443bec233c +SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 8c275bf024bf23dc42f82e6a0765ddc8b18bc1a9 +SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 2e178fb158c39660fcb29c1e5818751d7e557a66 +SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696 SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = 1325f23c87d2bb3fc0071b4cf0054e854dfea689 SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = fdadd8b7e28290aabae4bab78597b4968f63eaf1 SHA1 (patch-media_libtheora_Makefile.in) = 80ac9cb20760fe4d94047f7cb1c6a16bbdd6b505 SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718 +SHA1 (patch-media_libtheora_moz.build) = 2763d7df258bd41ca776aa7461b0c5be646fa61c SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af +SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910 SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53 +SHA1 (patch-media_libvorbis_moz.build) = 927f7848305eb2341c9efa96800d30b4a1b8eaa4 SHA1 (patch-media_libyuv_include_libyuv_scale__row.h) = 503b6f2065e9d548a1f01f7158d65874f4886c78 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) = de7055f891387f96f8fd32366c7189d480354e9e SHA1 (patch-media_webrtc_signaling_signaling.gyp) = 91d5fcc2409b1398c84dedc9697107f815de48fc -SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 4cbc1c8b168033eaecdf1dd65eae16820a6a2443 +SHA1 (patch-media_webrtc_signaling_test_moz.build) = 3546ba6548cc8d39800cc7c55688436455d52d3d 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_desktop__capture_screen__capturer.cc) = 53481a80b410afe962146f08eafe8ff38ac6a241 @@ -108,6 +109,7 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info_ SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ffc1d956e826a0005b76285596ba24a2f4a3806c SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = d310cf4ebf4701d25a1865c7e651829be6d63b8c SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 78a9522f0e37cfc3ec8267e6c15de9dba0ec7ff3 +SHA1 (patch-memory_build_mozjemalloc__compat.c) = ce6cd2865fd7ee6dd6a5926c9f85a2d6aa086517 SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543 SHA1 (patch-memory_jemalloc_src_configure) = 563834e1a0dc0eba17b4f263de26787672ff9200 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9d9036ddd28c7b8ce37860e0120df2997a3a0c59 @@ -119,22 +121,38 @@ SHA1 (patch-mobile_android_installer_Makefile.in) = b2ea844a0145f4c15ef1b350dde6 SHA1 (patch-mobile_android_installer_package-manifest.in) = 9664858fe3b4593eb29dd0180d5a2df3cd245bb2 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a SHA1 (patch-netwerk_dns_Makefile.in) = b6bd9814d909dd6f7cff10dbeac3bedd79c2508e +SHA1 (patch-netwerk_dns_moz.build) = 01dd7d9094ddaeffbcd6cfa296e28fb56681b0e6 +SHA1 (patch-netwerk_wifi_moz.build) = 7c84003d442f698b030f3fef91fea2f5537b404c +SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = d43961a396bccc6bbe1dba2b4c1f97d5017c6d6d SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4 SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a SHA1 (patch-probes_Makefile.in) = 9a8d48556daaaa17996133a6183b1d27f0510361 SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac +SHA1 (patch-toolkit_components_alerts_nsAlertsService.cpp) = e84436c5d5bde7ef23bf60b5f33c63924730e1da SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890 -SHA1 (patch-toolkit_library_libxul.mk) = e72967ccfa040bda8fdf5ead75822d7b97730244 +SHA1 (patch-toolkit_library_moz.build) = 4e768a5388e1b22af9a7b2746fadf392ba0a8e8c SHA1 (patch-toolkit_modules_GMPInstallManager.jsm) = 7e410806f44e7f20109260bef96cd13101c27664 SHA1 (patch-toolkit_mozapps_extensions_internal_OpenH264Provider.jsm) = 75647c1b705bcac8b64064e1eea26cb15b435613 +SHA1 (patch-toolkit_system_gnome_moz.build) = 75a35ca36fb760adf5b49134cb843608e6aa9eb5 +SHA1 (patch-toolkit_system_gnome_nsAlertsIconListener.cpp) = 1592d74ee04ea5577a19a5164c184fae56880556 +SHA1 (patch-toolkit_system_gnome_nsAlertsIconListener.h) = c7f6394134a8876ae5637d1444b64d85d95f7072 +SHA1 (patch-toolkit_system_gnome_nsGnomeModule.cpp) = 8e28490cfffaf868f27643044aeb0178c1929215 +SHA1 (patch-toolkit_system_gnome_nsSystemAlertsService.cpp) = 1024f24a8d65a27f87056deb587fc967f016d020 +SHA1 (patch-toolkit_system_gnome_nsSystemAlertsService.h) = ba4b9507f0e3e598788cd44c503a5735e682da87 SHA1 (patch-toolkit_toolkit.mozbuild) = 0993d50cc02c2b421e6de087dfb0a9cb30562c6b SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c +SHA1 (patch-widget_gtk_gtk2drawing.c) = 9c5e8c6045c23b670730fc18620ea30f9ad6437b +SHA1 (patch-widget_gtk_gtk3drawing.c) = b40a87a92bb8d8737d9a24263cb7c02c4dfbd32d +SHA1 (patch-widget_gtk_gtkdrawing.h) = 861c895f529e326871a9c80a237029f2baa68a5a +SHA1 (patch-widget_gtk_mozgtk_mozgtk.c) = c6ffe6d2662ca6ec82958ab3f3c31bccf4aaf1ab +SHA1 (patch-widget_gtk_nsNativeThemeGTK.cpp) = 15c4325db15da13471d244a7020c458d2e2f86e9 +SHA1 (patch-widget_gtk_nsWindow.cpp) = b9f4cb3c46c34438b136246396de571ccf23d9b6 SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 2475818905150a4779607ab24ea6bd261e62f5bd SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438 -SHA1 (patch-xpcom_build_nsXPComInit.cpp) = 727fd1ce934f129de5fcc5e6059d3cb8c30b1e17 +SHA1 (patch-xpcom_build_nsXPComInit.cpp) = 6a476877d38a07b8300d542067dda13b2739182c SHA1 (patch-xpcom_ds_TimeStamp.h) = fe7dd3f21a2998b72f3cb7505002338f36781bed SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = a0445488bbcabe7a67a83df3d75f2d956e172a1f @@ -145,7 +163,7 @@ SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cb7 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 71a33723a557a6153405f6baec8404b25f841608 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239 -SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = 31a0f8c82cedab37a3737b93206d8b3ed7a6727f +SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = bb0c80db483776fc07682e5939b652578f33eb17 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp) = d246f0695eb43d43bfd5571297945a4b7a88f72c diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index 55b58c76902..e156f453c6b 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +$NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ * The profiler does not support Darwin/PPC so don't try to enable it on that platform. @@ -13,18 +13,9 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ heavy patching. Ideally they should be fixed individually but that will be an extremely hard work, so don't define XP_MACOSX for now. ---- configure.in.orig 2014-10-11 09:06:18.000000000 +0000 +--- configure.in.orig 2014-11-21 03:37:23.000000000 +0000 +++ configure.in -@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH - MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation - MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)' - --MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)' -+MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)' - MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)' - MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib' - XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)' -@@ -1680,7 +1680,13 @@ Linux) +@@ -1652,7 +1652,13 @@ Linux) MOZ_ENABLE_PROFILER_SPS= esac ;; @@ -39,7 +30,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ *) MOZ_ENABLE_PROFILER_SPS= ;; -@@ -1784,7 +1790,7 @@ case "$host" in +@@ -1756,7 +1762,7 @@ case "$host" in ;; *-darwin*) @@ -48,7 +39,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; -@@ -1916,7 +1922,6 @@ case "$target" in +@@ -1888,7 +1894,6 @@ case "$target" in AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit' else @@ -56,7 +47,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' # The ExceptionHandling framework is needed for Objective-C exception -@@ -2539,8 +2544,7 @@ MOZ_CXX11 +@@ -2504,8 +2509,7 @@ MOZ_CXX11 AC_LANG_C @@ -66,16 +57,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -2679,7 +2683,7 @@ if test "$ac_cv_sockaddr_sa_len" = true - AC_DEFINE(HAVE_SA_LEN) - fi - --AC_ARG_ENABLE(dtrace, -+MOZ_ARG_ENABLE_BOOL(dtrace, - [ --enable-dtrace build with dtrace support if available (default=no)], - [enable_dtrace="yes"],) - if test "x$enable_dtrace" = "xyes"; then -@@ -3576,6 +3580,14 @@ if test -n "$YASM"; then +@@ -3542,6 +3546,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -90,7 +72,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3603,11 +3615,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -3569,11 +3581,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -103,7 +85,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -4293,6 +4301,10 @@ cairo-gonk) +@@ -4267,6 +4275,10 @@ cairo-gonk) esac @@ -114,7 +96,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ AC_SUBST(MOZ_PDF_PRINTING) if test "$MOZ_PDF_PRINTING"; then PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" -@@ -5012,6 +5024,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -4980,6 +4992,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VPX=1 MOZ_VPX_ERROR_CONCEALMENT=1 @@ -124,7 +106,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5102,6 +5117,63 @@ if test "${ac_cv_c_attribute_aligned}" ! +@@ -5083,6 +5098,57 @@ if test "${ac_cv_c_attribute_aligned}" ! fi dnl ======================================================== @@ -147,8 +129,6 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +fi + +AC_SUBST(MOZ_NATIVE_OGG) -+AC_SUBST(MOZ_OGG_CFLAGS) -+AC_SUBST(MOZ_OGG_LIBS) + +dnl ======================================================== +dnl Check for libvorbis @@ -164,8 +144,6 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +fi + +AC_SUBST(MOZ_NATIVE_VORBIS) -+AC_SUBST(MOZ_VORBIS_CFLAGS) -+AC_SUBST(MOZ_VORBIS_LIBS) + +dnl ======================================================== +dnl Check for integer-only libvorbis aka tremor @@ -181,14 +159,12 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +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, -@@ -5110,6 +5182,97 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5091,6 +5157,89 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -207,8 +183,6 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +fi + +AC_SUBST(MOZ_NATIVE_OPUS) -+AC_SUBST(MOZ_OPUS_CFLAGS) -+AC_SUBST(MOZ_OPUS_LIBS) + +dnl ======================================================== +dnl Check for libtheora @@ -224,8 +198,6 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +fi + +AC_SUBST(MOZ_NATIVE_THEORA) -+AC_SUBST(MOZ_THEORA_CFLAGS) -+AC_SUBST(MOZ_THEORA_LIBS) + +dnl ======================================================== +dnl Check for libspeex resampler @@ -241,8 +213,6 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +fi + +AC_SUBST(MOZ_NATIVE_SPEEX) -+AC_SUBST(MOZ_SPEEX_CFLAGS) -+AC_SUBST(MOZ_SPEEX_LIBS) + +dnl ======================================================== +dnl Check for libsoundtouch @@ -279,14 +249,12 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +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, -@@ -5462,6 +5625,60 @@ fi +@@ -5449,6 +5598,60 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -347,7 +315,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -5475,12 +5692,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, +@@ -5462,12 +5665,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, MOZ_ALSA=1, MOZ_ALSA=) @@ -369,9 +337,9 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +fi + AC_SUBST(MOZ_ALSA) - AC_SUBST(MOZ_ALSA_CFLAGS) - AC_SUBST(MOZ_ALSA_LIBS) -@@ -5904,7 +6132,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, + + dnl ======================================================== +@@ -5891,7 +6105,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, if test "$MOZ_GAMEPAD"; then case "$OS_TARGET" in Darwin) @@ -382,7 +350,7 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ ;; WINNT) case "$MOZ_WINSDK_MAXVER" in -@@ -8014,6 +8244,52 @@ if test "$USE_FC_FREETYPE"; then +@@ -8020,6 +8236,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== @@ -399,12 +367,11 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +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, @@ -428,10 +395,17 @@ $NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $ +fi + +AC_SUBST(MOZ_NATIVE_GRAPHITE2) -+AC_SUBST(MOZ_GRAPHITE2_CFLAGS) -+AC_SUBST(MOZ_GRAPHITE2_LIBS) + +dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== +@@ -8275,7 +8534,7 @@ case "$OS_TARGET" in + NECKO_WIFI=1 + fi + ;; +- Darwin|FreeBSD|SunOS|WINNT) ++ Darwin|DragonFly|FreeBSD|SunOS|WINNT) + NECKO_WIFI=1 + ;; + Linux) diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as index 0f459bfc7dd..c3be1cf2094 100644 --- a/www/firefox/patches/patch-as +++ b/www/firefox/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.12 2014/10/05 01:59:08 ryoon Exp $ +$NetBSD: patch-as,v 1.13 2014/12/01 18:11:14 ryoon Exp $ Treat DragonFly like FreeBSD. ---- js/src/configure.in.orig 2014-09-24 01:05:20.000000000 +0000 +--- js/src/configure.in.orig 2014-11-21 03:37:33.000000000 +0000 +++ js/src/configure.in -@@ -2093,8 +2093,7 @@ AC_LANG_CPLUSPLUS +@@ -2089,8 +2089,7 @@ AC_LANG_CPLUSPLUS MOZ_CXX11 @@ -14,16 +14,7 @@ Treat DragonFly like FreeBSD. dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -2160,7 +2159,7 @@ dnl Quota support - MOZ_CHECK_HEADERS(sys/quota.h) - MOZ_CHECK_HEADERS(linux/quota.h) - --AC_ARG_ENABLE(dtrace, -+MOZ_ARG_ENABLE_BOOL(dtrace, - [ --enable-dtrace build with dtrace support if available (default=no)], - [enable_dtrace="yes"],) - if test "x$enable_dtrace" = "xyes"; then -@@ -3108,7 +3107,7 @@ if test "$MOZ_MEMORY"; then +@@ -3004,7 +3003,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; @@ -32,7 +23,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) -@@ -4038,6 +4037,16 @@ MOZ_SUBCONFIGURE_ICU() +@@ -3924,6 +3923,16 @@ MOZ_SUBCONFIGURE_ICU() dnl ======================================================== dnl JavaScript shell dnl ======================================================== diff --git a/www/firefox/patches/patch-b2g_installer_Makefile.in b/www/firefox/patches/patch-b2g_installer_Makefile.in deleted file mode 100644 index 9adca6c63a6..00000000000 --- a/www/firefox/patches/patch-b2g_installer_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-b2g_installer_Makefile.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $ - ---- b2g/installer/Makefile.in.orig 2014-07-17 01:45:05.000000000 +0000 -+++ b2g/installer/Makefile.in -@@ -61,6 +61,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS) - DEFINES += -DMOZ_RTSP - endif - -+ifdef MOZ_DEBUG -+DEFINES += -DMOZ_DEBUG=1 -+endif -+ - ifdef GKMEDIAS_SHARED_LIBRARY - DEFINES += -DGKMEDIAS_SHARED_LIBRARY - endif diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build index f050fea1d13..9908bffa633 100644 --- a/www/firefox/patches/patch-config_external_moz.build +++ b/www/firefox/patches/patch-config_external_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-config_external_moz.build,v 1.4 2014/10/05 01:59:08 ryoon Exp $ +$NetBSD: patch-config_external_moz.build,v 1.5 2014/12/01 18:11:14 ryoon Exp $ ---- config/external/moz.build.orig 2014-09-24 01:05:10.000000000 +0000 +--- config/external/moz.build.orig 2014-11-21 03:37:23.000000000 +0000 +++ config/external/moz.build -@@ -15,13 +15,19 @@ if CONFIG['MOZ_UPDATER']: +@@ -16,13 +16,19 @@ if CONFIG['MOZ_UPDATER']: if not CONFIG['MOZ_NATIVE_BZ2']: external_dirs += ['modules/libbz2'] @@ -25,7 +25,7 @@ $NetBSD: patch-config_external_moz.build,v 1.4 2014/10/05 01:59:08 ryoon Exp $ external_dirs += ['media/libopus'] if CONFIG['MOZ_WEBM']: -@@ -36,14 +42,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ +@@ -37,14 +43,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ if not CONFIG['MOZ_NATIVE_PNG']: external_dirs += ['media/libpng'] @@ -45,4 +45,4 @@ $NetBSD: patch-config_external_moz.build,v 1.4 2014/10/05 01:59:08 ryoon Exp $ - 'media/libsoundtouch', ] - PARALLEL_DIRS += ['../../' + i for i in external_dirs] + DIRS += ['../../' + i for i in external_dirs] diff --git a/www/firefox/patches/patch-config_rules.mk b/www/firefox/patches/patch-config_rules.mk index 81d9426b9dc..61070804d3a 100644 --- a/www/firefox/patches/patch-config_rules.mk +++ b/www/firefox/patches/patch-config_rules.mk @@ -1,16 +1,16 @@ -$NetBSD: patch-config_rules.mk,v 1.1 2014/07/24 14:57:12 ryoon Exp $ +$NetBSD: patch-config_rules.mk,v 1.2 2014/12/01 18:11:14 ryoon Exp $ ---- config/rules.mk.orig 2014-07-17 01:45:08.000000000 +0000 +--- config/rules.mk.orig 2014-11-21 03:37:23.000000000 +0000 +++ config/rules.mk -@@ -832,6 +832,7 @@ endif +@@ -779,6 +779,7 @@ endif ifdef DTRACE_PROBE_OBJ EXTRA_DEPS += $(DTRACE_PROBE_OBJ) OBJS += $(DTRACE_PROBE_OBJ) +EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ) endif - $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS) -@@ -867,7 +868,7 @@ ifdef DTRACE_PROBE_OBJ + $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(STATIC_LIBS_DEPS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS)) $(EXTRA_DEPS) $(GLOBAL_DEPS) +@@ -814,7 +815,7 @@ ifdef DTRACE_PROBE_OBJ ifndef DTRACE_LIB_DEPENDENT NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS)) $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS) @@ -19,12 +19,12 @@ $NetBSD: patch-config_rules.mk,v 1.1 2014/07/24 14:57:12 ryoon Exp $ endif endif endif -@@ -885,7 +886,7 @@ ifndef INCREMENTAL_LINKER +@@ -832,7 +833,7 @@ ifndef INCREMENTAL_LINKER endif ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX - dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) + dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS)) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS)) @$(RM) $(DTRACE_PROBE_OBJ) diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers index 2c44133a37a..aabd1fea784 100644 --- a/www/firefox/patches/patch-config_system-headers +++ b/www/firefox/patches/patch-config_system-headers @@ -1,17 +1,21 @@ -$NetBSD: patch-config_system-headers,v 1.10 2014/07/24 14:57:12 ryoon Exp $ +$NetBSD: patch-config_system-headers,v 1.11 2014/12/01 18:11:14 ryoon Exp $ ---- config/system-headers.orig 2014-07-17 01:45:08.000000000 +0000 +--- config/system-headers.orig 2014-11-21 03:37:23.000000000 +0000 +++ config/system-headers -@@ -1048,8 +1048,6 @@ X11/Xlocale.h +@@ -1267,7 +1267,6 @@ X11/Xlocale.h X11/Xos.h X11/Xutil.h zmouse.h --speex/speex_resampler.h -soundtouch/SoundTouch.h #if MOZ_NATIVE_PNG==1 png.h #endif -@@ -1117,6 +1115,8 @@ ogg/ogg.h +@@ -1329,10 +1328,13 @@ vorbis/codec.h + theora/theoradec.h + tremor/ivorbiscodec.h + speex/speex_resampler.h ++soundtouch/SoundTouch.h + ogg/ogg.h ogg/os_types.h nestegg/nestegg.h cubeb/cubeb.h @@ -20,7 +24,7 @@ $NetBSD: patch-config_system-headers,v 1.10 2014/07/24 14:57:12 ryoon Exp $ #endif gst/gst.h gst/app/gstappsink.h -@@ -1145,3 +1145,37 @@ unicode/utypes.h +@@ -1361,3 +1363,37 @@ unicode/utypes.h #endif libutil.h unwind.h diff --git a/www/firefox/patches/patch-content_base_src_moz.build b/www/firefox/patches/patch-content_base_src_moz.build index 7b476f47430..bf24432883e 100644 --- a/www/firefox/patches/patch-content_base_src_moz.build +++ b/www/firefox/patches/patch-content_base_src_moz.build @@ -1,13 +1,13 @@ -$NetBSD: patch-content_base_src_moz.build,v 1.1 2014/06/11 00:41:36 ryoon Exp $ +$NetBSD: patch-content_base_src_moz.build,v 1.2 2014/12/01 18:11:14 ryoon Exp $ ---- content/base/src/moz.build.orig 2014-05-29 23:30:31.000000000 +0000 +--- content/base/src/moz.build.orig 2014-11-21 03:37:23.000000000 +0000 +++ content/base/src/moz.build -@@ -176,6 +176,9 @@ SOURCES += [ +@@ -196,6 +196,9 @@ SOURCES += [ 'nsObjectLoadingContent.cpp', ] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: -+ SOURCES['nsContentUtils.cpp'].flags += [CONFIG['MOZ_HARFBUZZ_CFLAGS']] ++ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + EXTRA_COMPONENTS += [ 'contentAreaDropListener.js', diff --git a/www/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h index 3980db7b8bf..eed068db2ad 100644 --- a/www/firefox/patches/patch-content_media_AudioStream.h +++ b/www/firefox/patches/patch-content_media_AudioStream.h @@ -1,20 +1,13 @@ -$NetBSD: patch-content_media_AudioStream.h,v 1.9 2014/10/17 16:49:09 joerg Exp $ +$NetBSD: patch-content_media_AudioStream.h,v 1.10 2014/12/01 18:11:14 ryoon Exp $ ---- content/media/AudioStream.h.orig 2014-10-11 09:06:20.000000000 +0000 +--- content/media/AudioStream.h.orig 2014-11-21 03:37:24.000000000 +0000 +++ content/media/AudioStream.h -@@ -17,6 +17,7 @@ - #include "mozilla/RefPtr.h" - - #include "cubeb/cubeb.h" -+#include "soundtouch/SoundTouch.h" - - template <> - class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream> -@@ -26,7 +27,6 @@ public: - }; +@@ -17,7 +17,7 @@ + #include "CubebUtils.h" namespace soundtouch { -class SoundTouch; ++class MOZ_IMPORT_API SoundTouch; } namespace mozilla { diff --git a/www/firefox/patches/patch-content_media_Makefile.in b/www/firefox/patches/patch-content_media_Makefile.in deleted file mode 100644 index ee6f98e7a0d..00000000000 --- a/www/firefox/patches/patch-content_media_Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-content_media_Makefile.in,v 1.3 2014/06/11 00:40:59 ryoon Exp $ - ---- content/media/Makefile.in.orig 2014-05-29 23:30:33.000000000 +0000 -+++ content/media/Makefile.in -@@ -6,3 +6,31 @@ include $(topsrcdir)/config/rules.mk - - CFLAGS += $(GSTREAMER_CFLAGS) - CXXFLAGS += $(GSTREAMER_CFLAGS) -+ -+ifdef MOZ_NATIVE_OGG -+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 diff --git a/www/firefox/patches/patch-content_media_gmp_GMPParent.cpp b/www/firefox/patches/patch-content_media_gmp_GMPParent.cpp index d27f0d8a542..4937f9987ae 100644 --- a/www/firefox/patches/patch-content_media_gmp_GMPParent.cpp +++ b/www/firefox/patches/patch-content_media_gmp_GMPParent.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-content_media_gmp_GMPParent.cpp,v 1.1 2014/10/15 13:43:32 ryoon Exp $ +$NetBSD: patch-content_media_gmp_GMPParent.cpp,v 1.2 2014/12/01 18:11:14 ryoon Exp $ ---- content/media/gmp/GMPParent.cpp.orig 2014-10-11 09:06:20.000000000 +0000 +--- content/media/gmp/GMPParent.cpp.orig 2014-11-21 03:37:24.000000000 +0000 +++ content/media/gmp/GMPParent.cpp -@@ -87,23 +87,16 @@ GMPParent::Init(GeckoMediaPluginService +@@ -90,23 +90,16 @@ GMPParent::Init(GeckoMediaPluginService mService = aService; mDirectory = aPluginDir; @@ -20,7 +20,7 @@ $NetBSD: patch-content_media_gmp_GMPParent.cpp,v 1.1 2014/10/15 13:43:32 ryoon E if (NS_FAILED(rv)) { return rv; } - LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this, + LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this, - NS_LossyConvertUTF16toASCII(parentLeafName).get())); + NS_LossyConvertUTF16toASCII(leafname).get())); diff --git a/www/firefox/patches/patch-content_media_moz.build b/www/firefox/patches/patch-content_media_moz.build new file mode 100644 index 00000000000..326a366b0c2 --- /dev/null +++ b/www/firefox/patches/patch-content_media_moz.build @@ -0,0 +1,29 @@ +$NetBSD: patch-content_media_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- content/media/moz.build.orig 2014-11-21 03:37:24.000000000 +0000 ++++ content/media/moz.build +@@ -213,3 +213,24 @@ if CONFIG['ANDROID_VERSION'] > '15': + + CFLAGS += CONFIG['GSTREAMER_CFLAGS'] + CXXFLAGS += CONFIG['GSTREAMER_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_OGG']: ++ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_THEORA']: ++ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_VORBIS']: ++ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_TREMOR']: ++ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_OPUS']: ++ CXXFLAGS += CONFIG['MOZ_OPUS_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_SPEEX']: ++ CXXFLAGS += CONFIG['MOZ_SPEEX_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_SOUNDTOUCH']: ++ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] diff --git a/www/firefox/patches/patch-gfx_graphite2_moz-gr-update.sh b/www/firefox/patches/patch-gfx_graphite2_moz-gr-update.sh new file mode 100644 index 00000000000..58f68d1c735 --- /dev/null +++ b/www/firefox/patches/patch-gfx_graphite2_moz-gr-update.sh @@ -0,0 +1,20 @@ +$NetBSD: patch-gfx_graphite2_moz-gr-update.sh,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- gfx/graphite2/moz-gr-update.sh.orig 2014-11-21 03:37:30.000000000 +0000 ++++ gfx/graphite2/moz-gr-update.sh +@@ -23,8 +23,14 @@ echo "\nSee" $0 "for update procedure.\n + find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \; + find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \; + ++# closest tag/release to require for system version ++TAG=$(cd ../graphitedev/ && hg parents --template {latesttag}) ++ ++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$TAG/ and tr/./,/ \ ++ if /GR2_VERSION_REQUIRE/" configure.in ++ + # summarize what's been touched +-echo Updated to $CHANGESET. ++echo Updated to $CHANGESET \($TAG for --with-system-graphite2\) + echo Here is what changed in the gfx/graphite2 directory: + echo + diff --git a/www/firefox/patches/patch-gfx_skia_Makefile.in b/www/firefox/patches/patch-gfx_skia_Makefile.in deleted file mode 100644 index d60eeeb5048..00000000000 --- a/www/firefox/patches/patch-gfx_skia_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-gfx_skia_Makefile.in,v 1.4 2014/06/11 00:40:59 ryoon Exp $ - ---- gfx/skia/Makefile.in.orig 2014-05-29 23:30:46.000000000 +0000 -+++ gfx/skia/Makefile.in -@@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) - OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS) - endif - -+ifdef MOZ_NATIVE_HARFBUZZ -+OS_CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif -+ - include $(topsrcdir)/config/rules.mk - - ifeq ($(CPU_ARCH)_$(GNU_CC),arm_1) diff --git a/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py new file mode 100644 index 00000000000..70d45be3860 --- /dev/null +++ b/www/firefox/patches/patch-gfx_skia_generate__mozbuild.py @@ -0,0 +1,14 @@ +$NetBSD: patch-gfx_skia_generate__mozbuild.py,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- gfx/skia/generate_mozbuild.py.orig 2014-11-21 03:37:30.000000000 +0000 ++++ gfx/skia/generate_mozbuild.py +@@ -140,6 +140,9 @@ if CONFIG['GNU_CXX']: + if not CONFIG['CLANG_CXX']: + CXXFLAGS += ['-Wno-logical-op'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git a/www/firefox/patches/patch-gfx_skia_moz.build b/www/firefox/patches/patch-gfx_skia_moz.build new file mode 100644 index 00000000000..8cfb92fe6fd --- /dev/null +++ b/www/firefox/patches/patch-gfx_skia_moz.build @@ -0,0 +1,14 @@ +$NetBSD: patch-gfx_skia_moz.build,v 1.8 2014/12/01 18:11:14 ryoon Exp $ + +--- gfx/skia/moz.build.orig 2014-11-21 03:37:30.000000000 +0000 ++++ gfx/skia/moz.build +@@ -968,6 +968,9 @@ if CONFIG['GNU_CXX']: + if not CONFIG['CLANG_CXX']: + CXXFLAGS += ['-Wno-logical-op'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git a/www/firefox/patches/patch-gfx_thebes_Makefile.in b/www/firefox/patches/patch-gfx_thebes_Makefile.in deleted file mode 100644 index feaca8e8f95..00000000000 --- a/www/firefox/patches/patch-gfx_thebes_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-gfx_thebes_Makefile.in,v 1.2 2014/04/30 15:07:18 ryoon Exp $ - ---- 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) $(TK_CFLAGS) - CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) - -+ifdef MOZ_NATIVE_GRAPHITE2 -+CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS) -+endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif -+ - ifeq ($(MOZ_WIDGET_TOOLKIT),android) - CXXFLAGS += $(CAIRO_FT_CFLAGS) - endif diff --git a/www/firefox/patches/patch-gfx_thebes_moz.build b/www/firefox/patches/patch-gfx_thebes_moz.build new file mode 100644 index 00000000000..1cf85e20219 --- /dev/null +++ b/www/firefox/patches/patch-gfx_thebes_moz.build @@ -0,0 +1,17 @@ +$NetBSD: patch-gfx_thebes_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- gfx/thebes/moz.build.orig 2014-11-21 03:37:31.000000000 +0000 ++++ gfx/thebes/moz.build +@@ -276,6 +276,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS'] + CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CFLAGS += CONFIG['TK_CFLAGS'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_GRAPHITE2']: ++ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'): + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] + diff --git a/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.s b/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.s deleted file mode 100644 index 5215b008a58..00000000000 --- a/www/firefox/patches/patch-gfx_ycbcr_yuv__row__arm.s +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-gfx_ycbcr_yuv__row__arm.s,v 1.1 2014/11/26 14:56:28 ryoon Exp $ - ---- gfx/ycbcr/yuv_row_arm.s.orig 2014-11-13 22:49:57.000000000 +0000 -+++ gfx/ycbcr/yuv_row_arm.s -@@ -299,6 +299,6 @@ s42xbily_neon_done: - .fnend - .size ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, .-ScaleYCbCr42xToRGB565_BilinearY_Row_NEON - --#if defined(__ELF__)&&defined(__linux__) -+#if defined(__ELF__)&&(defined(__linux__) || defined(__NetBSD__)) - .section .note.GNU-stack,"",%progbits - #endif diff --git a/www/firefox/patches/patch-intl_hyphenation_hnjalloc.h b/www/firefox/patches/patch-intl_hyphenation_hnjalloc.h new file mode 100644 index 00000000000..3ecd99e5f4c --- /dev/null +++ b/www/firefox/patches/patch-intl_hyphenation_hnjalloc.h @@ -0,0 +1,14 @@ +$NetBSD: patch-intl_hyphenation_hnjalloc.h,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- intl/hyphenation/hnjalloc.h.orig 2014-11-21 03:37:31.000000000 +0000 ++++ intl/hyphenation/hnjalloc.h +@@ -24,6 +24,9 @@ + */ + + #include <stdio.h> /* ensure stdio.h is loaded before our macros */ ++#ifdef __sun ++#include <wchar.h> ++#endif + + #undef FILE + #define FILE hnjFile diff --git a/www/firefox/patches/patch-intl_hyphenation_src_hnjalloc.h b/www/firefox/patches/patch-intl_hyphenation_src_hnjalloc.h deleted file mode 100644 index 3f9678f17de..00000000000 --- a/www/firefox/patches/patch-intl_hyphenation_src_hnjalloc.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-intl_hyphenation_src_hnjalloc.h,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- intl/hyphenation/src/hnjalloc.h.orig 2013-05-11 19:19:31.000000000 +0000 -+++ intl/hyphenation/src/hnjalloc.h -@@ -56,6 +56,9 @@ - */ - - #include <stdio.h> /* ensure stdio.h is loaded before our macros */ -+#ifdef __sun -+#include <wchar.h> -+#endif - - #undef FILE - #define FILE hnjFile diff --git a/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in b/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in deleted file mode 100644 index 4babeb2c3d8..00000000000 --- a/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-intl_unicharutil_util_Makefile.in,v 1.3 2014/10/15 13:07:07 ryoon Exp $ - ---- intl/unicharutil/util/Makefile.in.orig 2014-10-11 09:06:28.000000000 +0000 -+++ intl/unicharutil/util/Makefile.in -@@ -15,3 +15,11 @@ include $(topsrcdir)/config/rules.mk - ifdef ENABLE_INTL_API - LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) - endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS) -+endif diff --git a/www/firefox/patches/patch-intl_unicharutil_util_moz.build b/www/firefox/patches/patch-intl_unicharutil_util_moz.build new file mode 100644 index 00000000000..7fb76239f8c --- /dev/null +++ b/www/firefox/patches/patch-intl_unicharutil_util_moz.build @@ -0,0 +1,11 @@ +$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- intl/unicharutil/util/moz.build.orig 2014-11-21 03:37:32.000000000 +0000 ++++ intl/unicharutil/util/moz.build +@@ -37,3 +37,6 @@ if CONFIG['_MSC_VER']: + + if CONFIG['ENABLE_INTL_API']: + CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] ++ ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] diff --git a/www/firefox/patches/patch-js_src_Makefile.in b/www/firefox/patches/patch-js_src_Makefile.in index 32c0f420d51..6fce0a50b04 100644 --- a/www/firefox/patches/patch-js_src_Makefile.in +++ b/www/firefox/patches/patch-js_src_Makefile.in @@ -1,26 +1,18 @@ -$NetBSD: patch-js_src_Makefile.in,v 1.9 2014/10/15 13:07:07 ryoon Exp $ +$NetBSD: patch-js_src_Makefile.in,v 1.10 2014/12/01 18:11:14 ryoon Exp $ ---- js/src/Makefile.in.orig 2014-10-11 09:06:29.000000000 +0000 +--- js/src/Makefile.in.orig 2014-11-21 03:37:33.000000000 +0000 +++ js/src/Makefile.in -@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MA - STATIC_LIBRARY_NAME = js_static - LIBS = $(NSPR_LIBS) +@@ -16,9 +16,6 @@ TOPLEVEL_BUILD := 1 + + run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') -DIST_INSTALL = 1 +-NO_EXPAND_LIBS = 1 - - ifdef JS_STANDALONE - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt) - ifndef MOZ_NATIVE_ZLIB -@@ -226,7 +224,7 @@ EXTRA_LIBS += $(MOZ_ZLIB_LIBS) - ifdef MOZ_SHARED_ICU - EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) - else --SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) -+SHARED_LIBRARY_LIBS += $(filter-out -L% -l% -Wl%,$(MOZ_ICU_LIBS)) - endif - - ifeq ($(OS_ARCH),FreeBSD) -@@ -344,7 +342,7 @@ endif + ifdef JS_HAS_CTYPES + ifdef MOZ_NATIVE_FFI + LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) +@@ -295,7 +292,7 @@ endif ifdef HAVE_DTRACE $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d diff --git a/www/firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator.h b/www/firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator.h deleted file mode 100644 index 4575630c6b4..00000000000 --- a/www/firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-js_src_assembler_jit_ExecutableAllocator.h,v 1.1 2014/11/26 14:56:28 ryoon Exp $ - -* Define cacheFlush for NetBSD. - ---- js/src/assembler/jit/ExecutableAllocator.h.orig 2014-11-13 22:50:00.000000000 +0000 -+++ js/src/assembler/jit/ExecutableAllocator.h -@@ -478,7 +478,7 @@ public: - } - #elif WTF_CPU_ARM_TRADITIONAL && WTF_OS_LINUX && WTF_COMPILER_RVCT - static __asm void cacheFlush(void* code, size_t size); --#elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_LINUX || WTF_OS_ANDROID) && WTF_COMPILER_GCC -+#elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_LINUX || WTF_OS_ANDROID || WTF_OS_NETBSD) && WTF_COMPILER_GCC - static void cacheFlush(void* code, size_t size) - { - asm volatile ( diff --git a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp deleted file mode 100644 index 02583fccc4f..00000000000 --- a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.1 2014/11/26 14:56:28 ryoon Exp $ - -* NetBSD has no asm/hwcap.h (Linux's header file). - ---- js/src/jit/arm/Architecture-arm.cpp.orig 2014-11-13 22:50:01.000000000 +0000 -+++ js/src/jit/arm/Architecture-arm.cpp -@@ -18,7 +18,7 @@ - - #define HWCAP_USE_HARDFP_ABI (1 << 27) - --#if !(defined(ANDROID) || defined(MOZ_B2G)) && !defined(JS_ARM_SIMULATOR) -+#if !(defined(ANDROID) || defined(MOZ_B2G) || defined(__NetBSD__))) && !defined(JS_ARM_SIMULATOR) - #define HWCAP_ARMv7 (1 << 28) - #include <asm/hwcap.h> - #else diff --git a/www/firefox/patches/patch-js_src_vm_WeakMapPtr.cpp b/www/firefox/patches/patch-js_src_vm_WeakMapPtr.cpp deleted file mode 100644 index 123e27156ef..00000000000 --- a/www/firefox/patches/patch-js_src_vm_WeakMapPtr.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-js_src_vm_WeakMapPtr.cpp,v 1.1 2014/10/05 01:59:08 ryoon Exp $ - -https://hg.mozilla.org/mozilla-central/rev/c64aa77208a6 - ---- js/src/vm/WeakMapPtr.cpp.orig 2014-09-24 01:05:24.000000000 +0000 -+++ js/src/vm/WeakMapPtr.cpp -@@ -120,9 +120,9 @@ JS::WeakMapPtr<K, V>::put(JSContext *cx, - // Supported specializations of JS::WeakMap: - // - --template class JS::WeakMapPtr<JSObject*, JSObject*>; -+template class JS_PUBLIC_API(JS::WeakMapPtr)<JSObject*, JSObject*>; - - #ifdef DEBUG - // Nobody's using this at the moment, but we want to make sure it compiles. --template class JS::WeakMapPtr<JSObject*, JS::Value>; -+template class JS_PUBLIC_API(JS::WeakMapPtr)<JSObject*, JS::Value>; - #endif diff --git a/www/firefox/patches/patch-media_libcubeb_src_Makefile.in b/www/firefox/patches/patch-media_libcubeb_src_Makefile.in deleted file mode 100644 index c2d532aa1c7..00000000000 --- a/www/firefox/patches/patch-media_libcubeb_src_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-media_libcubeb_src_Makefile.in,v 1.2 2014/06/11 00:40:59 ryoon Exp $ - ---- media/libcubeb/src/Makefile.in.orig 2014-05-29 23:31:19.000000000 +0000 -+++ media/libcubeb/src/Makefile.in -@@ -9,3 +9,7 @@ CFLAGS += \ - $(MOZ_ALSA_CFLAGS) \ - $(MOZ_PULSEAUDIO_CFLAGS) \ - $(NULL) -+ -+ifdef MOZ_NATIVE_SPEEX -+CFLAGS += $(MOZ_SPEEX_CFLAGS) -+endif diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c index bad45d0d925..c9c1573946a 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c @@ -1,6 +1,6 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.5 2014/12/01 18:11:14 ryoon Exp $ ---- media/libcubeb/src/cubeb_alsa.c.orig 2014-10-11 09:06:39.000000000 +0000 +--- media/libcubeb/src/cubeb_alsa.c.orig 2014-11-21 03:37:42.000000000 +0000 +++ media/libcubeb/src/cubeb_alsa.c @@ -6,11 +6,15 @@ */ @@ -78,7 +78,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon }; enum stream_state { -@@ -261,7 +311,7 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -262,7 +312,7 @@ alsa_refill_stream(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); @@ -87,7 +87,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (r < 0 || revents != POLLOUT) { /* This should be a stream error; it makes no sense for poll(2) to wake for this stream and then have the stream report that it's not ready. -@@ -270,10 +320,10 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -271,10 +321,10 @@ alsa_refill_stream(cubeb_stream * stm) return RUNNING; } @@ -101,7 +101,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon } /* Failed to recover from an xrun, this stream must be broken. */ -@@ -292,8 +342,8 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -293,8 +343,8 @@ alsa_refill_stream(cubeb_stream * stm) available to write. If avail is still zero here, the stream must be in a funky state, so recover and try again. */ if (avail == 0) { @@ -112,7 +112,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (avail <= 0) { pthread_mutex_unlock(&stm->mutex); stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); -@@ -301,7 +351,7 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -302,7 +352,7 @@ alsa_refill_stream(cubeb_stream * stm) } } @@ -121,12 +121,12 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon assert(p); pthread_mutex_unlock(&stm->mutex); -@@ -313,10 +363,10 @@ alsa_refill_stream(cubeb_stream * stm) - return ERROR; - } - if (got > 0) { -- snd_pcm_sframes_t wrote = snd_pcm_writei(stm->pcm, p, got); -+ snd_pcm_sframes_t wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); +@@ -327,10 +377,10 @@ alsa_refill_stream(cubeb_stream * stm) + b[i] *= stm->volume; + } + } +- wrote = snd_pcm_writei(stm->pcm, p, got); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); if (wrote == -EPIPE) { - snd_pcm_recover(stm->pcm, wrote, 1); - wrote = snd_pcm_writei(stm->pcm, p, got); @@ -135,7 +135,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon } assert(wrote >= 0 && wrote == got); stm->write_position += wrote; -@@ -328,7 +378,7 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -342,7 +392,7 @@ alsa_refill_stream(cubeb_stream * stm) /* Fill the remaining buffer with silence to guarantee one full period has been written. */ @@ -144,7 +144,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon set_timeout(&stm->drain_timeout, buffer_time * 1000); -@@ -439,26 +489,26 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -453,26 +503,26 @@ get_slave_pcm_node(snd_config_t * lconf, slave_def = NULL; @@ -176,7 +176,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (r < 0) { break; } -@@ -467,7 +517,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -481,7 +531,7 @@ get_slave_pcm_node(snd_config_t * lconf, if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -185,7 +185,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (r < 0) { break; } -@@ -476,7 +526,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -490,7 +540,7 @@ get_slave_pcm_node(snd_config_t * lconf, } while (0); if (slave_def) { @@ -194,7 +194,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon } return NULL; -@@ -499,22 +549,22 @@ init_local_config_with_workaround(char c +@@ -513,22 +563,22 @@ init_local_config_with_workaround(char c lconf = NULL; @@ -221,7 +221,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (r < 0) { break; } -@@ -523,7 +573,7 @@ init_local_config_with_workaround(char c +@@ -537,7 +587,7 @@ init_local_config_with_workaround(char c if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -230,7 +230,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (r < 0) { break; } -@@ -534,12 +584,12 @@ init_local_config_with_workaround(char c +@@ -548,12 +598,12 @@ init_local_config_with_workaround(char c } /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ @@ -245,7 +245,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (r < 0) { break; } -@@ -550,18 +600,18 @@ init_local_config_with_workaround(char c +@@ -564,18 +614,18 @@ init_local_config_with_workaround(char c /* Don't clobber an explicit existing handle_underrun value, set it only if it doesn't already exist. */ @@ -267,7 +267,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (r < 0) { break; } -@@ -569,7 +619,7 @@ init_local_config_with_workaround(char c +@@ -583,7 +633,7 @@ init_local_config_with_workaround(char c return lconf; } while (0); @@ -276,7 +276,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon return NULL; } -@@ -581,9 +631,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s +@@ -595,9 +645,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s pthread_mutex_lock(&cubeb_alsa_mutex); if (local_config) { @@ -288,7 +288,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -596,7 +646,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) +@@ -610,7 +660,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) int r; pthread_mutex_lock(&cubeb_alsa_mutex); @@ -297,7 +297,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); return r; -@@ -653,12 +703,65 @@ alsa_init(cubeb ** context, char const * +@@ -667,12 +717,65 @@ alsa_init(cubeb ** context, char const * pthread_attr_t attr; snd_pcm_t * dummy; @@ -364,7 +364,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon cubeb_alsa_error_handler_set = 1; } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -666,6 +769,8 @@ alsa_init(cubeb ** context, char const * +@@ -680,6 +783,8 @@ alsa_init(cubeb ** context, char const * ctx = calloc(1, sizeof(*ctx)); assert(ctx); @@ -373,7 +373,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon ctx->ops = &alsa_ops; r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -715,7 +820,7 @@ alsa_init(cubeb ** context, char const * +@@ -729,7 +834,7 @@ alsa_init(cubeb ** context, char const * config fails with EINVAL, the PA PCM is too old for this workaround. */ if (r == -EINVAL) { pthread_mutex_lock(&cubeb_alsa_mutex); @@ -382,7 +382,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); ctx->local_config = NULL; } else if (r >= 0) { -@@ -754,9 +859,13 @@ alsa_destroy(cubeb * ctx) +@@ -768,9 +873,13 @@ alsa_destroy(cubeb * ctx) pthread_mutex_destroy(&ctx->mutex); free(ctx->fds); @@ -397,7 +397,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon pthread_mutex_unlock(&cubeb_alsa_mutex); } -@@ -823,7 +932,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre +@@ -838,7 +947,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre return CUBEB_ERROR; } @@ -406,7 +406,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon assert(r == 0); /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't -@@ -833,23 +942,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre +@@ -848,23 +957,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre latency = latency < 500 ? 500 : latency; } @@ -436,7 +436,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon assert((nfds_t) r == stm->nfds); r = pthread_cond_init(&stm->cond, NULL); -@@ -880,7 +989,7 @@ alsa_stream_destroy(cubeb_stream * stm) +@@ -895,7 +1004,7 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); if (stm->pcm) { if (stm->state == DRAINING) { @@ -445,7 +445,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon } alsa_locked_pcm_close(stm->pcm); stm->pcm = NULL; -@@ -922,12 +1031,12 @@ alsa_get_max_channel_count(cubeb * ctx, +@@ -937,12 +1046,12 @@ alsa_get_max_channel_count(cubeb * ctx, return CUBEB_ERROR; } @@ -460,7 +460,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon if (rv < 0) { return CUBEB_ERROR; } -@@ -947,34 +1056,34 @@ alsa_get_preferred_sample_rate(cubeb * c +@@ -962,34 +1071,34 @@ alsa_get_preferred_sample_rate(cubeb * c /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ @@ -503,7 +503,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon return CUBEB_OK; } -@@ -998,7 +1107,7 @@ alsa_stream_start(cubeb_stream * stm) +@@ -1013,7 +1122,7 @@ alsa_stream_start(cubeb_stream * stm) ctx = stm->context; pthread_mutex_lock(&stm->mutex); @@ -512,7 +512,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon gettimeofday(&stm->last_activity, NULL); pthread_mutex_unlock(&stm->mutex); -@@ -1032,7 +1141,7 @@ alsa_stream_stop(cubeb_stream * stm) +@@ -1047,7 +1156,7 @@ alsa_stream_stop(cubeb_stream * stm) pthread_mutex_unlock(&ctx->mutex); pthread_mutex_lock(&stm->mutex); @@ -521,7 +521,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1048,8 +1157,8 @@ alsa_stream_get_position(cubeb_stream * +@@ -1063,8 +1172,8 @@ alsa_stream_get_position(cubeb_stream * pthread_mutex_lock(&stm->mutex); delay = -1; @@ -532,7 +532,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon *position = stm->last_position; pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1074,7 +1183,7 @@ alsa_stream_get_latency(cubeb_stream * s +@@ -1089,7 +1198,7 @@ alsa_stream_get_latency(cubeb_stream * s snd_pcm_sframes_t delay; /* This function returns the delay in frames until a frame written using snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c index 08f42a258d6..493f167a070 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c @@ -1,8 +1,8 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.1 2014/10/15 13:43:32 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.2 2014/12/01 18:11:14 ryoon Exp $ ---- media/libcubeb/src/cubeb_oss.c.orig 2014-10-14 18:49:14.000000000 +0000 +--- media/libcubeb/src/cubeb_oss.c.orig 2014-11-30 06:26:27.000000000 +0000 +++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,399 @@ +@@ -0,0 +1,404 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -400,5 +400,10 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.1 2014/10/15 13:43:32 ryoon E + .stream_start = oss_stream_start, + .stream_stop = oss_stream_stop, + .stream_get_position = oss_stream_get_position, -+ .stream_get_latency = oss_stream_get_latency ++ .stream_get_latency = oss_stream_get_latency, ++ .stream_set_volume = oss_stream_set_volume, ++ .stream_set_panning = oss_stream_set_panning, ++ .stream_get_current_device = NULL, ++ .stream_device_destroy = NULL, ++ .stream_register_device_changed_callback = NULL +}; diff --git a/www/firefox/patches/patch-media_libcubeb_src_moz.build b/www/firefox/patches/patch-media_libcubeb_src_moz.build index 6ad39e4ac60..b406fc1d876 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_moz.build +++ b/www/firefox/patches/patch-media_libcubeb_src_moz.build @@ -1,10 +1,10 @@ -$NetBSD: patch-media_libcubeb_src_moz.build,v 1.2 2014/10/15 13:07:07 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_moz.build,v 1.3 2014/12/01 18:11:14 ryoon Exp $ Don't assume cocoa toolkit just because OS_TARGET is Darwin. ---- media/libcubeb/src/moz.build.orig 2014-10-11 09:06:39.000000000 +0000 +--- media/libcubeb/src/moz.build.orig 2014-11-21 03:37:42.000000000 +0000 +++ media/libcubeb/src/moz.build -@@ -16,6 +16,12 @@ if CONFIG['MOZ_ALSA']: +@@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']: ] DEFINES['USE_ALSA'] = True @@ -17,7 +17,7 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin. if CONFIG['MOZ_PULSEAUDIO']: SOURCES += [ 'cubeb_pulse.c', -@@ -30,7 +36,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD': +@@ -31,7 +37,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD': ] DEFINES['USE_SNDIO'] = True @@ -25,10 +25,24 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin. +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': SOURCES += [ 'cubeb_audiounit.c', - ] -@@ -71,4 +77,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk + 'cubeb_osx_run_loop.c' +@@ -65,6 +71,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']: + + FINAL_LIBRARY = 'gkmedias' + ++if CONFIG['MOZ_NATIVE_SPEEX']: ++ SOURCES['cubeb_resampler.cpp'].flags += CONFIG['MOZ_SPEEX_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': + CFLAGS += [ + '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ +@@ -73,7 +82,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk ] ] +CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] FAIL_ON_WARNINGS = True + ++CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] + CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] + CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] diff --git a/www/firefox/patches/patch-media_libtheora_moz.build b/www/firefox/patches/patch-media_libtheora_moz.build new file mode 100644 index 00000000000..d3fbd721bd7 --- /dev/null +++ b/www/firefox/patches/patch-media_libtheora_moz.build @@ -0,0 +1,10 @@ +$NetBSD: patch-media_libtheora_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- media/libtheora/moz.build.orig 2014-11-21 03:37:42.000000000 +0000 ++++ media/libtheora/moz.build +@@ -6,3 +6,5 @@ + + DIRS += ['include', 'lib'] + ++if CONFIG['MOZ_NATIVE_OGG']: ++ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git a/www/firefox/patches/patch-media_libtremor_moz.build b/www/firefox/patches/patch-media_libtremor_moz.build new file mode 100644 index 00000000000..d6c76ea6977 --- /dev/null +++ b/www/firefox/patches/patch-media_libtremor_moz.build @@ -0,0 +1,10 @@ +$NetBSD: patch-media_libtremor_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- media/libtremor/moz.build.orig 2014-11-21 03:37:42.000000000 +0000 ++++ media/libtremor/moz.build +@@ -6,3 +6,5 @@ + + DIRS += ['include/tremor', 'lib'] + ++if CONFIG['MOZ_NATIVE_OGG']: ++ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git a/www/firefox/patches/patch-media_libvorbis_moz.build b/www/firefox/patches/patch-media_libvorbis_moz.build new file mode 100644 index 00000000000..314bc9730c2 --- /dev/null +++ b/www/firefox/patches/patch-media_libvorbis_moz.build @@ -0,0 +1,11 @@ +$NetBSD: patch-media_libvorbis_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- media/libvorbis/moz.build.orig 2014-11-21 03:37:42.000000000 +0000 ++++ media/libvorbis/moz.build +@@ -55,3 +55,6 @@ FINAL_LIBRARY = 'gkmedias' + # Suppress warnings in third-party code. + if CONFIG['GNU_CC']: + CFLAGS += ['-Wno-uninitialized'] ++ ++if CONFIG['MOZ_NATIVE_OGG']: ++ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in b/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in deleted file mode 100644 index 7cb6977b373..00000000000 --- a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-media_webrtc_signaling_test_Makefile.in,v 1.7 2014/10/15 13:07:07 ryoon Exp $ - ---- media/webrtc/signaling/test/Makefile.in.orig 2014-10-11 09:06:40.000000000 +0000 -+++ media/webrtc/signaling/test/Makefile.in -@@ -8,6 +8,7 @@ LIBS = \ - $(NSS_LIBS) \ - $(MOZ_WEBRTC_X11_LIBS) \ - $(REALTIME_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) \ -@@ -49,6 +50,12 @@ LIBS += \ - $(NULL) - endif - -+ifdef MOZ_NATIVE_OPUS -+LIBS += \ -+ $(MOZ_OPUS_LIBS) \ -+ $(NULL) -+endif -+ - ifdef MOZ_NATIVE_LIBVPX - LIBS += \ - $(MOZ_LIBVPX_LIBS) \ diff --git a/www/firefox/patches/patch-media_webrtc_signaling_test_moz.build b/www/firefox/patches/patch-media_webrtc_signaling_test_moz.build new file mode 100644 index 00000000000..6416c59a666 --- /dev/null +++ b/www/firefox/patches/patch-media_webrtc_signaling_test_moz.build @@ -0,0 +1,22 @@ +$NetBSD: patch-media_webrtc_signaling_test_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- media/webrtc/signaling/test/moz.build.orig 2014-11-21 03:37:43.000000000 +0000 ++++ media/webrtc/signaling/test/moz.build +@@ -118,6 +118,7 @@ if CONFIG['JS_SHARED_LIBRARY']: + 'js', + ] + ++OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + OS_LIBS += CONFIG['REALTIME_LIBS'] + +@@ -127,6 +128,9 @@ if CONFIG['MOZ_ALSA']: + if CONFIG['MOZ_NATIVE_JPEG']: + OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] + ++if CONFIG['MOZ_NATIVE_OPUS']: ++ OS_LIBS += CONFIG['MOZ_OPUS_LIBS'] ++ + if CONFIG['MOZ_NATIVE_LIBVPX']: + OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] + diff --git a/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c b/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c new file mode 100644 index 00000000000..91f2a34568d --- /dev/null +++ b/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c @@ -0,0 +1,102 @@ +$NetBSD: patch-memory_build_mozjemalloc__compat.c,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- memory/build/mozjemalloc_compat.c.orig 2014-11-21 03:37:44.000000000 +0000 ++++ memory/build/mozjemalloc_compat.c +@@ -12,6 +12,8 @@ + #include "jemalloc_types.h" + #include "mozilla/Types.h" + ++#include <stdbool.h> ++ + #if defined(MOZ_NATIVE_JEMALLOC) + + MOZ_IMPORT_API int +@@ -47,6 +49,16 @@ je_(nallocm)(size_t *rsize, size_t size, + je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ + } while (0) + ++#define CTL_IJ_GET(n, v, i, j) do { \ ++ size_t mib[6]; \ ++ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ ++ size_t sz = sizeof(v); \ ++ je_(mallctlnametomib)(n, mib, &miblen); \ ++ mib[2] = i; \ ++ mib[4] = j; \ ++ je_(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ ++} while (0) ++ + MOZ_MEMORY_API size_t + malloc_good_size_impl(size_t size) + { +@@ -61,6 +73,48 @@ malloc_good_size_impl(size_t size) + return size; + } + ++static size_t ++compute_bin_unused(unsigned int narenas) ++{ ++ size_t bin_unused = 0; ++ ++ uint32_t nregs; // number of regions per run in the j-th bin ++ size_t reg_size; // size of regions served by the j-th bin ++ size_t curruns; // number of runs belonging to a bin ++ size_t curregs; // number of allocated regions in a bin ++ ++ unsigned int nbins; // number of bins per arena ++ unsigned int i, j; ++ ++ // curruns and curregs are not defined for uninitialized arenas, ++ // so we skip them when computing bin_unused. However, initialized ++ // arenas are not guaranteed to be sequential, so we must test each ++ // one when iterating below. ++ bool initialized[100]; // should be narenas, but MSVC doesn't have VLAs ++ size_t isz = sizeof(initialized) / sizeof(initialized[0]); ++ ++ je_(mallctl)("arenas.initialized", initialized, &isz, NULL, 0); ++ CTL_GET("arenas.nbins", nbins); ++ ++ for (j = 0; j < nbins; j++) { ++ CTL_I_GET("arenas.bin.0.nregs", nregs, j); ++ CTL_I_GET("arenas.bin.0.size", reg_size, j); ++ ++ for (i = 0; i < narenas; i++) { ++ if (!initialized[i]) { ++ continue; ++ } ++ ++ CTL_IJ_GET("stats.arenas.0.bins.0.curruns", curruns, i, j); ++ CTL_IJ_GET("stats.arenas.0.bins.0.curregs", curregs, i, j); ++ ++ bin_unused += (nregs * curruns - curregs) * reg_size; ++ } ++ } ++ ++ return bin_unused; ++} ++ + MOZ_JEMALLOC_API void + jemalloc_stats_impl(jemalloc_stats_t *stats) + { +@@ -68,6 +122,12 @@ jemalloc_stats_impl(jemalloc_stats_t *st + size_t active, allocated, mapped, page, pdirty; + size_t lg_chunk; + ++ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in ++ // src/ctl.c ++ uint64_t epoch = 0; ++ size_t esz = sizeof(epoch); ++ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); ++ + CTL_GET("arenas.narenas", narenas); + CTL_GET("arenas.page", page); + CTL_GET("stats.active", active); +@@ -87,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *st + // We could get this value out of base.c::base_pages, but that really should + // be an upstream change, so don't worry about it for now. + stats->bookkeeping = 0; +- stats->bin_unused = 0; ++ ++ stats->bin_unused = compute_bin_unused(narenas); + } + + MOZ_JEMALLOC_API void diff --git a/www/firefox/patches/patch-netwerk_dns_moz.build b/www/firefox/patches/patch-netwerk_dns_moz.build new file mode 100644 index 00000000000..e58caaf47af --- /dev/null +++ b/www/firefox/patches/patch-netwerk_dns_moz.build @@ -0,0 +1,11 @@ +$NetBSD: patch-netwerk_dns_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- netwerk/dns/moz.build.orig 2014-11-21 03:37:46.000000000 +0000 ++++ netwerk/dns/moz.build +@@ -63,3 +63,6 @@ GENERATED_FILES = [ + LOCAL_INCLUDES += [ + '../base/src', + ] ++ ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] diff --git a/www/firefox/patches/patch-netwerk_wifi_moz.build b/www/firefox/patches/patch-netwerk_wifi_moz.build new file mode 100644 index 00000000000..4a0aa840959 --- /dev/null +++ b/www/firefox/patches/patch-netwerk_wifi_moz.build @@ -0,0 +1,13 @@ +$NetBSD: patch-netwerk_wifi_moz.build,v 1.8 2014/12/01 18:11:14 ryoon Exp $ + +--- netwerk/wifi/moz.build.orig 2014-11-21 03:37:47.000000000 +0000 ++++ netwerk/wifi/moz.build +@@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'Darwin': + UNIFIED_SOURCES += [ + 'osx_corewlan.mm', + ] +-elif CONFIG['OS_ARCH'] == 'FreeBSD': ++elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'): + UNIFIED_SOURCES += [ + 'nsWifiScannerFreeBSD.cpp', + ] diff --git a/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp b/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp new file mode 100644 index 00000000000..60db2b90e0b --- /dev/null +++ b/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp,v 1.6 2014/12/01 18:11:14 ryoon Exp $ + +--- netwerk/wifi/nsWifiScannerFreeBSD.cpp.orig 2014-11-21 03:37:47.000000000 +0000 ++++ netwerk/wifi/nsWifiScannerFreeBSD.cpp +@@ -13,7 +13,11 @@ + #include <sys/socket.h> + #include <net/if.h> + #include <net/if_media.h> ++#ifdef __DragonFly__ ++#include <netproto/802_11/ieee80211_ioctl.h> ++#else + #include <net80211/ieee80211_ioctl.h> ++#endif + + #include <ifaddrs.h> + #include <string.h> diff --git a/www/firefox/patches/patch-toolkit_components_alerts_nsAlertsService.cpp b/www/firefox/patches/patch-toolkit_components_alerts_nsAlertsService.cpp new file mode 100644 index 00000000000..344cc4cd05d --- /dev/null +++ b/www/firefox/patches/patch-toolkit_components_alerts_nsAlertsService.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-toolkit_components_alerts_nsAlertsService.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/components/alerts/nsAlertsService.cpp.orig 2014-11-21 03:37:50.000000000 +0000 ++++ toolkit/components/alerts/nsAlertsService.cpp +@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlert + nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); + nsresult rv; + if (sysAlerts) { +- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, +- aAlertCookie, aAlertListener, aAlertName, +- aBidi, aLang, aData, +- IPC::Principal(aPrincipal)); ++ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener, aAlertName, ++ aBidi, aLang, aData, ++ IPC::Principal(aPrincipal)); ++ if (NS_SUCCEEDED(rv)) ++ return NS_OK; + } + + if (!ShouldShowAlert()) { diff --git a/www/firefox/patches/patch-toolkit_library_libxul.mk b/www/firefox/patches/patch-toolkit_library_libxul.mk deleted file mode 100644 index dcb176cdfaf..00000000000 --- a/www/firefox/patches/patch-toolkit_library_libxul.mk +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-toolkit_library_libxul.mk,v 1.2 2014/10/15 13:07:07 ryoon Exp $ - ---- toolkit/library/libxul.mk.orig 2014-10-11 09:06:48.000000000 +0000 -+++ toolkit/library/libxul.mk -@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL - EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS) - endif - -+ifdef MOZ_NATIVE_OGG -+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 -@@ -89,12 +117,28 @@ ifndef MOZ_TREE_PIXMAN - EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS) - endif - -+ifdef MOZ_NATIVE_GRAPHITE2 -+EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+EXTRA_DSO_LDOPTS += $(MOZ_HARFBUZZ_LIBS) -+endif -+ - ifdef MOZ_DMD - EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib) - endif - - EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DEPTH)/layout/media) - -+ifdef MOZ_LIBV4L2_LIBS -+EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS) -+endif -+ -+ifdef MOZ_LIBV4L2_LIBS -+EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS) -+endif -+ - ifdef MOZ_WEBRTC - ifeq (WINNT,$(OS_TARGET)) - ifndef MOZ_HAS_WINSDK_WITH_D3D -@@ -106,6 +150,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 - endif - endif - -+ifdef MOZ_OSS -+EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS) -+endif -+ - ifdef MOZ_ALSA - EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) - endif -@@ -223,7 +271,7 @@ ifdef MOZ_ENABLE_QT - EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS) - endif - --ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -+ifeq (Darwin,$(OS_ARCH)) - ifdef MOZ_GSTREAMER - EXTRA_DSO_LDOPTS += $(GSTREAMER_LIBS) - endif diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build new file mode 100644 index 00000000000..d45fb818a77 --- /dev/null +++ b/www/firefox/patches/patch-toolkit_library_moz.build @@ -0,0 +1,56 @@ +$NetBSD: patch-toolkit_library_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/library/moz.build.orig 2014-11-21 03:37:51.000000000 +0000 ++++ toolkit/library/moz.build +@@ -167,6 +167,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF + ] + + OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] ++OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + + if CONFIG['MOZ_NATIVE_JPEG']: +@@ -178,6 +179,27 @@ if CONFIG['MOZ_NATIVE_PNG']: + if CONFIG['MOZ_NATIVE_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + ++if CONFIG['MOZ_NATIVE_OGG']: ++ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_THEORA']: ++ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_VORBIS']: ++ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_TREMOR']: ++ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_OPUS']: ++ OS_LIBS += CONFIG['MOZ_OPUS_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_SPEEX']: ++ OS_LIBS += CONFIG['MOZ_SPEEX_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_SOUNDTOUCH']: ++ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] ++ + if CONFIG['MOZ_NATIVE_LIBEVENT']: + OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] + +@@ -187,6 +209,15 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + ++if CONFIG['MOZ_OSS']: ++ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_GRAPHITE2']: ++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] ++ + if CONFIG['MOZ_ALSA']: + OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + diff --git a/www/firefox/patches/patch-toolkit_system_gnome_moz.build b/www/firefox/patches/patch-toolkit_system_gnome_moz.build new file mode 100644 index 00000000000..71fde79e524 --- /dev/null +++ b/www/firefox/patches/patch-toolkit_system_gnome_moz.build @@ -0,0 +1,14 @@ +$NetBSD: patch-toolkit_system_gnome_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/system/gnome/moz.build.orig 2014-11-21 03:37:52.000000000 +0000 ++++ toolkit/system/gnome/moz.build +@@ -5,7 +5,9 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ ++ 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', ++ 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.cpp b/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.cpp new file mode 100644 index 00000000000..6ac59025841 --- /dev/null +++ b/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.cpp @@ -0,0 +1,119 @@ +$NetBSD: patch-toolkit_system_gnome_nsAlertsIconListener.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/system/gnome/nsAlertsIconListener.cpp.orig 2014-11-21 03:37:52.000000000 +0000 ++++ toolkit/system/gnome/nsAlertsIconListener.cpp +@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosu + NS_RELEASE(alert); + } + ++static GdkPixbuf* ++GetPixbufFromImgRequest(imgIRequest* aRequest) ++{ ++ nsCOMPtr<imgIContainer> image; ++ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); ++ if (NS_FAILED(rv)) { ++ return nullptr; ++ } ++ ++ nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = ++ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); ++ ++ return imgToPixbuf->ConvertImageToPixbuf(image); ++} ++ + NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) + +@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest + nsresult + nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) + { ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); ++ + uint32_t imgStatus = imgIRequest::STATUS_ERROR; + nsresult rv = aRequest->GetImageStatus(&imgStatus); + NS_ENSURE_SUCCESS(rv, rv); + if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { + // We have an error getting the image. Display the notification with no icon. + ShowAlert(nullptr); +- } + +- if (mIconRequest) { ++ // Cancel any pending request + mIconRequest->Cancel(NS_BINDING_ABORTED); + mIconRequest = nullptr; + } ++ + return NS_OK; + } + + nsresult + nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) + { +- if (aRequest != mIconRequest) +- return NS_ERROR_FAILURE; ++ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); + + if (mLoadedFrame) + return NS_OK; // only use one frame + +- nsCOMPtr<imgIContainer> image; +- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); +- if (NS_FAILED(rv)) +- return rv; +- +- nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = +- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); +- +- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); +- if (!imagePixbuf) +- return NS_ERROR_FAILURE; ++ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); ++ if (!imagePixbuf) { ++ ShowAlert(nullptr); ++ } else { ++ ShowAlert(imagePixbuf); ++ g_object_unref(imagePixbuf); ++ } + +- ShowAlert(imagePixbuf); ++ mLoadedFrame = true; + +- g_object_unref(imagePixbuf); ++ // Cancel any pending request (multipart image loading/decoding for instance) ++ mIconRequest->Cancel(NS_BINDING_ABORTED); ++ mIconRequest = nullptr; + +- mLoadedFrame = true; + return NS_OK; + } + +@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbu + mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); + gboolean result = notify_notification_show(mNotification, nullptr); + ++ if (result && mAlertListener) ++ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); ++ + return result ? NS_OK : NS_ERROR_FAILURE; + } + +@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const + if (!il) + return ShowAlert(nullptr); + +- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, +- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, +- nullptr, getter_AddRefs(mIconRequest)); ++ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, ++ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, ++ 0 /* use default */, getter_AddRefs(mIconRequest)); ++ if (NS_FAILED(rv)) ++ return rv; ++ ++ mIconRequest->StartDecoding(); ++ ++ return NS_OK; + } + + void diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.h b/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.h new file mode 100644 index 00000000000..d7094a7110e --- /dev/null +++ b/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.h @@ -0,0 +1,94 @@ +$NetBSD: patch-toolkit_system_gnome_nsAlertsIconListener.h,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/system/gnome/nsAlertsIconListener.h.orig 2014-11-30 06:26:27.000000000 +0000 ++++ toolkit/system/gnome/nsAlertsIconListener.h +@@ -0,0 +1,89 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * 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/. */ ++ ++#ifndef nsAlertsIconListener_h__ ++#define nsAlertsIconListener_h__ ++ ++#include "nsCOMPtr.h" ++#include "imgINotificationObserver.h" ++#include "nsStringAPI.h" ++#include "nsIObserver.h" ++#include "nsWeakReference.h" ++ ++#include <gdk-pixbuf/gdk-pixbuf.h> ++ ++class imgIRequest; ++ ++struct NotifyNotification; ++ ++class nsAlertsIconListener : public imgINotificationObserver, ++ public nsIObserver, ++ public nsSupportsWeakReference ++{ ++public: ++ NS_DECL_ISUPPORTS ++ NS_DECL_IMGINOTIFICATIONOBSERVER ++ NS_DECL_NSIOBSERVER ++ ++ nsAlertsIconListener(); ++ ++ nsresult InitAlertAsync(const nsAString & aImageUrl, ++ const nsAString & aAlertTitle, ++ const nsAString & aAlertText, ++ bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener); ++ ++ void SendCallback(); ++ void SendClosed(); ++ ++protected: ++ virtual ~nsAlertsIconListener(); ++ ++ nsresult OnStopRequest(imgIRequest* aRequest); ++ nsresult OnStopFrame(imgIRequest* aRequest); ++ ++ /** ++ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols ++ * is that notify_notification_new takes three arguments in libnotify.so.4 and ++ * four in libnotify.so.1. ++ * Passing the fourth argument as NULL is binary compatible. ++ */ ++ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); ++ typedef bool (*notify_is_initted_t)(void); ++ typedef bool (*notify_init_t)(const char*); ++ typedef GList* (*notify_get_server_caps_t)(void); ++ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); ++ typedef bool (*notify_notification_show_t)(void*, char*); ++ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); ++ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); ++ ++ nsCOMPtr<imgIRequest> mIconRequest; ++ nsCString mAlertTitle; ++ nsCString mAlertText; ++ ++ nsCOMPtr<nsIObserver> mAlertListener; ++ nsString mAlertCookie; ++ ++ bool mLoadedFrame; ++ bool mAlertHasAction; ++ ++ static void* libNotifyHandle; ++ static bool libNotifyNotAvail; ++ static notify_is_initted_t notify_is_initted; ++ static notify_init_t notify_init; ++ static notify_get_server_caps_t notify_get_server_caps; ++ static notify_notification_new_t notify_notification_new; ++ static notify_notification_show_t notify_notification_show; ++ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; ++ static notify_notification_add_action_t notify_notification_add_action; ++ NotifyNotification* mNotification; ++ gulong mClosureHandler; ++ ++ nsresult StartRequest(const nsAString & aImageUrl); ++ nsresult ShowAlert(GdkPixbuf* aPixbuf); ++}; ++ ++#endif diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsGnomeModule.cpp b/www/firefox/patches/patch-toolkit_system_gnome_nsGnomeModule.cpp new file mode 100644 index 00000000000..465b33b5987 --- /dev/null +++ b/www/firefox/patches/patch-toolkit_system_gnome_nsGnomeModule.cpp @@ -0,0 +1,37 @@ +$NetBSD: patch-toolkit_system_gnome_nsGnomeModule.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/system/gnome/nsGnomeModule.cpp.orig 2014-11-21 03:37:52.000000000 +0000 ++++ toolkit/system/gnome/nsGnomeModule.cpp +@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGn + NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + #endif ++#include "nsSystemAlertsService.h" ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_C + NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + #endif ++NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry k + { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + #endif ++ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -59,6 +63,7 @@ static const mozilla::Module::ContractID + { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + #endif ++ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.cpp b/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.cpp new file mode 100644 index 00000000000..6dfa0032ec0 --- /dev/null +++ b/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.cpp @@ -0,0 +1,59 @@ +$NetBSD: patch-toolkit_system_gnome_nsSystemAlertsService.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/system/gnome/nsSystemAlertsService.cpp.orig 2014-11-30 06:26:27.000000000 +0000 ++++ toolkit/system/gnome/nsSystemAlertsService.cpp +@@ -0,0 +1,54 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * 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/. */ ++ ++#include "nsXULAppAPI.h" ++#include "nsSystemAlertsService.h" ++#include "nsAlertsIconListener.h" ++#include "nsAutoPtr.h" ++ ++NS_IMPL_ADDREF(nsSystemAlertsService) ++NS_IMPL_RELEASE(nsSystemAlertsService) ++ ++NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) ++ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) ++ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) ++NS_INTERFACE_MAP_END_THREADSAFE ++ ++nsSystemAlertsService::nsSystemAlertsService() ++{ ++} ++ ++nsSystemAlertsService::~nsSystemAlertsService() ++{} ++ ++nsresult ++nsSystemAlertsService::Init() ++{ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, ++ const nsAString & aAlertText, bool aAlertTextClickable, ++ const nsAString & aAlertCookie, ++ nsIObserver * aAlertListener, ++ const nsAString & aAlertName, ++ const nsAString & aBidi, ++ const nsAString & aLang, ++ const nsAString & aData, ++ nsIPrincipal * aPrincipal) ++{ ++ nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener(); ++ if (!alertListener) ++ return NS_ERROR_OUT_OF_MEMORY; ++ ++ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, ++ aAlertCookie, aAlertListener); ++} ++ ++NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, ++ nsIPrincipal* aPrincipal) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.h b/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.h new file mode 100644 index 00000000000..13ee637cb1b --- /dev/null +++ b/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.h @@ -0,0 +1,32 @@ +$NetBSD: patch-toolkit_system_gnome_nsSystemAlertsService.h,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- toolkit/system/gnome/nsSystemAlertsService.h.orig 2014-11-30 06:26:27.000000000 +0000 ++++ toolkit/system/gnome/nsSystemAlertsService.h +@@ -0,0 +1,27 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * 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/. */ ++ ++#ifndef nsSystemAlertsService_h__ ++#define nsSystemAlertsService_h__ ++ ++#include "nsIAlertsService.h" ++#include "nsCOMPtr.h" ++ ++class nsSystemAlertsService : public nsIAlertsService ++{ ++public: ++ NS_DECL_NSIALERTSSERVICE ++ NS_DECL_ISUPPORTS ++ ++ nsSystemAlertsService(); ++ ++ nsresult Init(); ++ ++protected: ++ virtual ~nsSystemAlertsService(); ++ ++}; ++ ++#endif /* nsSystemAlertsService_h__ */ diff --git a/www/firefox/patches/patch-widget_gtk_gtk2drawing.c b/www/firefox/patches/patch-widget_gtk_gtk2drawing.c new file mode 100644 index 00000000000..f1cc98347b3 --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_gtk2drawing.c @@ -0,0 +1,29 @@ +$NetBSD: patch-widget_gtk_gtk2drawing.c,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- widget/gtk/gtk2drawing.c.orig 2014-11-21 03:37:52.000000000 +0000 ++++ widget/gtk/gtk2drawing.c +@@ -3013,6 +3013,24 @@ moz_gtk_get_widget_border(GtkThemeWidget + } + + gint ++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom, ++ GtkTextDirection direction, GtkTabFlags flags) ++{ ++ moz_gtk_get_widget_border(MOZ_GTK_TAB, left, top, ++ right, bottom, direction, ++ FALSE); ++ ++ // Top tabs have no bottom border, bottom tabs have no top border ++ if (flags & MOZ_GTK_TAB_BOTTOM) { ++ *top = 0; ++ } else { ++ *bottom = 0; ++ } ++ ++ return MOZ_GTK_SUCCESS; ++} ++ ++gint + moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height) + { + /* diff --git a/www/firefox/patches/patch-widget_gtk_gtk3drawing.c b/www/firefox/patches/patch-widget_gtk_gtk3drawing.c new file mode 100644 index 00000000000..e94a813d699 --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_gtk3drawing.c @@ -0,0 +1,209 @@ +$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- widget/gtk/gtk3drawing.c.orig 2014-11-21 03:37:52.000000000 +0000 ++++ widget/gtk/gtk3drawing.c +@@ -2105,6 +2105,21 @@ moz_gtk_get_tab_thickness(void) + return border.top; + } + ++static void ++moz_gtk_tab_prepare_style_context(GtkStyleContext *style, ++ GtkTabFlags flags) ++{ ++ gtk_style_context_set_state(style, ((flags & MOZ_GTK_TAB_SELECTED) == 0) ? ++ GTK_STATE_FLAG_NORMAL : ++ GTK_STATE_FLAG_ACTIVE); ++ gtk_style_context_add_region(style, GTK_STYLE_REGION_TAB, ++ (flags & MOZ_GTK_TAB_FIRST) ? ++ GTK_REGION_FIRST : 0); ++ gtk_style_context_add_class(style, (flags & MOZ_GTK_TAB_BOTTOM) ? ++ GTK_STYLE_CLASS_BOTTOM : ++ GTK_STYLE_CLASS_TOP); ++} ++ + /* actual small tabs */ + static gint + moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2117,22 +2132,35 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan + * tab appear physically attached to the tabpanel; see details below. */ + + GtkStyleContext* style; ++ GdkRectangle tabRect; + GdkRectangle focusRect; + GdkRectangle backRect; ++ int initial_gap = 0; + + ensure_tab_widget(); + gtk_widget_set_direction(gTabWidget, direction); + + style = gtk_widget_get_style_context(gTabWidget); +- backRect = focusRect = *rect; +- + gtk_style_context_save(style); ++ moz_gtk_tab_prepare_style_context(style, flags); ++ ++ tabRect = *rect; ++ ++ if (flags & MOZ_GTK_TAB_FIRST) { ++ gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL); ++ tabRect.width -= initial_gap; ++ ++ if (direction != GTK_TEXT_DIR_RTL) { ++ tabRect.x += initial_gap; ++ } ++ } ++ ++ focusRect = backRect = tabRect; + + if ((flags & MOZ_GTK_TAB_SELECTED) == 0) { + /* Only draw the tab */ +- gtk_style_context_set_state(style, GTK_STATE_FLAG_NORMAL); + gtk_render_extension(style, cr, +- rect->x, rect->y, rect->width, rect->height, ++ tabRect.x, tabRect.y, tabRect.width, tabRect.height, + (flags & MOZ_GTK_TAB_BOTTOM) ? + GTK_POS_TOP : GTK_POS_BOTTOM ); + } else { +@@ -2186,24 +2214,19 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan + gap_loffset = gap_roffset = 20; /* should be enough */ + if (flags & MOZ_GTK_TAB_FIRST) { + if (direction == GTK_TEXT_DIR_RTL) +- gap_roffset = 0; ++ gap_roffset = initial_gap; + else +- gap_loffset = 0; ++ gap_loffset = initial_gap; + } + +- gtk_style_context_set_state(style, GTK_STATE_FLAG_ACTIVE); +- +- /* Adwaita theme engine crashes without it (rhbz#713764) */ +- gtk_style_context_add_region(style, GTK_STYLE_REGION_TAB, 0); +- + if (flags & MOZ_GTK_TAB_BOTTOM) { + /* Draw the tab on bottom */ + focusRect.y += gap_voffset; + focusRect.height -= gap_voffset; + + gtk_render_extension(style, cr, +- rect->x, rect->y + gap_voffset, rect->width, +- rect->height - gap_voffset, GTK_POS_TOP); ++ tabRect.x, tabRect.y + gap_voffset, tabRect.width, ++ tabRect.height - gap_voffset, GTK_POS_TOP); + + gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); + +@@ -2219,38 +2242,39 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan + cairo_clip(cr); + + gtk_render_frame_gap(style, cr, +- rect->x - gap_loffset, +- rect->y + gap_voffset - 3 * gap_height, +- rect->width + gap_loffset + gap_roffset, ++ tabRect.x - gap_loffset, ++ tabRect.y + gap_voffset - 3 * gap_height, ++ tabRect.width + gap_loffset + gap_roffset, + 3 * gap_height, GTK_POS_BOTTOM, +- gap_loffset, gap_loffset + rect->width); ++ gap_loffset, gap_loffset + tabRect.width); + cairo_restore(cr); + } else { + /* Draw the tab on top */ + focusRect.height -= gap_voffset; + gtk_render_extension(style, cr, +- rect->x, rect->y, rect->width, +- rect->height - gap_voffset, GTK_POS_BOTTOM); ++ tabRect.x, tabRect.y, tabRect.width, ++ tabRect.height - gap_voffset, GTK_POS_BOTTOM); + + gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); + +- backRect.y += (rect->height - gap_voffset); ++ backRect.y += (tabRect.height - gap_voffset); + backRect.height = gap_height; + + /* Draw the gap; erase with background color before painting in + * case theme does not */ + gtk_render_background(style, cr, backRect.x, backRect.y, + backRect.width, backRect.height); ++ + cairo_save(cr); + cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height); + cairo_clip(cr); + + gtk_render_frame_gap(style, cr, +- rect->x - gap_loffset, +- rect->y + rect->height - gap_voffset, +- rect->width + gap_loffset + gap_roffset, ++ tabRect.x - gap_loffset, ++ tabRect.y + tabRect.height - gap_voffset, ++ tabRect.width + gap_loffset + gap_roffset, + 3 * gap_height, GTK_POS_TOP, +- gap_loffset, gap_loffset + rect->width); ++ gap_loffset, gap_loffset + tabRect.width); + cairo_restore(cr); + } + } +@@ -2885,10 +2909,6 @@ moz_gtk_get_widget_border(GtkThemeWidget + left, top, right, bottom); + return MOZ_GTK_SUCCESS; + } +- case MOZ_GTK_TAB: +- ensure_tab_widget(); +- w = gTabWidget; +- break; + /* These widgets have no borders, since they are not containers. */ + case MOZ_GTK_SPLITTER_HORIZONTAL: + case MOZ_GTK_SPLITTER_VERTICAL: +@@ -2932,6 +2952,51 @@ moz_gtk_get_widget_border(GtkThemeWidget + } + + gint ++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom, ++ GtkTextDirection direction, GtkTabFlags flags) ++{ ++ GtkStyleContext* style; ++ int tab_curvature; ++ ++ ensure_tab_widget(); ++ ++ style = gtk_widget_get_style_context(gTabWidget); ++ gtk_style_context_save(style); ++ moz_gtk_tab_prepare_style_context(style, flags); ++ ++ // TODO add_style_border() should be replaced ++ // with focus-line-width and focus-padding ++ // see Bug 877605 ++ *left = *top = *right = *bottom = 0; ++ moz_gtk_add_style_border(style, left, top, right, bottom); ++ moz_gtk_add_style_padding(style, left, top, right, bottom); ++ ++ gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL); ++ *left += tab_curvature; ++ *right += tab_curvature; ++ ++ if (flags & MOZ_GTK_TAB_FIRST) { ++ int initial_gap; ++ gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL); ++ if (direction == GTK_TEXT_DIR_RTL) ++ *right += initial_gap; ++ else ++ *left += initial_gap; ++ } ++ ++ // Top tabs have no bottom border, bottom tabs have no top border ++ if (flags & MOZ_GTK_TAB_BOTTOM) { ++ *top = 0; ++ } else { ++ *bottom = 0; ++ } ++ ++ gtk_style_context_restore(style); ++ ++ return MOZ_GTK_SUCCESS; ++} ++ ++gint + moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height) + { + /* diff --git a/www/firefox/patches/patch-widget_gtk_gtkdrawing.h b/www/firefox/patches/patch-widget_gtk_gtkdrawing.h new file mode 100644 index 00000000000..c3d16779721 --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_gtkdrawing.h @@ -0,0 +1,24 @@ +$NetBSD: patch-widget_gtk_gtkdrawing.h,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- widget/gtk/gtkdrawing.h.orig 2014-11-21 03:37:52.000000000 +0000 ++++ widget/gtk/gtkdrawing.h +@@ -259,6 +259,19 @@ gint moz_gtk_get_widget_border(GtkThemeW + gboolean inhtml); + + /** ++ * Get the border size of a notebook tab ++ * left/right: [OUT] the tab's left/right border ++ * top/bottom: [OUT] the tab's top/bottom border ++ * direction: the text direction for the widget ++ * flags: tab-dependant flags; see the GtkTabFlags definition. ++ * ++ * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise ++ */ ++gint ++moz_gtk_get_tab_border(gint* left, gint* top, gint* right, gint* bottom, ++ GtkTextDirection direction, GtkTabFlags flags); ++ ++/** + * Get the desired size of a GtkCheckButton + * indicator_size: [OUT] the indicator size + * indicator_spacing: [OUT] the spacing between the indicator and its diff --git a/www/firefox/patches/patch-widget_gtk_mozgtk_mozgtk.c b/www/firefox/patches/patch-widget_gtk_mozgtk_mozgtk.c new file mode 100644 index 00000000000..32c45e64a4c --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_mozgtk_mozgtk.c @@ -0,0 +1,12 @@ +$NetBSD: patch-widget_gtk_mozgtk_mozgtk.c,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- widget/gtk/mozgtk/mozgtk.c.orig 2014-11-21 03:37:52.000000000 +0000 ++++ widget/gtk/mozgtk/mozgtk.c +@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay) + STUB(gdk_x11_screen_get_xscreen) + STUB(gdk_x11_visual_get_xvisual) + STUB(gdk_x11_window_lookup_for_display) ++STUB(gdk_x11_window_set_user_time) + STUB(gdk_x11_xatom_to_atom) + STUB(gtk_accel_label_new) + STUB(gtk_alignment_get_type) diff --git a/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp b/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp new file mode 100644 index 00000000000..9d1151d5621 --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp @@ -0,0 +1,31 @@ +$NetBSD: patch-widget_gtk_nsNativeThemeGTK.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- widget/gtk/nsNativeThemeGTK.cpp.orig 2014-11-21 03:37:52.000000000 +0000 ++++ widget/gtk/nsNativeThemeGTK.cpp +@@ -940,14 +940,18 @@ nsNativeThemeGTK::GetWidgetBorder(nsDevi + // but don't reserve any space for it. + break; + case NS_THEME_TAB: +- // Top tabs have no bottom border, bottom tabs have no top border +- moz_gtk_get_widget_border(MOZ_GTK_TAB, &aResult->left, &aResult->top, +- &aResult->right, &aResult->bottom, direction, +- FALSE); +- if (IsBottomTab(aFrame)) +- aResult->top = 0; +- else +- aResult->bottom = 0; ++ { ++ GtkThemeWidgetType gtkWidgetType; ++ gint flags; ++ ++ if (!GetGtkWidgetAndState(aWidgetType, aFrame, gtkWidgetType, nullptr, ++ &flags)) ++ return NS_OK; ++ ++ moz_gtk_get_tab_border(&aResult->left, &aResult->top, ++ &aResult->right, &aResult->bottom, direction, ++ (GtkTabFlags)flags); ++ } + break; + case NS_THEME_MENUITEM: + case NS_THEME_CHECKMENUITEM: diff --git a/www/firefox/patches/patch-widget_gtk_nsWindow.cpp b/www/firefox/patches/patch-widget_gtk_nsWindow.cpp new file mode 100644 index 00000000000..0c653db0f0f --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_nsWindow.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-widget_gtk_nsWindow.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +--- widget/gtk/nsWindow.cpp.orig 2014-11-21 03:37:52.000000000 +0000 ++++ widget/gtk/nsWindow.cpp +@@ -1294,13 +1294,7 @@ SetUserTimeAndStartupIDForActivatedWindo + } + + if (sn_launchee_context_get_id_has_timestamp(ctx)) { +- PRLibrary* gtkLibrary; +- SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc) +- PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", >kLibrary); +- if (setUserTimeFunc) { +- setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx)); +- PR_UnloadLibrary(gtkLibrary); +- } ++ gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx)); + } + + sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow)); diff --git a/www/firefox/patches/patch-xpcom_build_nsXPComInit.cpp b/www/firefox/patches/patch-xpcom_build_nsXPComInit.cpp index 918c8ff052f..7ea1338b236 100644 --- a/www/firefox/patches/patch-xpcom_build_nsXPComInit.cpp +++ b/www/firefox/patches/patch-xpcom_build_nsXPComInit.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-xpcom_build_nsXPComInit.cpp,v 1.1 2014/06/11 00:41:36 ryoon Exp $ +$NetBSD: patch-xpcom_build_nsXPComInit.cpp,v 1.2 2014/12/01 18:11:14 ryoon Exp $ ---- xpcom/build/nsXPComInit.cpp.orig 2014-05-29 23:31:50.000000000 +0000 +--- xpcom/build/nsXPComInit.cpp.orig 2014-11-21 03:37:53.000000000 +0000 +++ xpcom/build/nsXPComInit.cpp -@@ -128,7 +128,9 @@ extern nsresult nsStringInputStreamConst +@@ -138,7 +138,9 @@ extern nsresult nsStringInputStreamConst #include "mozilla/VisualEventTracer.h" #endif @@ -12,17 +12,17 @@ $NetBSD: patch-xpcom_build_nsXPComInit.cpp,v 1.1 2014/06/11 00:41:36 ryoon Exp $ #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) #include "vpx_mem/vpx_mem.h" #endif -@@ -564,11 +566,13 @@ NS_InitXPCOM2(nsIServiceManager* *result - // this oddness. - mozilla::SetICUMemoryFunctions(); +@@ -652,11 +654,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul + // this oddness. + mozilla::SetICUMemoryFunctions(); +#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); + // Do the same for libogg. + ogg_set_mem_functions(OggReporter::CountingMalloc, + OggReporter::CountingCalloc, + OggReporter::CountingRealloc, + OggReporter::CountingFree); +#endif #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. + // And for VPX. diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp index 039583f8d5e..040fd6b3858 100644 --- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp +++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.2 2014/11/26 14:56:28 ryoon Exp $ +$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.3 2014/12/01 18:11:14 ryoon Exp $ ---- xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp.orig 2014-11-13 22:50:21.000000000 +0000 +--- xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp.orig 2014-11-26 12:30:27.000000000 +0000 +++ xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp @@ -6,15 +6,32 @@ /* Implement shared vtbl methods. */ @@ -82,7 +82,7 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.2 20 if(dispatchParams != paramBuffer) delete [] dispatchParams; -@@ -82,26 +95,118 @@ PrepareAndDispatch(nsXPTCStubBase* self, +@@ -82,26 +95,116 @@ PrepareAndDispatch(nsXPTCStubBase* self, } /* @@ -120,7 +120,6 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.2 20 + ".text\n" + ".align 2\n" + "SharedStub:\n" -+ ".fnstart\n" + CFI(".cfi_startproc\n") + "stmfd sp!, {r1, r2, r3}\n" + ".save {r1, r2, r3}\n" @@ -136,8 +135,7 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.2 20 + "mov r1, ip\n" + "bl _PrepareAndDispatch\n" + "ldr pc, [sp], #16\n" -+ CFI(".cfi_endproc\n") -+ ".fnend"); ++ CFI(".cfi_endproc\n")); + +/* + * Create sets of stubs to call the SharedStub. |