diff options
Diffstat (limited to 'www')
29 files changed, 518 insertions, 560 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index b118e105f4b..6f1fb71ff0c 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.187 2014/12/01 18:11:14 ryoon Exp $ +# $NetBSD: Makefile,v 1.188 2015/01/16 22:42:09 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 34.0 -MOZ_BRANCH_MINOR= .5 +MOZ_BRANCH= 35.0 +MOZ_BRANCH_MINOR= 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 093454696a4..b4a0ed0ae1a 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.90 2014/12/01 18:11:14 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.91 2015/01/16 22:42:09 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -19,8 +19,10 @@ 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/aboutNetError.xhtml 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/aboutProviderDirectory.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutRobots-icon.png lib/firefox/browser/chrome/browser/content/browser/aboutRobots-widget-left.png lib/firefox/browser/chrome/browser/content/browser/aboutRobots.xhtml @@ -68,10 +70,6 @@ lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2.png lib/firefox/browser/chrome/browser/content/browser/abouthome/snippet2@2x.png lib/firefox/browser/chrome/browser/content/browser/abouthome/sync.png lib/firefox/browser/chrome/browser/content/browser/abouthome/sync@2x.png -lib/firefox/browser/chrome/browser/content/browser/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 lib/firefox/browser/chrome/browser/content/browser/baseMenuOverlay.xul lib/firefox/browser/chrome/browser/content/browser/blockedSite.xhtml lib/firefox/browser/chrome/browser/content/browser/bookmarks/bookmarksPanel.js @@ -222,11 +220,17 @@ 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/timeline/timeline.js +lib/firefox/browser/chrome/browser/content/browser/devtools/timeline/timeline.xul 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 +lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor/controller.js +lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor/includes.js +lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor/models.js +lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/context.js +lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/inspector.js +lib/firefox/browser/chrome/browser/content/browser/devtools/webaudioeditor/views/utils.js lib/firefox/browser/chrome/browser/content/browser/devtools/webconsole.xul lib/firefox/browser/chrome/browser/content/browser/devtools/widgets.css lib/firefox/browser/chrome/browser/content/browser/devtools/widgets/VariablesView.xul @@ -254,9 +258,11 @@ 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/conversationAppStore.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/js/roomViews.js lib/firefox/browser/chrome/browser/content/browser/loop/libs/l10n.js lib/firefox/browser/chrome/browser/content/browser/loop/libs/sdk.js lib/firefox/browser/chrome/browser/content/browser/loop/panel.html @@ -280,6 +286,8 @@ 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/02.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/02@2x.png 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 @@ -296,23 +304,36 @@ 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/movistar.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/movistar@2x.png 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/spinner.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/spinner@2x.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-account-16x16.svg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/svg/glyph-help-16x16.svg 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/telefonica.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/telefonica@2x.png 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/img/vivo.png +lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/vivo@2x.png lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/actions.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/activeRoomStore.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/feedbackStore.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/feedbackViews.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/mixins.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/models.js lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/otSdkDriver.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/roomStore.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/store.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 @@ -320,8 +341,15 @@ 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.11.1.js -lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/Firefox-Long.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/react-0.11.2.js +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/connected.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/connecting.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/failure.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/ringtone.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/room-joined-in.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/room-joined.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/room-left.ogg +lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/terminated.ogg lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png lib/firefox/browser/chrome/browser/content/browser/migration/migration.js lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul @@ -401,7 +429,6 @@ 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 @@ -466,6 +493,7 @@ lib/firefox/browser/chrome/browser/content/browser/web-panels.js lib/firefox/browser/chrome/browser/content/browser/web-panels.xul lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.js lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.xul +lib/firefox/browser/chrome/browser/default_permissions 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 @@ -480,6 +508,9 @@ 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/aboutNetError_alert.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/aboutNetError_info.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/aboutProviderDirectory.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 @@ -490,6 +521,7 @@ 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/bad-content-unblocked-64.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 @@ -512,6 +544,9 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy-bw lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy-bw@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy.png lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devedition.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devedition/search.svg +lib/firefox/browser/chrome/browser/skin/classic/browser/devedition/urlbar-history-dropmarker.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/alerticon-warning.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/alerticon-warning@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/app-manager/add.svg @@ -622,7 +657,6 @@ 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 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler.css -lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/projecteditor/file-icons-sheet@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/projecteditor/projecteditor.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png @@ -643,6 +677,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.cs lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/splitview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/storage.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/timeline.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 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-debugger-paused.svg @@ -687,7 +722,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/allDownloadsVi lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/buttons.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/contentAreaDownloadsView.css lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow-menuPanel.png -lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-glow.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-finish.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notification-start.png lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-summary.png @@ -754,8 +788,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/places/tag.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/unsortedBookmarks.png lib/firefox/browser/chrome/browser/skin/classic/browser/places/unstarred48.png -lib/firefox/browser/chrome/browser/skin/classic/browser/pluginInstall-16.png -lib/firefox/browser/chrome/browser/skin/classic/browser/pluginInstall-64.png lib/firefox/browser/chrome/browser/skin/classic/browser/pointerLock-16.png lib/firefox/browser/chrome/browser/skin/classic/browser/pointerLock-64.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/Options-sync.png @@ -763,16 +795,21 @@ 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/favicon.ico 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/search.css 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/preferences/search.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-history-icon.svg 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 @@ -898,6 +935,8 @@ 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 lib/firefox/browser/chrome/en-US/locale/browser/devtools/tilt.properties +lib/firefox/browser/chrome/en-US/locale/browser/devtools/timeline.dtd +lib/firefox/browser/chrome/en-US/locale/browser/devtools/timeline.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/toolbox.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/toolbox.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/webConsole.dtd @@ -944,6 +983,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/preferences/permissions.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/preferences.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/preferences.properties lib/firefox/browser/chrome/en-US/locale/browser/preferences/privacy.dtd +lib/firefox/browser/chrome/en-US/locale/browser/preferences/search.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/security.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/selectBookmark.dtd lib/firefox/browser/chrome/en-US/locale/browser/preferences/sync.dtd @@ -981,14 +1021,16 @@ lib/firefox/browser/chrome/icons/default/default16.png lib/firefox/browser/chrome/icons/default/default32.png lib/firefox/browser/chrome/icons/default/default48.png lib/firefox/browser/chrome/pdfjs/LICENSE -lib/firefox/browser/chrome/pdfjs/README.mozilla lib/firefox/browser/chrome/pdfjs/content/PdfJs.jsm lib/firefox/browser/chrome/pdfjs/content/PdfJsTelemetry.jsm lib/firefox/browser/chrome/pdfjs/content/PdfRedirector.jsm lib/firefox/browser/chrome/pdfjs/content/PdfStreamConverter.jsm +lib/firefox/browser/chrome/pdfjs/content/PdfjsChromeUtils.jsm +lib/firefox/browser/chrome/pdfjs/content/PdfjsContentUtils.jsm lib/firefox/browser/chrome/pdfjs/content/build/pdf.js lib/firefox/browser/chrome/pdfjs/content/build/pdf.worker.js lib/firefox/browser/chrome/pdfjs/content/network.js +lib/firefox/browser/chrome/pdfjs/content/pdfjschildbootstrap.js lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-H.bcmap lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-V.bcmap lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-H.bcmap @@ -1180,6 +1222,7 @@ lib/firefox/browser/chrome/pdfjs/content/web/images/grab.cur lib/firefox/browser/chrome/pdfjs/content/web/images/grabbing.cur lib/firefox/browser/chrome/pdfjs/content/web/images/loading-icon.gif lib/firefox/browser/chrome/pdfjs/content/web/images/loading-small.png +lib/firefox/browser/chrome/pdfjs/content/web/images/loading-small@2x.png lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-documentProperties.png lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-documentProperties@2x.png lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-firstPage.png @@ -1290,6 +1333,7 @@ lib/firefox/browser/components/nsSessionStartup.js lib/firefox/browser/components/nsSessionStore.js lib/firefox/browser/components/nsSetDefaultBrowser.js lib/firefox/browser/components/nsSidebar.js +lib/firefox/browser/components/webideCli.js lib/firefox/browser/defaults/preferences/firefox-branding.js lib/firefox/browser/defaults/preferences/firefox-l10n.js lib/firefox/browser/defaults/preferences/firefox.js @@ -1310,14 +1354,17 @@ lib/firefox/browser/modules/Chat.jsm lib/firefox/browser/modules/ContentClick.jsm lib/firefox/browser/modules/ContentLinkHandler.jsm lib/firefox/browser/modules/ContentSearch.jsm +lib/firefox/browser/modules/ContentWebRTC.jsm lib/firefox/browser/modules/CustomizableUI.jsm lib/firefox/browser/modules/CustomizableWidgets.jsm lib/firefox/browser/modules/CustomizationTabPreloader.jsm lib/firefox/browser/modules/CustomizeMode.jsm +lib/firefox/browser/modules/DirectoryLinksProvider.jsm lib/firefox/browser/modules/DownloadsCommon.jsm lib/firefox/browser/modules/DownloadsLogger.jsm lib/firefox/browser/modules/DownloadsTaskbar.jsm lib/firefox/browser/modules/DragPositionManager.jsm +lib/firefox/browser/modules/E10SUtils.jsm lib/firefox/browser/modules/Feeds.jsm lib/firefox/browser/modules/FormSubmitObserver.jsm lib/firefox/browser/modules/FormValidationHandler.jsm @@ -1326,10 +1373,10 @@ lib/firefox/browser/modules/NetworkPrioritizer.jsm lib/firefox/browser/modules/PanelFrame.jsm lib/firefox/browser/modules/PanelWideWidgetTracker.jsm lib/firefox/browser/modules/PlacesUIUtils.jsm +lib/firefox/browser/modules/PluginContent.jsm lib/firefox/browser/modules/RecentWindow.jsm lib/firefox/browser/modules/RemotePrompt.jsm lib/firefox/browser/modules/ScrollbarSampler.jsm -lib/firefox/browser/modules/SharedFrame.jsm lib/firefox/browser/modules/SitePermissions.jsm lib/firefox/browser/modules/Social.jsm lib/firefox/browser/modules/TabCrashReporter.jsm @@ -1461,6 +1508,10 @@ lib/firefox/browser/modules/devtools/tilt/tilt-utils.js lib/firefox/browser/modules/devtools/tilt/tilt-visualizer-style.js lib/firefox/browser/modules/devtools/tilt/tilt-visualizer.js lib/firefox/browser/modules/devtools/tilt/tilt.js +lib/firefox/browser/modules/devtools/timeline/global.js +lib/firefox/browser/modules/devtools/timeline/overview.js +lib/firefox/browser/modules/devtools/timeline/panel.js +lib/firefox/browser/modules/devtools/timeline/waterfall.js lib/firefox/browser/modules/devtools/webaudioeditor/panel.js lib/firefox/browser/modules/devtools/webconsole/console-commands.js lib/firefox/browser/modules/devtools/webconsole/console-output.js @@ -1472,11 +1523,15 @@ lib/firefox/browser/modules/devtools/webide/addons.js lib/firefox/browser/modules/devtools/webide/app-manager.js lib/firefox/browser/modules/devtools/webide/remote-resources.js lib/firefox/browser/modules/devtools/webide/runtimes.js +lib/firefox/browser/modules/devtools/webide/tab-store.js +lib/firefox/browser/modules/devtools/webide/utils.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/LoopCalls.jsm lib/firefox/browser/modules/loop/LoopContacts.jsm +lib/firefox/browser/modules/loop/LoopRooms.jsm lib/firefox/browser/modules/loop/LoopStorage.jsm lib/firefox/browser/modules/loop/MozLoopAPI.jsm lib/firefox/browser/modules/loop/MozLoopPushHandler.jsm @@ -1632,7 +1687,6 @@ lib/firefox/chrome/en-US/locale/en-US/global/wizard.dtd lib/firefox/chrome/en-US/locale/en-US/global/wizard.properties lib/firefox/chrome/en-US/locale/en-US/global/xbl.properties lib/firefox/chrome/en-US/locale/en-US/global/xml/prettyprint.dtd -lib/firefox/chrome/en-US/locale/en-US/global/xpinstall/xpinstall.properties lib/firefox/chrome/en-US/locale/en-US/global/xslt/xslt.properties lib/firefox/chrome/en-US/locale/en-US/global/xul.properties lib/firefox/chrome/en-US/locale/en-US/mozapps/downloads/downloads.dtd @@ -1653,7 +1707,6 @@ lib/firefox/chrome/en-US/locale/en-US/mozapps/extensions/update.properties lib/firefox/chrome/en-US/locale/en-US/mozapps/handling/handling.dtd lib/firefox/chrome/en-US/locale/en-US/mozapps/handling/handling.properties lib/firefox/chrome/en-US/locale/en-US/mozapps/plugins/plugins.dtd -lib/firefox/chrome/en-US/locale/en-US/mozapps/plugins/plugins.properties lib/firefox/chrome/en-US/locale/en-US/mozapps/preferences/changemp.dtd lib/firefox/chrome/en-US/locale/en-US/mozapps/preferences/preferences.properties lib/firefox/chrome/en-US/locale/en-US/mozapps/preferences/removemp.dtd @@ -1729,8 +1782,6 @@ lib/firefox/chrome/pippki/content/pippki/escrowWarn.js lib/firefox/chrome/pippki/content/pippki/escrowWarn.xul lib/firefox/chrome/pippki/content/pippki/exceptionDialog.js lib/firefox/chrome/pippki/content/pippki/exceptionDialog.xul -lib/firefox/chrome/pippki/content/pippki/formsigning.js -lib/firefox/chrome/pippki/content/pippki/formsigning.xul lib/firefox/chrome/pippki/content/pippki/getp12password.xul lib/firefox/chrome/pippki/content/pippki/getpassword.xul lib/firefox/chrome/pippki/content/pippki/load_device.xul @@ -1947,11 +1998,6 @@ lib/firefox/chrome/toolkit/content/mozapps/handling/dialog.xul lib/firefox/chrome/toolkit/content/mozapps/handling/handler.css lib/firefox/chrome/toolkit/content/mozapps/handling/handler.xml lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginFinderBinding.css -lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginInstallerDatasource.js -lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginInstallerService.js -lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginInstallerWizard.css -lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginInstallerWizard.js -lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginInstallerWizard.xul lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginProblem.xml lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginProblemBinding.css lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginProblemContent.css @@ -2072,6 +2118,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/Restore.gif lib/firefox/chrome/toolkit/skin/classic/global/icons/Search-close.png lib/firefox/chrome/toolkit/skin/classic/global/icons/Search-glass.png lib/firefox/chrome/toolkit/skin/classic/global/icons/Warning.png +lib/firefox/chrome/toolkit/skin/classic/global/icons/autocomplete-search.svg lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.png lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_favicon.png lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_large.png @@ -2183,6 +2230,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/tabbox.css lib/firefox/chrome/toolkit/skin/classic/global/tabprompts.css lib/firefox/chrome/toolkit/skin/classic/global/textbox.css lib/firefox/chrome/toolkit/skin/classic/global/toolbar.css +lib/firefox/chrome/toolkit/skin/classic/global/toolbar/chevron-inverted.png lib/firefox/chrome/toolkit/skin/classic/global/toolbar/chevron.gif lib/firefox/chrome/toolkit/skin/classic/global/toolbar/spring.png lib/firefox/chrome/toolkit/skin/classic/global/toolbarbutton.css @@ -2264,7 +2312,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.png lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric-16.png lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.png lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginHelp-16.png -lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginInstallerWizard.css lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginProblem.css lib/firefox/chrome/toolkit/skin/classic/mozapps/profile/profileSelection.css lib/firefox/chrome/toolkit/skin/classic/mozapps/profile/profileicon.png @@ -2284,6 +2331,7 @@ lib/firefox/components/ChromeNotifications.js lib/firefox/components/ColorAnalyzer.js lib/firefox/components/ConsoleAPIStorage.js lib/firefox/components/ContactManager.js +lib/firefox/components/ContentProcessSingleton.js lib/firefox/components/DataReportingService.js lib/firefox/components/DataStoreImpl.js lib/firefox/components/DownloadLegacy.js @@ -2291,6 +2339,7 @@ lib/firefox/components/FeedProcessor.js lib/firefox/components/FormAutofillContentService.js lib/firefox/components/FormAutofillStartup.js lib/firefox/components/FormHistoryStartup.js +lib/firefox/components/MainProcessSingleton.js lib/firefox/components/MozKeyboard.js lib/firefox/components/NetworkGeolocationProvider.js lib/firefox/components/NotificationStorage.js @@ -2331,6 +2380,7 @@ ${PLIST.gnome}lib/firefox/components/libnkgnomevfs.so lib/firefox/components/marionettecomponent.js lib/firefox/components/messageWakeupService.js lib/firefox/components/multiprocessShims.js +lib/firefox/components/nsAsyncShutdown.js lib/firefox/components/nsBlocklistService.js lib/firefox/components/nsContentDispatchChooser.js lib/firefox/components/nsContentPrefService.js @@ -2430,6 +2480,7 @@ lib/firefox/modules/Battery.jsm lib/firefox/modules/BinarySearch.jsm lib/firefox/modules/BookmarkHTMLUtils.jsm lib/firefox/modules/BookmarkJSONUtils.jsm +lib/firefox/modules/Bookmarks.jsm lib/firefox/modules/BrowserElementParent.jsm lib/firefox/modules/BrowserElementPromptService.jsm lib/firefox/modules/BrowserUtils.jsm @@ -2467,7 +2518,6 @@ lib/firefox/modules/DeferredSave.jsm lib/firefox/modules/DeferredTask.jsm lib/firefox/modules/Deprecated.jsm lib/firefox/modules/Dict.jsm -lib/firefox/modules/DirectoryLinksProvider.jsm lib/firefox/modules/DownloadCore.jsm lib/firefox/modules/DownloadImport.jsm lib/firefox/modules/DownloadIntegration.jsm @@ -2497,10 +2547,12 @@ lib/firefox/modules/FxAccountsProfileClient.jsm lib/firefox/modules/GMPInstallManager.jsm lib/firefox/modules/Geometry.jsm lib/firefox/modules/HealthReport.jsm +lib/firefox/modules/History.jsm lib/firefox/modules/Http.jsm lib/firefox/modules/ISO8601DateUtils.jsm lib/firefox/modules/IndexedDBHelper.jsm lib/firefox/modules/InlineSpellChecker.jsm +lib/firefox/modules/InlineSpellCheckerContent.jsm lib/firefox/modules/InsecurePasswordUtils.jsm lib/firefox/modules/InterAppCommService.jsm lib/firefox/modules/Keyboard.jsm @@ -2562,6 +2614,7 @@ lib/firefox/modules/RequestAutocompleteUI.jsm lib/firefox/modules/ResetProfile.jsm lib/firefox/modules/ResourceStatsDB.jsm lib/firefox/modules/ResourceStatsService.jsm +lib/firefox/modules/RokuApp.jsm lib/firefox/modules/SafeBrowsing.jsm lib/firefox/modules/ScriptPreloader.jsm lib/firefox/modules/ScrollPosition.jsm @@ -2574,6 +2627,7 @@ lib/firefox/modules/SettingsDB.jsm lib/firefox/modules/SettingsRequestManager.jsm lib/firefox/modules/SharedPromptUtils.jsm lib/firefox/modules/ShortcutUtils.jsm +lib/firefox/modules/SimpleServiceDiscovery.jsm lib/firefox/modules/Sntp.jsm lib/firefox/modules/SocialService.jsm lib/firefox/modules/SpatialNavigation.jsm @@ -2627,16 +2681,13 @@ 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/panel/view.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 lib/firefox/modules/commonjs/diffpatcher/diff.js lib/firefox/modules/commonjs/diffpatcher/index.js -lib/firefox/modules/commonjs/diffpatcher/package.json lib/firefox/modules/commonjs/diffpatcher/patch.js lib/firefox/modules/commonjs/diffpatcher/rebase.js lib/firefox/modules/commonjs/diffpatcher/test/common.js @@ -2646,18 +2697,14 @@ lib/firefox/modules/commonjs/diffpatcher/test/patch.js lib/firefox/modules/commonjs/diffpatcher/test/tap.js lib/firefox/modules/commonjs/framescript/FrameScriptManager.jsm lib/firefox/modules/commonjs/framescript/tab-events.js -lib/firefox/modules/commonjs/method/History.md -lib/firefox/modules/commonjs/method/License.md -lib/firefox/modules/commonjs/method/Readme.md lib/firefox/modules/commonjs/method/core.js -lib/firefox/modules/commonjs/method/package.json lib/firefox/modules/commonjs/method/test/browser.js lib/firefox/modules/commonjs/method/test/common.js lib/firefox/modules/commonjs/node/os.js -lib/firefox/modules/commonjs/sdk/addon-page.js lib/firefox/modules/commonjs/sdk/addon/events.js lib/firefox/modules/commonjs/sdk/addon/host.js lib/firefox/modules/commonjs/sdk/addon/installer.js +lib/firefox/modules/commonjs/sdk/addon/manager.js lib/firefox/modules/commonjs/sdk/addon/runner.js lib/firefox/modules/commonjs/sdk/addon/window.js lib/firefox/modules/commonjs/sdk/base64.js @@ -2781,8 +2828,6 @@ lib/firefox/modules/commonjs/sdk/stylesheet/style.js lib/firefox/modules/commonjs/sdk/stylesheet/utils.js lib/firefox/modules/commonjs/sdk/system.js lib/firefox/modules/commonjs/sdk/system/child_process.js -lib/firefox/modules/commonjs/sdk/system/child_process/LICENSE -lib/firefox/modules/commonjs/sdk/system/child_process/README.md lib/firefox/modules/commonjs/sdk/system/child_process/subprocess.js lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_unix.js lib/firefox/modules/commonjs/sdk/system/child_process/subprocess_worker_win.js @@ -3025,6 +3070,7 @@ lib/firefox/modules/devtools/server/actors/string.js lib/firefox/modules/devtools/server/actors/styleeditor.js lib/firefox/modules/devtools/server/actors/styles.js lib/firefox/modules/devtools/server/actors/stylesheets.js +lib/firefox/modules/devtools/server/actors/timeline.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 diff --git a/www/firefox/distinfo b/www/firefox/distinfo index a60a3796eb2..51601304e9a 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,26 +1,26 @@ -$NetBSD: distinfo,v 1.175 2014/12/02 21:27:18 ryoon Exp $ +$NetBSD: distinfo,v 1.176 2015/01/16 22:42:09 ryoon Exp $ -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 (firefox-35.0.source.tar.bz2) = 52f310f08ab5a52cd9d9be00016f0872a5e81774 +RMD160 (firefox-35.0.source.tar.bz2) = 921fc829bf46bd335d7c27c8ed71397604e9489e +Size (firefox-35.0.source.tar.bz2) = 176269100 bytes +SHA1 (patch-aa) = f493d2eda255a9337487a3ba9b3fd442942a0312 SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 -SHA1 (patch-as) = 28042411e39f7490150c504fe7dfa8b30b6f5064 -SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da +SHA1 (patch-as) = 29fb927a05b53922c8559bb15af2916a1459e9b9 +SHA1 (patch-b2g_installer_Makefile.in) = d630b5a2323d2494541f8d36b20c40c96dcb313d +SHA1 (patch-b2g_installer_package-manifest.in) = 12f704d4ee866277a44a6d175f0e7694cc71c29b SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 SHA1 (patch-browser_app_nsBrowserApp.cpp) = 00914f7656fff6785d737ce6e569a97fe39aafe8 SHA1 (patch-browser_installer_package-manifest.in) = 83a0073525c607e05414688aa07035cc3f08e50a SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07 SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7 -SHA1 (patch-build_clang-plugin_configure) = eb5bf7774a938766bffd7636811801b96afd2280 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) = c87cecac33f4d0e671e72d55aeef570af8515f17 +SHA1 (patch-config_external_moz.build) = f5503242184fe0936c044b3c57c217ef5d3c7255 SHA1 (patch-config_rules.mk) = e076a6572db9579a05ee9093d34bf3353c50de58 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b @@ -28,7 +28,7 @@ SHA1 (patch-config_system-headers) = 923e9f6e4adbb8af4686e5c07cb4520e6f981f93 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 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_GMPChild.cpp) = 2fac08e3f01c8ae36cfb26a7f59960ecf6e6bc55 SHA1 (patch-content_media_gmp_GMPParent.cpp) = 765adc26af771aea3e7db094b21c793780465672 SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb SHA1 (patch-content_media_moz.build) = d7c41801b9325d7d7eb756e5b0de8c6d78460a4f @@ -36,7 +36,7 @@ SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362 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-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 9ccb4210902f3c9b60b2ced1aab83d6f8bfd3de3 SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = b987dad1bd4513b8a04fb280bd1c5280a03af746 SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9 @@ -51,15 +51,12 @@ SHA1 (patch-intl_unicharutil_util_moz.build) = d8e4f9c0b013e4b0c9fdb41eaf6533696 SHA1 (patch-ipc_chromium_Makefile.in) = edd85b79cd3879f7595b932442bb0e93505d5506 SHA1 (patch-ipc_chromium_moz.build) = de12255865e45cfdf0f7dc57ce101be75ac8ad54 SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a -SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 7bc83577a9678542db4dff7dda19d751ff6d78c1 -SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 677f0b5ccdcde7a8551f2d07d2a472361a5da03f SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9d6d074b1692c6b4e722bfac8d67c66040a6fa76 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 18096b89ac3f239a0eb7c1d9c5080c1ac2c73e1b SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 16158489773bbcba35e224d30bebace0c93599ae -SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 12f3e063cf3fef23f0e3e0fdba5d5a4c1fc32af3 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ff1371ffb84abf2d2adcf25e66502943992d5109 -SHA1 (patch-ipc_chromium_src_base_process__util.h) = 8c5b88c04ff46ce3d0b694637c3d58d599a37bf3 +SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = efe1c242efded89b7a69a83429bc30843f330367 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 6b2611cc902f17e726aabcf4fb5fff2c71852408 SHA1 (patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h) = 8c61a35e99e7f54e4b2bf5931c59eb2b7a04127a @@ -67,7 +64,7 @@ SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 27890c56194e483fc0758ed SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 337a0b4a5d51d68c7699b79c7591b953ea23ca67 SHA1 (patch-ipc_chromium_src_build_build__config.h) = af5a10df7d8fe9715f0e43cd6be14f8f20c53517 SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b144a225bacf41833e059cb400 -SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = f3d8bc36a2c3ea7e79afbb668ee4d8dc9e71fb81 +SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 45f2f22b4f567ffddd4458f635179b5201e87e64 SHA1 (patch-ipc_glue_ScopedXREEmbed.cpp) = 97c39f25527dac4c22b38ce446ca2cd4cef08fd0 SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0 SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8 @@ -110,13 +107,12 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer. SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1 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-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 5b48bc7d172ef8b6601628cf097153c6c47c50c5 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 +SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 44cb29dac1e8032c3f58149227bfe5ad94e8edb9 SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749 -SHA1 (patch-mfbt_Atomics.h) = c02d517365276cef4cec178993375b54345c0d9a SHA1 (patch-mfbt_Attributes.h) = 0cf62084c0220a3fa46226714cea5c30b1b155e9 SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503 SHA1 (patch-mobile_android_installer_Makefile.in) = b2ea844a0145f4c15ef1b350dde6b000bd231fa5 @@ -143,19 +139,16 @@ SHA1 (patch-toolkit_system_gnome_nsAlertsIconListener.h) = c7f6394134a8876ae5637 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_gtk3drawing.c) = 35f849793b8051b88921987bc07062a2b1619092 SHA1 (patch-widget_gtk_mozgtk_mozgtk.c) = c6ffe6d2662ca6ec82958ab3f3c31bccf4aaf1ab -SHA1 (patch-widget_gtk_nsNativeThemeGTK.cpp) = 15c4325db15da13471d244a7020c458d2e2f86e9 +SHA1 (patch-widget_gtk_nsLookAndFeel.cpp) = 34e87c51284cec254344993bfddbd6699bbc6117 +SHA1 (patch-widget_gtk_nsLookAndFeel.h) = a639562ca57e1353160b306c8b5805349b130a8a SHA1 (patch-widget_gtk_nsWindow.cpp) = b9f4cb3c46c34438b136246396de571ccf23d9b6 -SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 2475818905150a4779607ab24ea6bd261e62f5bd +SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 933c44297371af2eaa5b7588cdcb6e3bc68f74fc SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438 -SHA1 (patch-xpcom_build_nsXPComInit.cpp) = 6a476877d38a07b8300d542067dda13b2739182c -SHA1 (patch-xpcom_ds_TimeStamp.h) = fe7dd3f21a2998b72f3cb7505002338f36781bed +SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 9c0d4c7f937ccc127974a80c826316bfae9920f9 SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = a0445488bbcabe7a67a83df3d75f2d956e172a1f SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index e156f453c6b..43b6802a705 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-aa,v 1.33 2015/01/16 22:42:09 ryoon Exp $ * The profiler does not support Darwin/PPC so don't try to enable it on that platform. @@ -13,9 +13,18 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 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-11-21 03:37:23.000000000 +0000 +--- configure.in.orig 2015-01-09 04:38:18.000000000 +0000 +++ configure.in -@@ -1652,7 +1652,13 @@ Linux) +@@ -1444,7 +1444,7 @@ if test "$GNU_CC"; then + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wtype-limits" + + # Treat some warnings as errors: +- _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts" ++ #_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts" + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=comment" + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=endif-labels" + _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=enum-compare" +@@ -1717,7 +1717,13 @@ Linux) MOZ_ENABLE_PROFILER_SPS= esac ;; @@ -30,7 +39,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ *) MOZ_ENABLE_PROFILER_SPS= ;; -@@ -1756,7 +1762,7 @@ case "$host" in +@@ -1821,7 +1827,7 @@ case "$host" in ;; *-darwin*) @@ -39,7 +48,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; -@@ -1888,7 +1894,6 @@ case "$target" in +@@ -1953,7 +1959,6 @@ case "$target" in AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit' else @@ -47,7 +56,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' # The ExceptionHandling framework is needed for Objective-C exception -@@ -2504,8 +2509,7 @@ MOZ_CXX11 +@@ -2569,8 +2574,7 @@ MOZ_CXX11 AC_LANG_C @@ -57,7 +66,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3542,6 +3546,14 @@ if test -n "$YASM"; then +@@ -3614,6 +3618,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -72,7 +81,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3569,11 +3581,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -3641,11 +3653,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -85,7 +94,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -4267,6 +4275,10 @@ cairo-gonk) +@@ -4348,6 +4356,10 @@ cairo-gonk) esac @@ -96,7 +105,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ AC_SUBST(MOZ_PDF_PRINTING) if test "$MOZ_PDF_PRINTING"; then PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" -@@ -4980,6 +4992,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5088,6 +5100,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VPX=1 MOZ_VPX_ERROR_CONCEALMENT=1 @@ -106,7 +115,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5083,6 +5098,57 @@ if test "${ac_cv_c_attribute_aligned}" ! +@@ -5191,6 +5206,57 @@ if test "${ac_cv_c_attribute_aligned}" ! fi dnl ======================================================== @@ -164,7 +173,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ dnl = Disable Opus audio codec support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(opus, -@@ -5091,6 +5157,89 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5199,6 +5265,89 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -254,7 +263,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -@@ -5449,6 +5598,60 @@ fi +@@ -5557,6 +5706,60 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -315,7 +324,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -5462,12 +5665,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, +@@ -5570,12 +5773,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, MOZ_ALSA=1, MOZ_ALSA=) @@ -339,7 +348,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ AC_SUBST(MOZ_ALSA) dnl ======================================================== -@@ -5891,7 +6105,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, +@@ -5999,7 +6213,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, if test "$MOZ_GAMEPAD"; then case "$OS_TARGET" in Darwin) @@ -350,7 +359,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ ;; WINNT) case "$MOZ_WINSDK_MAXVER" in -@@ -8020,6 +8236,49 @@ if test "$USE_FC_FREETYPE"; then +@@ -8123,6 +8339,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== @@ -400,7 +409,7 @@ $NetBSD: patch-aa,v 1.32 2014/12/01 18:11:14 ryoon Exp $ dnl Check for pixman and cairo dnl ======================================================== -@@ -8275,7 +8534,7 @@ case "$OS_TARGET" in +@@ -8378,7 +8637,7 @@ case "$OS_TARGET" in NECKO_WIFI=1 fi ;; diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as index c3be1cf2094..1fb6aed1a40 100644 --- a/www/firefox/patches/patch-as +++ b/www/firefox/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.13 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-as,v 1.14 2015/01/16 22:42:09 ryoon Exp $ Treat DragonFly like FreeBSD. ---- js/src/configure.in.orig 2014-11-21 03:37:33.000000000 +0000 +--- js/src/configure.in.orig 2015-01-09 04:38:17.000000000 +0000 +++ js/src/configure.in -@@ -2089,8 +2089,7 @@ AC_LANG_CPLUSPLUS +@@ -2180,8 +2180,7 @@ AC_LANG_CPLUSPLUS MOZ_CXX11 @@ -14,7 +14,7 @@ Treat DragonFly like FreeBSD. dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3004,7 +3003,7 @@ if test "$MOZ_MEMORY"; then +@@ -3095,7 +3094,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; @@ -23,7 +23,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) -@@ -3924,6 +3923,16 @@ MOZ_SUBCONFIGURE_ICU() +@@ -3989,6 +3988,16 @@ MOZ_SUBCONFIGURE_ICU() dnl ======================================================== dnl JavaScript shell dnl ======================================================== @@ -38,5 +38,5 @@ Treat DragonFly like FreeBSD. + PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) +fi - AC_HAVE_FUNCS(setlocale) - AC_HAVE_FUNCS(localeconv) + MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" + MALLOC_H= diff --git a/www/firefox/patches/patch-b2g_installer_Makefile.in b/www/firefox/patches/patch-b2g_installer_Makefile.in new file mode 100644 index 00000000000..c0417175ba7 --- /dev/null +++ b/www/firefox/patches/patch-b2g_installer_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-b2g_installer_Makefile.in,v 1.3 2015/01/16 22:42:09 ryoon Exp $ + +--- b2g/installer/Makefile.in.orig 2015-01-09 04:38:12.000000000 +0000 ++++ b2g/installer/Makefile.in +@@ -79,6 +79,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-b2g_installer_package-manifest.in b/www/firefox/patches/patch-b2g_installer_package-manifest.in index 23140f55fa4..e8151802a86 100644 --- a/www/firefox/patches/patch-b2g_installer_package-manifest.in +++ b/www/firefox/patches/patch-b2g_installer_package-manifest.in @@ -1,10 +1,10 @@ -$NetBSD: patch-b2g_installer_package-manifest.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $ +$NetBSD: patch-b2g_installer_package-manifest.in,v 1.2 2015/01/16 22:42:09 ryoon Exp $ ---- b2g/installer/package-manifest.in.orig 2014-07-17 01:45:05.000000000 +0000 +--- b2g/installer/package-manifest.in.orig 2015-01-09 04:38:12.000000000 +0000 +++ b2g/installer/package-manifest.in -@@ -565,7 +565,7 @@ - @BINPATH@/components/MozKeyboard.js - @BINPATH@/components/InputMethod.manifest +@@ -606,7 +606,7 @@ + @BINPATH@/components/EngineeringModeAPI.js + @BINPATH@/components/EngineeringModeService.js -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) diff --git a/www/firefox/patches/patch-build_clang-plugin_configure b/www/firefox/patches/patch-build_clang-plugin_configure deleted file mode 100644 index 8a8cdc0f755..00000000000 --- a/www/firefox/patches/patch-build_clang-plugin_configure +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-build_clang-plugin_configure,v 1.1 2014/10/05 01:59:08 ryoon Exp $ - ---- build/clang-plugin/configure.orig 2014-09-24 01:05:09.000000000 +0000 -+++ build/clang-plugin/configure -@@ -42,7 +42,7 @@ LLVMCXXFLAGS=`$LLVMCONFIG --cxxflags` - LLVMLDFLAGS=`$LLVMCONFIG --ldflags` - LLVMLDFLAGS="$LLVMLDFLAGS `$LLVMCONFIG --libs $LLVMLIBS`" - --if [ $PLATFORM == Darwin ]; then -+if [ $PLATFORM = Darwin ]; then - DSO_LDOPTS="-dynamiclib -shared" - CLANGLDFLAGS="-lclangFrontend -lclangDriver -lclangSerialization \ - -lclangParse -lclangSema -lclangAnalysis -lclangEdit -lclangAST \ diff --git a/www/firefox/patches/patch-config_external_moz.build b/www/firefox/patches/patch-config_external_moz.build index 9908bffa633..fc1c5fdef34 100644 --- a/www/firefox/patches/patch-config_external_moz.build +++ b/www/firefox/patches/patch-config_external_moz.build @@ -1,10 +1,10 @@ -$NetBSD: patch-config_external_moz.build,v 1.5 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-config_external_moz.build,v 1.6 2015/01/16 22:42:09 ryoon Exp $ ---- config/external/moz.build.orig 2014-11-21 03:37:23.000000000 +0000 +--- config/external/moz.build.orig 2015-01-09 04:38:18.000000000 +0000 +++ config/external/moz.build -@@ -16,13 +16,19 @@ if CONFIG['MOZ_UPDATER']: - if not CONFIG['MOZ_NATIVE_BZ2']: - external_dirs += ['modules/libbz2'] +@@ -19,13 +19,19 @@ if CONFIG['MOZ_UPDATER']: + # There's no "native brotli" yet, but probably in the future... + external_dirs += ['modules/brotli'] -if CONFIG['MOZ_VORBIS']: +if not CONFIG['MOZ_NATIVE_OGG']: @@ -25,7 +25,7 @@ $NetBSD: patch-config_external_moz.build,v 1.5 2014/12/01 18:11:14 ryoon Exp $ external_dirs += ['media/libopus'] if CONFIG['MOZ_WEBM']: -@@ -37,14 +43,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ +@@ -40,14 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ if not CONFIG['MOZ_NATIVE_PNG']: external_dirs += ['media/libpng'] diff --git a/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp b/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp index a5487fb1f72..2391ee0d598 100644 --- a/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp +++ b/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-content_media_gmp_GMPChild.cpp,v 1.1 2014/10/15 13:43:32 ryoon Exp $ +$NetBSD: patch-content_media_gmp_GMPChild.cpp,v 1.2 2015/01/16 22:42:09 ryoon Exp $ ---- content/media/gmp/GMPChild.cpp.orig 2014-10-11 09:06:20.000000000 +0000 +--- content/media/gmp/GMPChild.cpp.orig 2015-01-09 04:38:19.000000000 +0000 +++ content/media/gmp/GMPChild.cpp -@@ -66,19 +66,11 @@ GetPluginFile(const std::string& aPlugin +@@ -91,21 +91,14 @@ GetFileBase(const std::string& aPluginPa } #endif - nsCOMPtr<nsIFile> parent; -- rv = aLibFile->GetParent(getter_AddRefs(parent)); +- rv = aFileBase->GetParent(getter_AddRefs(parent)); - if (NS_FAILED(rv)) { - return false; - } @@ -16,12 +16,15 @@ $NetBSD: patch-content_media_gmp_GMPChild.cpp,v 1.1 2014/10/15 13:43:32 ryoon Ex - rv = parent->GetLeafName(parentLeafName); - if (NS_FAILED(rv)) { + nsAutoString leafName; -+ if (NS_FAILED(aLibFile->GetLeafName(leafName))) { ++ if (NS_FAILED(aFileBase->GetLeafName(leafName))) { return false; } -- -- nsAutoString baseName(Substring(parentLeafName, 4, parentLeafName.Length() - 1)); -+ nsAutoString baseName(Substring(leafName, 4, leafName.Length() - 1)); - #if defined(XP_MACOSX) - nsAutoString binaryName = NS_LITERAL_STRING("lib") + baseName + NS_LITERAL_STRING(".dylib"); +- aBaseName = Substring(parentLeafName, ++ aBaseName = Substring(leafName, + 4, +- parentLeafName.Length() - 1); ++ leafName.Length() - 1); + return true; + } + diff --git a/www/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp b/www/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp index ec574e4a722..6a0827adcb4 100644 --- a/www/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp +++ b/www/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp @@ -1,14 +1,14 @@ -$NetBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.4 2014/02/21 16:17:47 ryoon Exp $ +$NetBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.5 2015/01/16 22:42:09 ryoon Exp $ ---- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2014-02-12 21:28:58.000000000 +0000 +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-01-09 04:38:27.000000000 +0000 +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -426,6 +426,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries + nsIFile* hunDir; -+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@PREFIX@/share/hunspell"), ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), + true, &hunDir); + LoadDictionariesFromDir(hunDir); + diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_base__paths.h b/www/firefox/patches/patch-ipc_chromium_src_base_base__paths.h deleted file mode 100644 index d7b37a11eb3..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_src_base_base__paths.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- ipc/chromium/src/base/base_paths.h.orig 2013-05-11 19:19:32.000000000 +0000 -+++ ipc/chromium/src/base/base_paths.h -@@ -13,7 +13,7 @@ - #include "base/base_paths_win.h" - #elif defined(OS_MACOSX) - #include "base/base_paths_mac.h" --#elif defined(OS_LINUX) || defined(OS_BSD) -+#elif defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS) - #include "base/base_paths_linux.h" - #endif - #include "base/path_service.h" diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_debug__util__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_debug__util__posix.cc deleted file mode 100644 index 9c6604694ec..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_src_base_debug__util__posix.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- ipc/chromium/src/base/debug_util_posix.cc.orig 2013-05-11 19:19:32.000000000 +0000 -+++ ipc/chromium/src/base/debug_util_posix.cc -@@ -107,7 +107,7 @@ bool DebugUtil::BeingDebugged() { - return being_debugged; - } - --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_SOLARIS) - - // We can look in /proc/self/status for TracerPid. We are likely used in crash - // handling, so we are careful not to use the heap or have side effects. diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc b/www/firefox/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc deleted file mode 100644 index cb6213111d8..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_src_base_message__pump__libevent.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.3 2014/02/20 13:19:03 ryoon Exp $ - ---- ipc/chromium/src/base/message_pump_libevent.cc.orig 2013-05-11 19:19:32.000000000 +0000 -+++ ipc/chromium/src/base/message_pump_libevent.cc -@@ -16,7 +16,7 @@ - #include "base/scoped_ptr.h" - #include "base/time.h" - #include "nsDependentSubstring.h" --#include "third_party/libevent/event.h" -+#include "event.h" - - // Lifecycle of struct event - // Libevent uses two main data structures: diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h b/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h index 500fa4a786a..8b738ebcb31 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h +++ b/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h @@ -1,17 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.5 2014/10/15 13:07:07 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.6 2015/01/16 22:42:09 ryoon Exp $ ---- ipc/chromium/src/base/process_util.h.orig 2014-10-11 09:06:28.000000000 +0000 +--- ipc/chromium/src/base/process_util.h.orig 2015-01-09 04:38:16.000000000 +0000 +++ ipc/chromium/src/base/process_util.h -@@ -13,7 +13,7 @@ - #if defined(OS_WIN) - #include <windows.h> - #include <tlhelp32.h> --#elif defined(OS_LINUX) || defined(__GLIBC__) -+#elif defined(OS_LINUX) || defined(__GLIBC__) || defined(OS_SOLARIS) - #include <dirent.h> - #include <limits.h> - #include <sys/types.h> -@@ -32,6 +32,9 @@ +@@ -41,6 +41,9 @@ typedef PROCESSENTRY32 ProcessEntry; typedef IO_COUNTERS IoCounters; #elif defined(OS_POSIX) diff --git a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp index c9794ab016b..f9efe8033a4 100644 --- a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp +++ b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.9 2014/10/15 13:07:07 ryoon Exp $ +$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.10 2015/01/16 22:42:09 ryoon Exp $ * Just because OS_ARCH is Darwin does not mean MacOS X specific kludges are needed. ---- ipc/glue/GeckoChildProcessHost.cpp.orig 2014-10-11 09:06:28.000000000 +0000 +--- ipc/glue/GeckoChildProcessHost.cpp.orig 2015-01-09 04:38:16.000000000 +0000 +++ ipc/glue/GeckoChildProcessHost.cpp @@ -4,7 +4,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -18,8 +18,8 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.9 2014/10/15 13:07:07 ryoo +#endif #include "base/command_line.h" - #include "base/path_service.h" -@@ -504,7 +510,7 @@ GeckoChildProcessHost::PerformAsyncLaunc + #include "base/string_util.h" +@@ -533,7 +539,7 @@ GeckoChildProcessHost::PerformAsyncLaunc // and passing wstrings from one config to the other is unsafe. So // we split the logic here. @@ -28,7 +28,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.9 2014/10/15 13:07:07 ryoo base::environment_map newEnvVars; ChildPrivileges privs = mPrivileges; if (privs == base::PRIVILEGES_DEFAULT) { -@@ -643,7 +649,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -672,7 +678,7 @@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(pidstring); #if defined(MOZ_CRASHREPORTER) @@ -37,7 +37,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.9 2014/10/15 13:07:07 ryoo int childCrashFd, childCrashRemapFd; if (!CrashReporter::CreateNotificationPipeForChild( &childCrashFd, &childCrashRemapFd)) -@@ -676,7 +682,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -705,7 +711,7 @@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(childProcessType); base::LaunchApp(childArgv, mFileMap, diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp index a2b73cec93f..81b664254df 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp @@ -1,8 +1,22 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.5 2014/03/20 21:02:00 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.6 2015/01/16 22:42:09 ryoon Exp $ ---- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2014-03-15 05:19:30.000000000 +0000 +--- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2015-01-09 04:38:22.000000000 +0000 +++ media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp -@@ -21,6 +21,13 @@ Scott McMurray
+@@ -14,6 +14,13 @@ Cygwin fix provided by:
+ Scott McMurray
+ */
+
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 900506
++# define getchar boost_getchar
++# endif
++#endif
++
+ #ifndef BOOST_SPREAD_SORT_H
+ #define BOOST_SPREAD_SORT_H
+ #include <algorithm>
+@@ -21,6 +28,13 @@ Scott McMurray
#include <vector>
#include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
diff --git a/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp b/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp index afead9a7f17..2760cfe68f1 100644 --- a/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp +++ b/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.4 2015/01/16 22:42:09 ryoon Exp $ ---- memory/mozalloc/mozalloc_abort.cpp.orig 2013-05-11 19:19:46.000000000 +0000 +--- memory/mozalloc/mozalloc_abort.cpp.orig 2015-01-09 04:38:22.000000000 +0000 +++ memory/mozalloc/mozalloc_abort.cpp -@@ -34,7 +34,11 @@ mozalloc_abort(const char* const msg) +@@ -63,7 +63,11 @@ void fillAbortMessage(char (&msg)[N], ui // Define abort() here, so that it is used instead of the system abort(). This // lets us control the behavior when aborting, in order to get better results // on *NIX platforms. See mozalloc_abort for details. @@ -12,5 +12,5 @@ $NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.3 2014/02/20 13:19:03 ryo void abort(void) +#endif { - mozalloc_abort("Redirecting call to abort() to mozalloc_abort\n"); - } + #ifdef MOZ_WIDGET_ANDROID + char msg[64] = {}; diff --git a/www/firefox/patches/patch-mfbt_Atomics.h b/www/firefox/patches/patch-mfbt_Atomics.h deleted file mode 100644 index 387fc23622c..00000000000 --- a/www/firefox/patches/patch-mfbt_Atomics.h +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-mfbt_Atomics.h,v 1.3 2014/10/15 13:43:32 ryoon Exp $ - ---- mfbt/Atomics.h.orig 2014-10-11 09:06:41.000000000 +0000 -+++ mfbt/Atomics.h -@@ -34,10 +34,12 @@ - * loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline - * definitions for unspecialized std::atomic and causes linking errors. - * Therefore, we require at least 4.7.0 for using libstdc++. -+ * -+ * libc++ <atomic> is only functional with clang. - */ - # if MOZ_USING_LIBSTDCXX && MOZ_LIBSTDCXX_VERSION_AT_LEAST(4, 7, 0) - # define MOZ_HAVE_CXX11_ATOMICS --# elif MOZ_USING_LIBCXX -+# elif MOZ_USING_LIBCXX && defined(__clang__) - # define MOZ_HAVE_CXX11_ATOMICS - # endif - #elif defined(_MSC_VER) && _MSC_VER >= 1700 diff --git a/www/firefox/patches/patch-toolkit_toolkit.mozbuild b/www/firefox/patches/patch-toolkit_toolkit.mozbuild deleted file mode 100644 index 54ca23db048..00000000000 --- a/www/firefox/patches/patch-toolkit_toolkit.mozbuild +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-toolkit_toolkit.mozbuild,v 1.4 2014/02/20 13:19:03 ryoon Exp $ - ---- toolkit/toolkit.mozbuild.orig 2013-12-05 16:07:58.000000000 +0000 -+++ toolkit/toolkit.mozbuild -@@ -43,8 +43,8 @@ add_tier_dir('platform', [ - if CONFIG['MOZ_AUTH_EXTENSION']: - add_tier_dir('platform', 'extensions/auth') - --if CONFIG['MOZ_UPDATER']: -- add_tier_dir('platform', 'other-licenses/bsdiff') -+#if CONFIG['MOZ_UPDATER']: -+# add_tier_dir('platform', 'other-licenses/bsdiff') - - # Gecko/Core components. - diff --git a/www/firefox/patches/patch-widget_gtk_gtk2drawing.c b/www/firefox/patches/patch-widget_gtk_gtk2drawing.c deleted file mode 100644 index f1cc98347b3..00000000000 --- a/www/firefox/patches/patch-widget_gtk_gtk2drawing.c +++ /dev/null @@ -1,29 +0,0 @@ -$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 index e94a813d699..bbfde46ed3d 100644 --- a/www/firefox/patches/patch-widget_gtk_gtk3drawing.c +++ b/www/firefox/patches/patch-widget_gtk_gtk3drawing.c @@ -1,209 +1,69 @@ -$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.1 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-widget_gtk_gtk3drawing.c,v 1.2 2015/01/16 22:42:09 ryoon Exp $ ---- widget/gtk/gtk3drawing.c.orig 2014-11-21 03:37:52.000000000 +0000 +--- widget/gtk/gtk3drawing.c.orig 2015-01-09 04:38:28.000000000 +0000 +++ widget/gtk/gtk3drawing.c -@@ -2105,6 +2105,21 @@ moz_gtk_get_tab_thickness(void) - return border.top; - } +@@ -64,6 +64,7 @@ static GtkWidget* gScrolledWindowWidget; -+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. */ + static style_prop_t style_prop_func; + static gboolean have_arrow_scaling; ++static gboolean checkbox_check_state; + static gboolean is_initialized; - GtkStyleContext* style; -+ GdkRectangle tabRect; - GdkRectangle focusRect; - GdkRectangle backRect; -+ int initial_gap = 0; + #define ARROW_UP 0 +@@ -71,6 +72,10 @@ static gboolean is_initialized; + #define ARROW_RIGHT G_PI_2 + #define ARROW_LEFT (G_PI+G_PI_2) - ensure_tab_widget(); - gtk_widget_set_direction(gTabWidget, direction); ++#if !GTK_CHECK_VERSION(3,14,0) ++#define GTK_STATE_FLAG_CHECKED (1 << 11) ++#endif ++ + static GtkStateFlags + GetStateFlagsFromGtkWidgetState(GtkWidgetState* state) + { +@@ -714,6 +719,11 @@ moz_gtk_init() + is_initialized = TRUE; + have_arrow_scaling = (gtk_major_version > 2 || + (gtk_major_version == 2 && gtk_minor_version >= 12)); ++ if (gtk_major_version > 3 || ++ (gtk_major_version == 3 && gtk_minor_version >= 14)) ++ checkbox_check_state = GTK_STATE_FLAG_CHECKED; ++ else ++ checkbox_check_state = GTK_STATE_FLAG_ACTIVE; - style = gtk_widget_get_style_context(gTabWidget); -- backRect = focusRect = *rect; -- + /* Add style property to GtkEntry. + * Adding the style property to the normal GtkEntry class means that it +@@ -1004,10 +1014,10 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec + gtk_widget_set_sensitive(w, !state->disabled); + gtk_widget_set_direction(w, direction); 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); + if (isradio) { + gtk_style_context_add_class(style, GTK_STYLE_CLASS_RADIO); +- gtk_style_context_set_state(style, selected ? GTK_STATE_FLAG_ACTIVE : ++ gtk_style_context_set_state(style, selected ? checkbox_check_state : + GTK_STATE_FLAG_NORMAL); + gtk_render_option(style, cr, x, y, width, height); + if (state->focused) { +@@ -1025,7 +1035,7 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec + gtk_style_context_set_state(style, GTK_STATE_FLAG_INCONSISTENT); + gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(gCheckboxWidget), TRUE); + } else if (selected) { +- gtk_style_context_set_state(style, GTK_STATE_FLAG_ACTIVE); ++ gtk_style_context_set_state(style, checkbox_check_state); } 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); + gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(gCheckboxWidget), FALSE); } +@@ -2588,8 +2598,9 @@ moz_gtk_check_menu_item_paint(cairo_t *c + gtk_style_context_add_class(style, GTK_STYLE_CLASS_CHECK); } -@@ -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; +- if (checked) +- state_flags |= GTK_STATE_FLAG_ACTIVE; ++ if (checked) { ++ state_flags |= checkbox_check_state; + } -+ -+ gtk_style_context_restore(style); -+ -+ return MOZ_GTK_SUCCESS; -+} -+ -+gint - moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height) - { - /* + + gtk_style_context_set_state(style, state_flags); + gtk_style_context_get_padding(style, state_flags, &padding); diff --git a/www/firefox/patches/patch-widget_gtk_gtkdrawing.h b/www/firefox/patches/patch-widget_gtk_gtkdrawing.h deleted file mode 100644 index c3d16779721..00000000000 --- a/www/firefox/patches/patch-widget_gtk_gtkdrawing.h +++ /dev/null @@ -1,24 +0,0 @@ -$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_nsLookAndFeel.cpp b/www/firefox/patches/patch-widget_gtk_nsLookAndFeel.cpp new file mode 100644 index 00000000000..2d21f9abfbf --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_nsLookAndFeel.cpp @@ -0,0 +1,207 @@ +$NetBSD: patch-widget_gtk_nsLookAndFeel.cpp,v 1.1 2015/01/16 22:42:09 ryoon Exp $ + +--- widget/gtk/nsLookAndFeel.cpp.orig 2015-01-09 04:38:28.000000000 +0000 ++++ widget/gtk/nsLookAndFeel.cpp +@@ -38,7 +38,6 @@ nsLookAndFeel::nsLookAndFeel() + mStyle(nullptr), + #else + mBackgroundStyle(nullptr), +- mViewStyle(nullptr), + mButtonStyle(nullptr), + #endif + mDefaultFontCached(false), mButtonFontCached(false), +@@ -53,7 +52,6 @@ nsLookAndFeel::~nsLookAndFeel() + g_object_unref(mStyle); + #else + g_object_unref(mBackgroundStyle); +- g_object_unref(mViewStyle); + g_object_unref(mButtonStyle); + #endif + } +@@ -114,13 +112,19 @@ nsLookAndFeel::NativeGetColor(ColorID aI + case eColorID_IMESelectedRawTextBackground: + case eColorID_IMESelectedConvertedTextBackground: + case eColorID__moz_dragtargetzone: +- aColor = sMozWindowSelectedBackground; ++ case eColorID__moz_cellhighlight: ++ case eColorID__moz_html_cellhighlight: ++ case eColorID_highlight: // preference selected item, ++ aColor = sTextSelectedBackground; + break; + case eColorID_WidgetSelectForeground: + case eColorID_TextSelectForeground: + case eColorID_IMESelectedRawTextForeground: + case eColorID_IMESelectedConvertedTextForeground: +- aColor = sMozWindowSelectedText; ++ case eColorID_highlighttext: ++ case eColorID__moz_cellhighlighttext: ++ case eColorID__moz_html_cellhighlighttext: ++ aColor = sTextSelectedText; + break; + #endif + case eColorID_Widget3DHighlight: +@@ -238,19 +242,6 @@ nsLookAndFeel::NativeGetColor(ColorID aI + GTK_STATE_FLAG_INSENSITIVE, &gdk_color); + aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); + break; +- case eColorID_highlight: // preference selected item, +- // background of selected item +- gtk_style_context_get_background_color(mViewStyle, +- GTK_STATE_FLAG_SELECTED, +- &gdk_color); +- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); +- break; +- case eColorID_highlighttext: +- // text of selected item +- gtk_style_context_get_color(mViewStyle, +- GTK_STATE_FLAG_SELECTED, &gdk_color); +- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); +- break; + case eColorID_inactivecaption: + // inactive window caption + gtk_style_context_get_background_color(mBackgroundStyle, +@@ -284,10 +275,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI + #endif + break; + ++ case eColorID_threedlightshadow: ++ // 3-D highlighted inner edge color ++ // always same as background in GTK code + case eColorID_threedface: + case eColorID_buttonface: + // 3-D face color +- aColor = sFrameBackground; ++#if (MOZ_WIDGET_GTK == 3) ++ aColor = sMozWindowBackground; ++#else ++ aColor = sButtonBackground; ++#endif + break; + + case eColorID_buttontext: +@@ -302,11 +300,6 @@ nsLookAndFeel::NativeGetColor(ColorID aI + aColor = sFrameOuterLightBorder; + break; + +- case eColorID_threedlightshadow: +- // 3-D highlighted inner edge color +- aColor = sFrameBackground; // always same as background in GTK code +- break; +- + case eColorID_buttonshadow: + // 3-D shadow edge color + case eColorID_threedshadow: +@@ -391,19 +384,6 @@ nsLookAndFeel::NativeGetColor(ColorID aI + case eColorID__moz_buttonhovertext: + aColor = sButtonHoverText; + break; +- case eColorID__moz_cellhighlight: +- case eColorID__moz_html_cellhighlight: +- gtk_style_context_get_background_color(mViewStyle, +- GTK_STATE_FLAG_SELECTED, +- &gdk_color); +- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); +- break; +- case eColorID__moz_cellhighlighttext: +- case eColorID__moz_html_cellhighlighttext: +- gtk_style_context_get_color(mViewStyle, +- GTK_STATE_FLAG_SELECTED, &gdk_color); +- aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); +- break; + #endif + case eColorID__moz_menuhover: + aColor = sMenuHover; +@@ -965,7 +945,7 @@ nsLookAndFeel::Init() + GtkStyleContext *style; + + // Gtk manages a screen's CSS in the settings object so we +- // ask Gtk to create it explicitly. Otherwise we may end up ++ // ask Gtk to create it explicitly. Otherwise we may end up + // with wrong color theme, see Bug 972382 + (void)gtk_settings_get_for_screen(gdk_screen_get_default()); + +@@ -975,9 +955,6 @@ nsLookAndFeel::Init() + mBackgroundStyle = create_context(path); + gtk_style_context_add_class(mBackgroundStyle, GTK_STYLE_CLASS_BACKGROUND); + +- mViewStyle = create_context(path); +- gtk_style_context_add_class(mViewStyle, GTK_STYLE_CLASS_VIEW); +- + mButtonStyle = create_context(path); + gtk_style_context_add_class(mButtonStyle, GTK_STYLE_CLASS_BUTTON); + +@@ -990,11 +967,24 @@ nsLookAndFeel::Init() + g_object_unref(style); + + // Text colors +- gtk_style_context_get_background_color(mViewStyle, GTK_STATE_FLAG_NORMAL, &color); ++ style = create_context(path); ++ gtk_style_context_add_class(style, GTK_STYLE_CLASS_VIEW); ++ gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color); + sMozFieldBackground = GDK_RGBA_TO_NS_RGBA(color); +- gtk_style_context_get_color(mViewStyle, GTK_STATE_FLAG_NORMAL, &color); ++ gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color); + sMozFieldText = GDK_RGBA_TO_NS_RGBA(color); + ++ // Selected text and background ++ gtk_style_context_get_background_color(style, ++ static_cast<GtkStateFlags>(GTK_STATE_FLAG_FOCUSED|GTK_STATE_FLAG_SELECTED), ++ &color); ++ sTextSelectedBackground = GDK_RGBA_TO_NS_RGBA(color); ++ gtk_style_context_get_color(style, ++ static_cast<GtkStateFlags>(GTK_STATE_FLAG_FOCUSED|GTK_STATE_FLAG_SELECTED), ++ &color); ++ sTextSelectedText = GDK_RGBA_TO_NS_RGBA(color); ++ g_object_unref(style); ++ + // Window colors + style = create_context(path); + gtk_style_context_save(style); +@@ -1003,12 +993,6 @@ nsLookAndFeel::Init() + sMozWindowBackground = GDK_RGBA_TO_NS_RGBA(color); + gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color); + sMozWindowText = GDK_RGBA_TO_NS_RGBA(color); +- +- // Selected text and background +- gtk_style_context_get_background_color(style, GTK_STATE_FLAG_SELECTED, &color); +- sMozWindowSelectedBackground = GDK_RGBA_TO_NS_RGBA(color); +- gtk_style_context_get_color(style, GTK_STATE_FLAG_SELECTED, &color); +- sMozWindowSelectedText = GDK_RGBA_TO_NS_RGBA(color); + gtk_style_context_restore(style); + + // tooltip foreground and background +@@ -1141,7 +1125,7 @@ nsLookAndFeel::Init() + + style = gtk_widget_get_style(button); + if (style) { +- sFrameBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]); ++ sButtonBackground = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]); + sFrameOuterLightBorder = + GDK_COLOR_TO_NS_RGB(style->light[GTK_STATE_NORMAL]); + sFrameInnerDarkBorder = +@@ -1189,12 +1173,9 @@ nsLookAndFeel::Init() + GtkWidget *frame = gtk_frame_new(nullptr); + gtk_container_add(GTK_CONTAINER(parent), frame); + +- style = gtk_widget_get_style_context(frame); +- gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color); +- sFrameBackground = GDK_RGBA_TO_NS_RGBA(color); +- + // TODO GTK3 - update sFrameOuterLightBorder + // for GTK_BORDER_STYLE_INSET/OUTSET/GROVE/RIDGE border styles (Bug 978172). ++ style = gtk_widget_get_style_context(frame); + gtk_style_context_get_border_color(style, GTK_STATE_FLAG_NORMAL, &color); + sFrameInnerDarkBorder = sFrameOuterLightBorder = GDK_RGBA_TO_NS_RGBA(color); + #endif +@@ -1257,11 +1238,9 @@ nsLookAndFeel::RefreshImpl() + mStyle = nullptr; + #else + g_object_unref(mBackgroundStyle); +- g_object_unref(mViewStyle); + g_object_unref(mButtonStyle); + + mBackgroundStyle = nullptr; +- mViewStyle = nullptr; + mButtonStyle = nullptr; + #endif + diff --git a/www/firefox/patches/patch-widget_gtk_nsLookAndFeel.h b/www/firefox/patches/patch-widget_gtk_nsLookAndFeel.h new file mode 100644 index 00000000000..28d674fc903 --- /dev/null +++ b/www/firefox/patches/patch-widget_gtk_nsLookAndFeel.h @@ -0,0 +1,32 @@ +$NetBSD: patch-widget_gtk_nsLookAndFeel.h,v 1.1 2015/01/16 22:42:09 ryoon Exp $ + +--- widget/gtk/nsLookAndFeel.h.orig 2015-01-09 04:38:28.000000000 +0000 ++++ widget/gtk/nsLookAndFeel.h +@@ -35,7 +35,6 @@ protected: + struct _GtkStyle *mStyle; + #else + struct _GtkStyleContext *mBackgroundStyle; +- struct _GtkStyleContext *mViewStyle; + struct _GtkStyleContext *mButtonStyle; + #endif + +@@ -64,7 +63,7 @@ protected: + nscolor sMenuHoverText; + nscolor sButtonText; + nscolor sButtonHoverText; +- nscolor sFrameBackground; ++ nscolor sButtonBackground; + nscolor sFrameOuterLightBorder; + nscolor sFrameInnerDarkBorder; + nscolor sOddCellBackground; +@@ -75,8 +74,8 @@ protected: + nscolor sMozFieldBackground; + nscolor sMozWindowText; + nscolor sMozWindowBackground; +- nscolor sMozWindowSelectedText; +- nscolor sMozWindowSelectedBackground; ++ nscolor sTextSelectedText; ++ nscolor sTextSelectedBackground; + nscolor sMozScrollbar; + char16_t sInvisibleCharacter; + float sCaretRatio; diff --git a/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp b/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp deleted file mode 100644 index 9d1151d5621..00000000000 --- a/www/firefox/patches/patch-widget_gtk_nsNativeThemeGTK.cpp +++ /dev/null @@ -1,31 +0,0 @@ -$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-xpcom_base_nsStackWalk.cpp b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp index bdd8c099a8b..92835e158b7 100644 --- a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp +++ b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp @@ -1,29 +1,11 @@ -$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.8 2014/10/05 01:59:08 ryoon Exp $ +$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.9 2015/01/16 22:42:09 ryoon Exp $ * Replace XP_MACOSX with XP_DARWIN as the former is not defined when the toolkit is not cocoa. ---- xpcom/base/nsStackWalk.cpp.orig 2014-09-24 01:05:41.000000000 +0000 +--- xpcom/base/nsStackWalk.cpp.orig 2015-01-09 04:38:29.000000000 +0000 +++ xpcom/base/nsStackWalk.cpp -@@ -47,7 +47,7 @@ static CriticalAddress gCriticalAddress; - (defined(__sun) && \ - (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))) - --#if NSSTACKWALK_SUPPORTS_MACOSX -+#if NSSTACKWALK_SUPPORTS_DARWIN - #include <pthread.h> - #include <CoreServices/CoreServices.h> - -@@ -866,7 +866,7 @@ NS_FormatCodeAddressDetails(void* aPC, c - - // WIN32 x86 stack walking code - // i386 or PPC Linux stackwalking code or Solaris --#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_SOLARIS || NSSTACKWALK_SUPPORTS_MACOSX) -+#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_SOLARIS || NSSTACKWALK_SUPPORTS_DARWIN) - - #include <stdlib.h> - #include <string.h> -@@ -1191,7 +1191,7 @@ FramePointerStackWalk(NS_WalkStackCallba +@@ -903,7 +903,7 @@ FramePointerStackWalk(NS_WalkStackCallba (long(next) & 3)) { break; } @@ -32,7 +14,7 @@ $NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.8 2014/10/05 01:59:08 ryoon Exp $ // ppc mac or powerpc64 linux void* pc = *(bp + 2); bp += 3; -@@ -1221,7 +1221,7 @@ FramePointerStackWalk(NS_WalkStackCallba +@@ -933,7 +933,7 @@ FramePointerStackWalk(NS_WalkStackCallba } #define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__)) diff --git a/www/firefox/patches/patch-xpcom_build_nsXPComInit.cpp b/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp index 7ea1338b236..fa6b734ee4f 100644 --- a/www/firefox/patches/patch-xpcom_build_nsXPComInit.cpp +++ b/www/firefox/patches/patch-xpcom_build_XPCOMInit.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-xpcom_build_nsXPComInit.cpp,v 1.2 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-xpcom_build_XPCOMInit.cpp,v 1.1 2015/01/16 22:42:09 ryoon Exp $ ---- xpcom/build/nsXPComInit.cpp.orig 2014-11-21 03:37:53.000000000 +0000 -+++ xpcom/build/nsXPComInit.cpp -@@ -138,7 +138,9 @@ extern nsresult nsStringInputStreamConst +--- xpcom/build/XPCOMInit.cpp.orig 2015-01-09 04:38:29.000000000 +0000 ++++ xpcom/build/XPCOMInit.cpp +@@ -139,7 +139,9 @@ extern nsresult nsStringInputStreamConst #include "mozilla/VisualEventTracer.h" #endif diff --git a/www/firefox/patches/patch-xpcom_ds_TimeStamp.h b/www/firefox/patches/patch-xpcom_ds_TimeStamp.h deleted file mode 100644 index 96d5315a949..00000000000 --- a/www/firefox/patches/patch-xpcom_ds_TimeStamp.h +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-xpcom_ds_TimeStamp.h,v 1.4 2014/10/15 13:07:07 ryoon Exp $ - -http://gnats.netbsd.org/47233 - ---- xpcom/ds/TimeStamp.h.orig 2014-10-11 09:06:50.000000000 +0000 -+++ xpcom/ds/TimeStamp.h -@@ -199,14 +199,12 @@ private: - { - // NOTE: this MUST be a >= test, because int64_t(double(INT64_MAX)) - // overflows and gives INT64_MIN. -- if (aTicks >= double(INT64_MAX)) { -- return TimeDuration::FromTicks(INT64_MAX); -- } -+ if (aTicks >= double(INT64_MAX)) -+ return TimeDuration::FromTicks(int64_t(INT64_MAX)); - - // This MUST be a <= test. -- if (aTicks <= double(INT64_MIN)) { -- return TimeDuration::FromTicks(INT64_MIN); -- } -+ if (aTicks <= double(INT64_MIN)) -+ return TimeDuration::FromTicks(int64_t(INT64_MIN)); - - return TimeDuration::FromTicks(int64_t(aTicks)); - } |