diff options
119 files changed, 550 insertions, 807 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 26dcb63b052..300e59cf011 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.150 2014/01/01 11:52:37 wiz Exp $ +# $NetBSD: Makefile,v 1.151 2014/02/08 09:36:00 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 26.0 +MOZ_BRANCH= 27.0 MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} -PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} -#MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} +MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.bz2 WRKSRC= ${WRKDIR}/mozilla-release +#WRKSRC= ${WRKDIR}/mozilla-beta MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://www.mozilla.com/en-US/firefox/ diff --git a/www/firefox/PLIST b/www/firefox/PLIST index d24434d357a..5147e997605 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.76 2013/12/15 13:54:37 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.77 2014/02/08 09:36:00 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -80,11 +80,28 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/device.x lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/help.xhtml lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/index.js lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/index.xul +lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/manifest-editor.js lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects.js lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/projects.xhtml lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/template.js lib/firefox/browser/chrome/browser/content/browser/devtools/app-manager/utils.js lib/firefox/browser/chrome/browser/content/browser/devtools/cleopatra.html +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/activeline.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/clike.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/closebrackets.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.css +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/codemirror.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/comment.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/css.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.css +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/dialog.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/htmlmixed.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/javascript.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/matchbrackets.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/mozilla.css +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/search.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/searchcursor.js +lib/firefox/browser/chrome/browser/content/browser/devtools/codemirror/xml.js lib/firefox/browser/chrome/browser/content/browser/devtools/commandline.css lib/firefox/browser/chrome/browser/content/browser/devtools/commandlineoutput.xhtml lib/firefox/browser/chrome/browser/content/browser/devtools/commandlinetooltip.xhtml @@ -137,6 +154,8 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/j lib/firefox/browser/chrome/browser/content/browser/devtools/ruleview.css lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad.js lib/firefox/browser/chrome/browser/content/browser/devtools/scratchpad.xul +lib/firefox/browser/chrome/browser/content/browser/devtools/shadereditor.js +lib/firefox/browser/chrome/browser/content/browser/devtools/shadereditor.xul lib/firefox/browser/chrome/browser/content/browser/devtools/source-editor-overlay.xul lib/firefox/browser/chrome/browser/content/browser/devtools/splitview.css lib/firefox/browser/chrome/browser/content/browser/devtools/styleeditor.css @@ -156,7 +175,6 @@ lib/firefox/browser/chrome/browser/content/browser/downloads/download.xml lib/firefox/browser/chrome/browser/content/browser/downloads/downloads.css lib/firefox/browser/chrome/browser/content/browser/downloads/downloads.js lib/firefox/browser/chrome/browser/content/browser/downloads/downloadsOverlay.xul -lib/firefox/browser/chrome/browser/content/browser/downloads/indicator.css lib/firefox/browser/chrome/browser/content/browser/downloads/indicator.js lib/firefox/browser/chrome/browser/content/browser/downloads/indicatorOverlay.xul lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.css @@ -171,6 +189,7 @@ lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.css lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.js lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.xul +lib/firefox/browser/chrome/browser/content/browser/newtab/preloaderContent.js lib/firefox/browser/chrome/browser/content/browser/nsContextMenu.js lib/firefox/browser/chrome/browser/content/browser/openLocation.js lib/firefox/browser/chrome/browser/content/browser/openLocation.xul @@ -378,6 +397,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/computedview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/controls.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dark-theme.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-collapse.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-expand.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-pause.png @@ -408,6 +428,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/option-icon.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/orion-breakpoint.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/orion-container.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/orion-debug-location.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/orion-error.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/orion-task.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/orion.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch.png @@ -421,6 +442,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-sc lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/responsiveui-touch.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/ruleview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/scratchpad.css +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/shadereditor.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/splitview.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/styleeditor.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toggle-tools.png @@ -430,6 +452,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-inspector. lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-network.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-options.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-profiler.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-scratchpad.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-styleeditor.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/tool-webconsole.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/toolbox.css @@ -449,7 +472,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-notif 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 lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/downloads.css -lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/indicator.css lib/firefox/browser/chrome/browser/skin/classic/browser/engineManager.css lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/audioFeedIcon.png lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/audioFeedIcon16.png @@ -586,6 +608,8 @@ lib/firefox/browser/chrome/en-US/locale/browser/devtools/profiler.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/responsiveUI.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/scratchpad.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/scratchpad.properties +lib/firefox/browser/chrome/en-US/locale/browser/devtools/shadereditor.dtd +lib/firefox/browser/chrome/en-US/locale/browser/devtools/shadereditor.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/sourceeditor.dtd lib/firefox/browser/chrome/en-US/locale/browser/devtools/sourceeditor.properties lib/firefox/browser/chrome/en-US/locale/browser/devtools/styleeditor.dtd @@ -707,8 +731,11 @@ lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-pageUp.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-presentationMode.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-print.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-search.png +lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle-rtl.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-secondaryToolbarToggle.png +lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle-rtl.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-sidebarToggle.png +lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewOutline-rtl.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewOutline.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-viewThumbnail.png lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-zoomIn.png @@ -729,6 +756,7 @@ lib/firefox/browser/components/PlacesProtocolHandler.js lib/firefox/browser/components/ProfileMigrator.js lib/firefox/browser/components/WebContentConverter.js lib/firefox/browser/components/components.manifest +lib/firefox/browser/components/devtools-clhandler.js lib/firefox/browser/components/fuelApplication.js lib/firefox/browser/components/interfaces.xpt lib/firefox/browser/components/libbrowsercomps.so @@ -752,6 +780,7 @@ lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rd lib/firefox/browser/icons/mozicon128.png lib/firefox/browser/modules/AboutHome.jsm lib/firefox/browser/modules/BrowserNewTabPreloader.jsm +lib/firefox/browser/modules/BrowserUITelemetry.jsm lib/firefox/browser/modules/ContentClick.jsm lib/firefox/browser/modules/DownloadsCommon.jsm lib/firefox/browser/modules/DownloadsLogger.jsm @@ -765,6 +794,7 @@ lib/firefox/browser/modules/SignInToWebsite.jsm lib/firefox/browser/modules/SitePermissions.jsm lib/firefox/browser/modules/Social.jsm lib/firefox/browser/modules/TabCrashReporter.jsm +lib/firefox/browser/modules/UITour.jsm lib/firefox/browser/modules/devtools/AppCacheUtils.jsm lib/firefox/browser/modules/devtools/BreadcrumbsWidget.jsm lib/firefox/browser/modules/devtools/BuiltinCommands.jsm @@ -812,6 +842,7 @@ lib/firefox/browser/modules/devtools/inspector/inspector-panel.js lib/firefox/browser/modules/devtools/inspector/selection.js lib/firefox/browser/modules/devtools/inspector/selector-search.js lib/firefox/browser/modules/devtools/main.js +lib/firefox/browser/modules/devtools/markupview/html-editor.js lib/firefox/browser/modules/devtools/markupview/markup-view.js lib/firefox/browser/modules/devtools/netmonitor/netmonitor-panel.js lib/firefox/browser/modules/devtools/profiler/cleopatra.js @@ -822,14 +853,21 @@ lib/firefox/browser/modules/devtools/profiler/panel.js lib/firefox/browser/modules/devtools/profiler/sidebar.js lib/firefox/browser/modules/devtools/responsivedesign.jsm lib/firefox/browser/modules/devtools/scratchpad-manager.jsm +lib/firefox/browser/modules/devtools/scratchpad/scratchpad-panel.js +lib/firefox/browser/modules/devtools/shadereditor/panel.js lib/firefox/browser/modules/devtools/shared/autocomplete-popup.js lib/firefox/browser/modules/devtools/shared/event-emitter.js -lib/firefox/browser/modules/devtools/shared/helpers.js lib/firefox/browser/modules/devtools/shared/inplace-editor.js lib/firefox/browser/modules/devtools/shared/observable-object.js lib/firefox/browser/modules/devtools/shared/telemetry.js lib/firefox/browser/modules/devtools/shared/theme-switching.js lib/firefox/browser/modules/devtools/shared/undo.js +lib/firefox/browser/modules/devtools/shared/widgets/Tooltip.js +lib/firefox/browser/modules/devtools/sourceeditor/debugger.js +lib/firefox/browser/modules/devtools/sourceeditor/editor.js +lib/firefox/browser/modules/devtools/sourceeditor/source-editor-orion.jsm +lib/firefox/browser/modules/devtools/sourceeditor/source-editor-ui.jsm +lib/firefox/browser/modules/devtools/sourceeditor/source-editor.jsm lib/firefox/browser/modules/devtools/styleinspector/computed-view.js lib/firefox/browser/modules/devtools/styleinspector/rule-view.js lib/firefox/browser/modules/devtools/styleinspector/style-inspector.js @@ -849,18 +887,23 @@ lib/firefox/browser/modules/devtools/webconsole/webconsole.js lib/firefox/browser/modules/distribution.js lib/firefox/browser/modules/offlineAppCache.jsm lib/firefox/browser/modules/openLocationLastURL.jsm +lib/firefox/browser/modules/sessionstore/DocShellCapabilities.jsm lib/firefox/browser/modules/sessionstore/DocumentUtils.jsm +lib/firefox/browser/modules/sessionstore/Messenger.jsm +lib/firefox/browser/modules/sessionstore/PageStyle.jsm +lib/firefox/browser/modules/sessionstore/PrivacyLevel.jsm +lib/firefox/browser/modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm lib/firefox/browser/modules/sessionstore/SessionCookies.jsm +lib/firefox/browser/modules/sessionstore/SessionHistory.jsm lib/firefox/browser/modules/sessionstore/SessionMigration.jsm lib/firefox/browser/modules/sessionstore/SessionSaver.jsm lib/firefox/browser/modules/sessionstore/SessionStorage.jsm lib/firefox/browser/modules/sessionstore/SessionStore.jsm lib/firefox/browser/modules/sessionstore/SessionWorker.js +lib/firefox/browser/modules/sessionstore/TabStateCache.jsm +lib/firefox/browser/modules/sessionstore/TextAndScrollData.jsm lib/firefox/browser/modules/sessionstore/XPathGenerator.jsm lib/firefox/browser/modules/sessionstore/_SessionFile.jsm -lib/firefox/browser/modules/source-editor-orion.jsm -lib/firefox/browser/modules/source-editor-ui.jsm -lib/firefox/browser/modules/source-editor.jsm lib/firefox/browser/modules/tabview/utils.jsm lib/firefox/browser/modules/webappsUI.jsm lib/firefox/browser/modules/webrtcUI.jsm @@ -1123,6 +1166,7 @@ lib/firefox/chrome/toolkit/content/global/alerts/alert.js lib/firefox/chrome/toolkit/content/global/alerts/alert.xul lib/firefox/chrome/toolkit/content/global/appPicker.js lib/firefox/chrome/toolkit/content/global/appPicker.xul +lib/firefox/chrome/toolkit/content/global/backgroundPageThumbsContent.js lib/firefox/chrome/toolkit/content/global/bindings/autocomplete.xml lib/firefox/chrome/toolkit/content/global/bindings/browser.xml lib/firefox/chrome/toolkit/content/global/bindings/button.xml @@ -1605,12 +1649,18 @@ lib/firefox/components/ColorAnalyzer.js lib/firefox/components/ConsoleAPI.js lib/firefox/components/ContactManager.js lib/firefox/components/DataReportingService.js +lib/firefox/components/DataStoreService.js lib/firefox/components/DownloadLegacy.js lib/firefox/components/FeedProcessor.js lib/firefox/components/FormHistoryStartup.js +lib/firefox/components/HttpDataUsage.js lib/firefox/components/MozKeyboard.js lib/firefox/components/NetworkGeolocationProvider.js +lib/firefox/components/NotificationStorage.js lib/firefox/components/PageThumbsProtocol.js +lib/firefox/components/Payment.js +lib/firefox/components/PaymentFlowInfo.js +lib/firefox/components/PaymentRequestInfo.js lib/firefox/components/PermissionSettings.js lib/firefox/components/PhoneNumberService.js lib/firefox/components/PlacesCategoriesStarter.js @@ -1624,6 +1674,7 @@ lib/firefox/components/TCPSocket.js lib/firefox/components/TCPSocketParentIntermediary.js lib/firefox/components/TelemetryPing.js lib/firefox/components/Weave.js +lib/firefox/components/WebVTTParserWrapper.js lib/firefox/components/Webapps.js lib/firefox/components/addonManager.js lib/firefox/components/amContentHandler.js @@ -1670,7 +1721,6 @@ lib/firefox/components/nsUrlClassifierLib.js lib/firefox/components/nsUrlClassifierListManager.js lib/firefox/components/nsWebHandlerApp.js lib/firefox/components/recording-cmdline.js -lib/firefox/components/storage-Legacy.js lib/firefox/components/storage-mozStorage.js lib/firefox/components/txEXSLTRegExFunctions.js lib/firefox/defaults/autoconfig/platform.js @@ -1735,6 +1785,7 @@ lib/firefox/modules/AppsServiceChild.jsm lib/firefox/modules/AppsUtils.jsm lib/firefox/modules/AsyncShutdown.jsm lib/firefox/modules/AsyncSpellCheckTestHelper.jsm +lib/firefox/modules/BackgroundPageThumbs.jsm lib/firefox/modules/BookmarkHTMLUtils.jsm lib/firefox/modules/BookmarkJSONUtils.jsm lib/firefox/modules/BrowserElementParent.jsm @@ -1754,6 +1805,11 @@ lib/firefox/modules/ContentPrefService2.jsm lib/firefox/modules/ContentPrefStore.jsm lib/firefox/modules/DOMIdentity.jsm lib/firefox/modules/DOMRequestHelper.jsm +lib/firefox/modules/DataStore.jsm +lib/firefox/modules/DataStoreChangeNotifier.jsm +lib/firefox/modules/DataStoreCursor.jsm +lib/firefox/modules/DataStoreDB.jsm +lib/firefox/modules/DataStoreServiceInternal.jsm lib/firefox/modules/DeferredSave.jsm lib/firefox/modules/DeferredTask.jsm lib/firefox/modules/Deprecated.jsm @@ -1770,6 +1826,7 @@ lib/firefox/modules/DownloadUIHelper.jsm lib/firefox/modules/DownloadUtils.jsm lib/firefox/modules/Downloads.jsm lib/firefox/modules/FileUtils.jsm +lib/firefox/modules/Finder.jsm lib/firefox/modules/ForgetAboutSite.jsm lib/firefox/modules/FormHistory.jsm lib/firefox/modules/FrameWorker.jsm @@ -1786,6 +1843,8 @@ lib/firefox/modules/Keyboard.jsm lib/firefox/modules/LightweightThemeConsumer.jsm lib/firefox/modules/LightweightThemeImageOptimizer.jsm lib/firefox/modules/LightweightThemeManager.jsm +lib/firefox/modules/LoadContextInfo.jsm +lib/firefox/modules/Log.jsm lib/firefox/modules/LoginManagerContent.jsm lib/firefox/modules/MessagePortBase.jsm lib/firefox/modules/MessagePortWorker.js @@ -1794,17 +1853,20 @@ lib/firefox/modules/Microformats.js lib/firefox/modules/MozSocialAPI.jsm lib/firefox/modules/NetUtil.jsm lib/firefox/modules/NewTabUtils.jsm +lib/firefox/modules/NotificationDB.jsm lib/firefox/modules/ObjectWrapper.jsm lib/firefox/modules/OfflineCacheInstaller.jsm lib/firefox/modules/OperatorApps.jsm lib/firefox/modules/PageMenu.jsm lib/firefox/modules/PageThumbs.jsm lib/firefox/modules/PageThumbsWorker.js +lib/firefox/modules/Payment.jsm lib/firefox/modules/PerfMeasurement.jsm lib/firefox/modules/PermissionPromptHelper.jsm lib/firefox/modules/PermissionSettings.jsm lib/firefox/modules/PermissionsInstaller.jsm lib/firefox/modules/PermissionsTable.jsm +lib/firefox/modules/PermissionsUtils.jsm lib/firefox/modules/PhoneNumber.jsm lib/firefox/modules/PhoneNumberMetaData.jsm lib/firefox/modules/PhoneNumberNormalizer.jsm @@ -1823,6 +1885,7 @@ lib/firefox/modules/PushService.jsm lib/firefox/modules/RemoteAddonsChild.jsm lib/firefox/modules/RemoteAddonsParent.jsm lib/firefox/modules/RemoteController.jsm +lib/firefox/modules/RemoteFinder.jsm lib/firefox/modules/RemoteSecurityUI.jsm lib/firefox/modules/RemoteWebNavigation.jsm lib/firefox/modules/RemoteWebProgress.jsm @@ -1834,8 +1897,10 @@ lib/firefox/modules/Services.jsm lib/firefox/modules/SettingsChangeNotifier.jsm lib/firefox/modules/SettingsDB.jsm lib/firefox/modules/SettingsQueue.jsm +lib/firefox/modules/ShortcutUtils.jsm lib/firefox/modules/Sntp.jsm lib/firefox/modules/SocialService.jsm +lib/firefox/modules/SpatialNavigation.jsm lib/firefox/modules/SpellCheckDictionaryBootstrap.js lib/firefox/modules/Sqlite.jsm lib/firefox/modules/SystemMessagePermissionsChecker.jsm @@ -1846,6 +1911,7 @@ lib/firefox/modules/TelemetryTimestamps.jsm lib/firefox/modules/ThirdPartyCookieProbe.jsm lib/firefox/modules/Timer.jsm lib/firefox/modules/Troubleshoot.jsm +lib/firefox/modules/UITelemetry.jsm lib/firefox/modules/UpdateChannel.jsm lib/firefox/modules/UserAgentOverrides.jsm lib/firefox/modules/UserAgentUpdates.jsm @@ -2016,6 +2082,7 @@ lib/firefox/modules/commonjs/sdk/timers.js lib/firefox/modules/commonjs/sdk/ui.js lib/firefox/modules/commonjs/sdk/ui/button.js lib/firefox/modules/commonjs/sdk/ui/button/view.js +lib/firefox/modules/commonjs/sdk/ui/id.js lib/firefox/modules/commonjs/sdk/ui/sidebar.js lib/firefox/modules/commonjs/sdk/ui/sidebar/actions.js lib/firefox/modules/commonjs/sdk/ui/sidebar/contract.js @@ -2029,6 +2096,7 @@ lib/firefox/modules/commonjs/sdk/util/array.js lib/firefox/modules/commonjs/sdk/util/collection.js lib/firefox/modules/commonjs/sdk/util/contract.js lib/firefox/modules/commonjs/sdk/util/deprecate.js +lib/firefox/modules/commonjs/sdk/util/iteration.js lib/firefox/modules/commonjs/sdk/util/list.js lib/firefox/modules/commonjs/sdk/util/match-pattern.js lib/firefox/modules/commonjs/sdk/util/object.js @@ -2065,18 +2133,21 @@ lib/firefox/modules/devtools/Require.jsm lib/firefox/modules/devtools/Simulator.jsm lib/firefox/modules/devtools/SourceMap.jsm lib/firefox/modules/devtools/Templater.jsm +lib/firefox/modules/devtools/acorn.js +lib/firefox/modules/devtools/acorn_loose.js lib/firefox/modules/devtools/app-actor-front.js lib/firefox/modules/devtools/client/connection-manager.js +lib/firefox/modules/devtools/css-color.js lib/firefox/modules/devtools/dbg-client.jsm lib/firefox/modules/devtools/dbg-server.jsm -lib/firefox/modules/devtools/escodegen/escodegen.js -lib/firefox/modules/devtools/escodegen/estraverse.js -lib/firefox/modules/devtools/escodegen/package.json.js lib/firefox/modules/devtools/gcli.jsm +lib/firefox/modules/devtools/output-parser.js +lib/firefox/modules/devtools/pretty-fast.js lib/firefox/modules/devtools/server/actors/childtab.js lib/firefox/modules/devtools/server/actors/device.js lib/firefox/modules/devtools/server/actors/gcli.js lib/firefox/modules/devtools/server/actors/inspector.js +lib/firefox/modules/devtools/server/actors/pretty-print-worker.js lib/firefox/modules/devtools/server/actors/profiler.js lib/firefox/modules/devtools/server/actors/root.js lib/firefox/modules/devtools/server/actors/script.js @@ -2087,10 +2158,12 @@ lib/firefox/modules/devtools/server/actors/tracer.js lib/firefox/modules/devtools/server/actors/webapps.js lib/firefox/modules/devtools/server/actors/webbrowser.js lib/firefox/modules/devtools/server/actors/webconsole.js +lib/firefox/modules/devtools/server/actors/webgl.js lib/firefox/modules/devtools/server/child.js lib/firefox/modules/devtools/server/main.js lib/firefox/modules/devtools/server/protocol.js lib/firefox/modules/devtools/server/transport.js +lib/firefox/modules/devtools/source-map.js lib/firefox/modules/devtools/styleinspector/css-logic.js lib/firefox/modules/devtools/toolkit/webconsole/client.js lib/firefox/modules/devtools/toolkit/webconsole/network-helper.js @@ -2120,12 +2193,12 @@ lib/firefox/modules/osfile/osfile_unix_front.jsm lib/firefox/modules/osfile/osfile_win_allthreads.jsm lib/firefox/modules/osfile/osfile_win_back.jsm lib/firefox/modules/osfile/osfile_win_front.jsm -lib/firefox/modules/osfile/ospath_unix_back.jsm -lib/firefox/modules/osfile/ospath_win_back.jsm +lib/firefox/modules/osfile/ospath.jsm +lib/firefox/modules/osfile/ospath_unix.jsm +lib/firefox/modules/osfile/ospath_win.jsm lib/firefox/modules/reflect.jsm lib/firefox/modules/services-common/async.js lib/firefox/modules/services-common/bagheeraclient.js -lib/firefox/modules/services-common/log4moz.js lib/firefox/modules/services-common/observers.js lib/firefox/modules/services-common/rest.js lib/firefox/modules/services-common/storageservice.js @@ -2169,6 +2242,7 @@ lib/firefox/modules/services/healthreport/providers.jsm lib/firefox/modules/services/metrics/dataprovider.jsm lib/firefox/modules/services/metrics/providermanager.jsm lib/firefox/modules/services/metrics/storage.jsm +lib/firefox/modules/vtt.jsm lib/firefox/modules/workers/require.js lib/firefox/mozilla-xremote-client lib/firefox/platform.ini @@ -2222,9 +2296,12 @@ lib/firefox/run-mozilla.sh lib/firefox/webapprt-stub lib/firefox/webapprt/chrome.manifest lib/firefox/webapprt/chrome/chrome.manifest +lib/firefox/webapprt/chrome/en-US/locale/webapprt/getUserMediaDialog.dtd lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.dtd lib/firefox/webapprt/chrome/en-US/locale/webapprt/webapp.properties lib/firefox/webapprt/chrome/webapprt/content/dbg-webapp-actors.js +lib/firefox/webapprt/chrome/webapprt/content/getUserMediaDialog.js +lib/firefox/webapprt/chrome/webapprt/content/getUserMediaDialog.xul lib/firefox/webapprt/chrome/webapprt/content/mochitest-shared.js lib/firefox/webapprt/chrome/webapprt/content/mochitest.js lib/firefox/webapprt/chrome/webapprt/content/mochitest.xul @@ -2233,10 +2310,12 @@ lib/firefox/webapprt/chrome/webapprt/content/webapp.xul lib/firefox/webapprt/components/CommandLineHandler.js lib/firefox/webapprt/components/ContentPermission.js lib/firefox/webapprt/components/DirectoryProvider.js +lib/firefox/webapprt/components/PaymentUIGlue.js lib/firefox/webapprt/components/components.manifest lib/firefox/webapprt/defaults/preferences/prefs.js lib/firefox/webapprt/modules/RemoteDebugger.jsm lib/firefox/webapprt/modules/Startup.jsm +lib/firefox/webapprt/modules/WebRTCHandler.jsm lib/firefox/webapprt/modules/WebappRT.jsm lib/firefox/webapprt/modules/WebappsHandler.jsm lib/firefox/webapprt/webapprt.ini diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 654d42e0759..1fbc745b8da 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,121 +1,117 @@ -$NetBSD: distinfo,v 1.129 2014/02/08 06:47:08 obache Exp $ +$NetBSD: distinfo,v 1.130 2014/02/08 09:36:00 ryoon Exp $ +<<<<<<< distinfo +SHA1 (firefox-27.0.source.tar.bz2) = ec2031385237e30be829817ac79caa8e80cc2a14 +RMD160 (firefox-27.0.source.tar.bz2) = d1c1381cbb243239804481e2891d80f0aa3131c2 +Size (firefox-27.0.source.tar.bz2) = 129222806 bytes +======= SHA1 (firefox-26.0.source.tar.bz2) = f7c6642d6f62aea8d4eced48dd27aba0634edcd5 RMD160 (firefox-26.0.source.tar.bz2) = cb791da22377519db44164bedd64254dc839e2b8 Size (firefox-26.0.source.tar.bz2) = 127526380 bytes -SHA1 (patch-aa) = e510bfad9f4d2950e5751d2a8d15971dcad75fb0 -SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be -SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2 -SHA1 (patch-ao) = 3c777c8caf7f951a711c79612c08cee2cd338a57 -SHA1 (patch-as) = 62be47c27d74dedf70f048b3ac3ce99a2b4f7b3c -SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 -SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 -SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 -SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3 -SHA1 (patch-browser_installer_package-manifest.in) = a00ac3c6ddedd316c7350ad9867a1a68cce974e1 -SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 284d62596718d7f372c4e5214fd05adec043c93a -SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 69eca52185ac868e95041b5d87611ee32c2b6330 -SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = a6677b3a195b6c956858326e4e7474441823a47f -SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7 -SHA1 (patch-config_baseconfig.mk) = 9056301a239b7a927ee06a8f53702aece9780dc4 -SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 -SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b -SHA1 (patch-config_system-headers) = b091819a932f86a19f98ea71787447c9899138c6 -SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 -SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 -SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e -SHA1 (patch-extensions_auth_nsAuthGSSAPI.cpp) = 548886fc4a86a988f3f91650061ddc04f37653a8 -SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 1f841becb14483909e05f179f4dce53a7d5b1bd1 -SHA1 (patch-gfx__skia__include__core__SkPreConfig.h) = 6f99cf0eb5d4617d529c378707f537bc1e5cb28f -SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce -SHA1 (patch-gfx_layers_BufferUnrotate.cpp) = 18e2c864ac8510034f4a2ff47395f2119a69288c -SHA1 (patch-gfx_skia_moz.build) = 72a4c39ce367ed25cbfef17283e87db10142163e -SHA1 (patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp) = 916d61bd9613df0fe2b6cfd0d6b1e49ffc40da5f -SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574 -SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee -SHA1 (patch-ipc_chromium_Makefile.in) = 61ada3484c1ec0c07ee537aa7dd32e2c8411c10f -SHA1 (patch-ipc_chromium_chromium-config.mk) = 6eab1cb974a5a8550e9ea8f9290a9cec8e2aa133 -SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 7bc83577a9678542db4dff7dda19d751ff6d78c1 -SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 677f0b5ccdcde7a8551f2d07d2a472361a5da03f -SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9d6d074b1692c6b4e722bfac8d67c66040a6fa76 -SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 43645104f62ecd6e1aa4b17078d6719e5eda8896 -SHA1 (patch-ipc_chromium_src_base_file__version__info.h) = 4096226b2586863a4106bfb5cfadd95bffb9d717 -SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 12f3e063cf3fef23f0e3e0fdba5d5a4c1fc32af3 -SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97 -SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = e386bfd56ae6f77ef1aaadd0fa81af147a09f75d -SHA1 (patch-ipc_chromium_src_base_process__util.h) = 31b592d69d3c4f63642dae3c81c771ee3dfa8502 -SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 6b2611cc902f17e726aabcf4fb5fff2c71852408 -SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 30646e3cd2d010a75e2a385cfa1f1f57eb74fac2 -SHA1 (patch-ipc_chromium_src_base_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_AsyncChannel.cpp) = 0185791ada8e903943bcd245376486315b1c6515 -SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = fe9ac2d0af8dd4757c93f50e6f74a31697f7e23c -SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905 -SHA1 (patch-js__src__vm__SPSProfiler.cpp) = ac6da8a477cd0a768a513462b7bc3b871fd280f1 -SHA1 (patch-js_src_Makefile.in) = 2a3a52ec33b37b9df2047bfb35537689cca3ebb2 -SHA1 (patch-js_src_config_system-headers) = 405921c2638f6bf37f33b7d6b162addbfb162dea -SHA1 (patch-js_src_ctypes_CTypes.h) = a168d70707b0d09b6ff52141b5ceebf69caa1f90 -SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc -SHA1 (patch-js_src_jit_AsmJSSignalHandlers.cpp) = ff58ca55fe39aef1310a72490472e522aae77956 -SHA1 (patch-js_src_jscompartment.h) = 33708bc67f1c05f776dbb9c048ddf91f0eea25ca -SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 -SHA1 (patch-mb) = 24daa34185852f4f865bcd42041fc1cb693d9fe7 -SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 5ef0de0ac875334e959ff0d4bfa43a2e5ab087b9 -SHA1 (patch-media_libpng_pngpriv.h) = 945ef0be0ac2ddbb0153376add1231f2a63b5699 -SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = 061b46d1ee33c055a5b39e6b20f47b80bcde0c86 -SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = 056172e54652caa60b6fee26e3073a6da83e734c -SHA1 (patch-media_webrtc_signaling_signaling.gyp) = ed52bb96a7ba6d7126b09871fe5ac81983cefdc1 -SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 7b05fe304cde8adbaa46ff8960978f96848541b6 -SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = ac7250e37f30353af0a7789b7234f3bc56a3ecd7 -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = a7dd28746ea1c839e03c00f40985d73dd89dfd72 -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 076cf414a1a2ee270105a043517bbbb341382f49 -SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 4721f01a89ef353c9b743b3cfefda4877d5283d9 -SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_clock.cc) = e170bbb619f90d91781075a5cbdd098de2bed4da -SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = f5af60a298e9e22499f3c743b3e140dbf4a83951 -SHA1 (patch-memory_mozalloc_fallible.h) = 8a60151465a07570db9636313f504004d73941d5 -SHA1 (patch-memory_mozalloc_mozalloc.cpp) = 802af1da05f60fcf8c206568c2adc396e3bb0e06 -SHA1 (patch-memory_mozalloc_mozalloc.h) = f2d9fd333ec28c075dfde8a6ee414b67b7f2cd26 -SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9d9036ddd28c7b8ce37860e0120df2997a3a0c59 -SHA1 (patch-mfbt_Poison.cpp) = b582943c02f57835451c9eecd004c9912d42ce84 -SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a -SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 31d49db31b1e130f1b455f883e5b7c606d438771 -SHA1 (patch-netwerk_sctp_src_netinet_sctp__os__userspace.h) = b3f94ac0f2bd652371fef22c642b14bf30162998 -SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = 421b6e071a9934567ccba337033a42208e6e4bd5 -SHA1 (patch-netwerk_sctp_src_user__recv__thread.c) = cf26945441f74c581aeb5a8d7435780f4a48a607 -SHA1 (patch-netwerk_sctp_src_user__socket.c) = c0b32ed2888b5845ce2b7646b85af8f0728bc7c3 -SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 1b6e2864916ced693b1ab6c1bbdd80a4ffc4f7e4 -SHA1 (patch-netwerk_wifi_moz.build) = 5a3e62b0a837f083a3ddae34c78fff9eadc1ea13 -SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 9c343bef282192e1ac4b0742f160137d394c21b6 -SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4 -SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a -SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 -SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3 -SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452 -SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = de61b5ceaaea270bd298582c648704f4e68bebff -SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = b05a21e1ecad8de6cd8057d2a3ee76167293cde2 -SHA1 (patch-toolkit_library_Makefile.in) = ae402e135d77aa3431cfe25d5f4f5fe39ff803c1 -SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa -SHA1 (patch-toolkit_toolkit.mozbuild) = 0993d50cc02c2b421e6de087dfb0a9cb30562c6b -SHA1 (patch-toolkit_xre_Makefile.in) = 6ad65fa2fd026888cc8345e184daf2a070ea4885 -SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 -SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa -SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9 -SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f -SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf -SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488 -SHA1 (patch-xj) = c373bb0135ef042d07c98e648dce1612a0b47efe -SHA1 (patch-xl) = cecb5dd24d35e468197f14d895693f5b2391d98d -SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657 -SHA1 (patch-xn) = c042e39d93706934ec03c78be3dc6e224ac62c0e -SHA1 (patch-xo) = aae6107dcfaf731bd3e9962d953fb8701fc5f163 -SHA1 (patch-xpcom_base_nsMemoryInfoDumper.cpp) = 245508dc7ad64eb1dc514caf6e85904d440742ca -SHA1 (patch-xpcom_base_nsMemoryReporterManager.cpp) = 5d5db3251ebaec748c293ea342da89b8ba036ae3 -SHA1 (patch-xpcom_base_nsStackWalk.cpp) = b763f5f3505efbedf51a9544a03d0501d86138b1 -SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30 -SHA1 (patch-xpcom_ds_moz.build) = a8c3726f5f5e700b92b5ac0950d2ef09ea9f7612 -SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_moz.build) = f3ca91e095866843989be25224ec6974dcd06674 -SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cd42915cd32756b55894a773a1e6d7c012b4467 -SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp) = e9e336817c172187f3e15ddf539a8a2176e3e952 -SHA1 (patch-xpcom_string_public_nsAlgorithm.h) = 6cdce480510f0cebbb1271de385b6ec7f5c3ddee -SHA1 (patch-xulrunner_installer_Makefile.in) = 9d32ff87d0962c0406ed38de995c0350dd372e49 +>>>>>>> 1.129 +SHA1 (patch-aa) = 1013e198fc5bb157a88589625addc7256177d914 +SHA1 (patch-ak) = 6e1788b8d233d11495482af37798cc29ff3f6598 +SHA1 (patch-al) = 917ae8caae707e7d6cb41f593367aba8d6004850 +SHA1 (patch-ao) = e1086eca14e209a1fcc48aeb91b779c9c50c2875 +SHA1 (patch-as) = 766991fca5f2f76524504786f2ea00b29cc207ba +SHA1 (patch-bf) = b2130bac22e0dca2eb6f252cc1649d548ffa02d2 +SHA1 (patch-bg) = eb5c2162a902ccc788fb2e0293e1c5aa93f3e923 +SHA1 (patch-bi) = 9ba4d545c27682eeba8aeaf7891baedccbd9173d +SHA1 (patch-browser_app_profile_firefox.js) = 972f5bdcc4559ab86fd3308d86e11b8a5b6653d9 +SHA1 (patch-browser_installer_package-manifest.in) = 6c494bb89b60d8be4b60e7f80efd14b532adc34a +SHA1 (patch-browser_locales_en-US_chrome_browser-region_region.properties) = 8725955406abcce8a75fc9f64fdc101a692b4da7 +SHA1 (patch-browser_locales_en-US_searchplugins_duckduckgo.xml) = 39e5a2ce5b4d1b18985897b5a34bf0da893eed84 +SHA1 (patch-browser_locales_en-US_searchplugins_list.txt) = 6af544b8f39db1901ff466003db37ef41adcab07 +SHA1 (patch-build_autoconf_nss.m4) = d065d2b6d262622951cf9257d944844aa97eb81e +SHA1 (patch-config_baseconfig.mk) = 2dd72f99deaf10d9a93ec9dbfb202764634389c6 +SHA1 (patch-config_stl__wrappers_ios) = c7431c6de46d3272c41bc59a2d3a454e5fab0730 +SHA1 (patch-config_stl__wrappers_ostream) = 9296835556481cb7932dcbec0bd3d24e9a7f692f +SHA1 (patch-config_system-headers) = 2f5fe99344db06d01fadd20d58f1a6d2150646dc +SHA1 (patch-config_system__wrappers_unwind.h) = 6810f59435b2de2a44751c570defaf863f956137 +SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = d6b19868a5b1362a55a4bbba9f545464cb287d89 +SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 9c06406f630ed57bef48002ff68bb803d7f8b856 +SHA1 (patch-extensions_auth_nsAuthGSSAPI.cpp) = 3f6074b9f9789ee2e76d9ffe52cb1347203424d4 +SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 66f7272ccb3c29f8a0971adb7f49fbabdaf1c289 +SHA1 (patch-gfx__skia__include__core__SkPreConfig.h) = 0fe4a7b4893adc00474be3facfb4c026a68bf64d +SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 7d9c7fc4e0a20b386ade1c130bcb468108f8154f +SHA1 (patch-gfx_skia_moz.build) = 2bc13eb9fa905a1e774f3966f52c058623386ece +SHA1 (patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp) = 4031f00a06d024073dd0c960ffaa478693d47f0e +SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 3730f5f901c7cb29536ccad567e6c9029921e45b +SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = f9dc73a025cc09c2fd29a6444606da3951796ddb +SHA1 (patch-ipc_chromium_Makefile.in) = c3875dbf482d2b49f8b8a8c2c359dfd5535b14b6 +SHA1 (patch-ipc_chromium_src_base_base__paths.h) = a9d55bc93bacea5d07a6a3299c0d3ff9fde55b27 +SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = d457316bd91f700d81350102ca39caaa6fc247e7 +SHA1 (patch-ipc_chromium_src_base_file__util.h) = d956080e33880ce31afe51cfafde8a3440b689a8 +SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 87e2ee8d1b1617ac2a209a2249bf21c23015a344 +SHA1 (patch-ipc_chromium_src_base_file__version__info.h) = 3f9ea30b46f0565dd3c85c60c1d9a3b5ed553ea5 +SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = ed3b03aba66569c5714630b9956c2b211aae7ecc +SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 80da2a74b43696e581c4349fc5496718a4a8a3de +SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 507153c823895a043c7008884c871b013383efb8 +SHA1 (patch-ipc_chromium_src_base_process__util.h) = c34259b96ef5d7ca7a3ae763e0e1c47e363fe0ff +SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = d3116f948cc101c1c76fb379085a21f327fb446c +SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 3c95ed4973935b31869848379b02b3e1134a502c +SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 9cb35319d61f42b57ffa47c64e680902f4fca99b +SHA1 (patch-ipc_chromium_src_build_build__config.h) = 4baa336631554a452435a5d0d9b0888761e480fb +SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 8a01a95d7bf4be7446090a34b876d47ede662add +SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 192e45027ef585fae7665f8465632442b703cd2b +SHA1 (patch-ipc_ipdl_ipdl_lower.py) = aaa6d07850f36ce0486ace1445bb4dd2c7f06945 +SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 2df4d4c6287311c6598d0c997fed9ad380f1a15c +SHA1 (patch-js_src_Makefile.in) = 863a25e77839458c21bdc2a21009298bf2b0bd33 +SHA1 (patch-js_src_config_system-headers) = c760d5d85b0e3e53d5c546df3c4dad0806acc935 +SHA1 (patch-js_src_ctypes_CTypes.h) = 1bf5a3dc54aa56cbed0b065ad8d1c6a0a51a5052 +SHA1 (patch-js_src_frontend_ParseMaps.cpp) = aa5055c76854c3eae57b92fe863e220e9bacf0c9 +SHA1 (patch-js_src_jsmath.cpp) = 6a84b4506a92c213dd4a8c8ff6defe27bfd9814c +SHA1 (patch-mb) = 462079cdfa3e1aff0c8de61198fa7ba2500539de +SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = d1de9c5cbc289628de2434f8ef7ec66e760de10a +SHA1 (patch-media_libpng_pngpriv.h) = 6d1f1458abe91e496cae680dd6532354f272644a +SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = bbeec11e48946b2fa5291020a82f2137059e15bf +SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = 1df21bff73ec05d411588d9b1fd644bf3fdc5cf2 +SHA1 (patch-media_webrtc_signaling_signaling.gyp) = efe152f2f0575d544c6ccc3a02f2cda0f2daf364 +SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 525d45d19b5db6d0b21ce16f37dfe8f11533af78 +SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 993778b9ac8e460bf0d0907738cc3efe0b326bea +SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = eb8e73c10648ac8cfc5dfb3885bbfac54f4906c9 +SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = e840d9f2ca9c2a6d9aeb7ddb8496a029c077ed9f +SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 20a1e61d24d9bee225b3f6012474f3d8b57bfa37 +SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 932d8f9e388b096735989a9ed1f3744081678eb5 +SHA1 (patch-memory_mozalloc_fallible.h) = 3d998486f31f3679f03bfc0ca1331c0246dc759c +SHA1 (patch-memory_mozalloc_mozalloc.cpp) = be2ff0c6f52ecf75fe9eff09ffab5f1cf7a85a60 +SHA1 (patch-memory_mozalloc_mozalloc.h) = e3e439a5edc4f9d7b728d044ab3d16add7108be1 +SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 5c337ab2a9d7320cd8a4c7271e40291a583fcb69 +SHA1 (patch-mfbt_Poison.cpp) = 272650a4d02d5abe2d3dafa974718ab6003e7622 +SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 5ab009fa96ca6cec202b3a32dbefe3a737f49b60 +SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 84fbbb26453ad7195cfb5dc696eb7e64c2dec152 +SHA1 (patch-netwerk_sctp_src_netinet_sctp__os__userspace.h) = a0b4fdef9092b5fac0f0564070138c602a45197c +SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = e3bc540163470284be293550617886a78e0ba624 +SHA1 (patch-netwerk_sctp_src_user__recv__thread.c) = 65c5f0ad3f92c8e2c3644c52e21bcede15812047 +SHA1 (patch-netwerk_sctp_src_user__socket.c) = 57c0e901c9ac5ff2c9851b6819e0fc91185b04b6 +SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 507d63ea68de1c6b5f60315e669d7281d385a68f +SHA1 (patch-netwerk_wifi_moz.build) = 42e9ca51448f4935e225fd6025bf745f5efcc324 +SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = e2a7a8bc4860beca92ba7325059f4bc8a500c0c0 +SHA1 (patch-pb) = 25f89414ae252ddd399683175aa9c3506335438e +SHA1 (patch-pc) = 27280322c0271bb457a7808816a56cdfd6b991d0 +SHA1 (patch-rc) = 92a126b1ab5b5950c1e833d0c4f05896b9bf6657 +SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = c50c630cf47de95d6edae7e76f9937d4eeea8a75 +SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 9671f9d37f0a19f73c9345d996a0284d32184b44 +SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 11d19a0f784c2efefe45f3b5fe9d36e109efb6d2 +SHA1 (patch-toolkit_library_Makefile.in) = 9bdaec7133f156347f05d27e18615fb460d0ccb7 +SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = faa97d93472d00dec64cac8f5f6619f300d533dc +SHA1 (patch-toolkit_toolkit.mozbuild) = 7e6ddf5cc04d8f4f0252a7b8bb2bf66ee5a9a0db +SHA1 (patch-toolkit_xre_Makefile.in) = f207d47052b66c197d90ba67e87b98327d7c08a9 +SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 3025664022e0edd3cc906f468538c9e5f74af77b +SHA1 (patch-xb) = fe9ad3db66ffd8b7a9fbd4e971a6dbafa8891cb1 +SHA1 (patch-xc) = 0882cc2dd14eef188d2caf9939af43a516e8be1f +SHA1 (patch-xe) = a0b059ebed4dd74d9eb34ea637e9aa1bf6240a36 +SHA1 (patch-xf) = 5add1b91e8692a031a155a9df9a4d88fcb6b8f2c +SHA1 (patch-xg) = c201c57872809c2723667b8cfe9f89e149e91bea +SHA1 (patch-xl) = c95b054d802093bf25c1b5be552e83a687630e1a +SHA1 (patch-xm) = 244c009f9596d2f5b0828802e8e556f1258e2b92 +SHA1 (patch-xn) = cb7ce87f2583bc1196d7fa06d82f1838ce26d7b5 +SHA1 (patch-xo) = 9ef7d4037f74918a9c460c45a6079661b96bc05c +SHA1 (patch-xpcom_base_nsMemoryInfoDumper.cpp) = 8716e7a6106184b8143ea9f6bb0be50c72784219 +SHA1 (patch-xpcom_base_nsMemoryReporterManager.cpp) = f829291fa20ca613edc0aad0d75c165c6bf96f25 +SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 55f6aa9958902ea775a12af8340bbfb89d9d181f +SHA1 (patch-xpcom_ds_TimeStamp.h) = 9863f9ae606609997d6f670ec021948a00898525 +SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_moz.build) = bb3e8b4307a34f7aa48dc3252de0e60e6abe27a1 +SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 057295b5470edfc13964c19b96679867c9162bb1 +SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp) = 35d4d9b71841675d1a597a95bf411aaab376adf4 +SHA1 (patch-xulrunner_installer_Makefile.in) = 82436e0e4e9b42b7a06db40c51718e8978ae3b57 diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index 2ae2ca530c9..28f3cdfc3e0 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-aa,v 1.19 2014/02/08 09:36:00 ryoon Exp $ ---- configure.in.orig 2013-12-05 16:07:23.000000000 +0000 +--- configure.in.orig 2014-01-28 04:03:35.000000000 +0000 +++ configure.in -@@ -2752,6 +2752,7 @@ EOF +@@ -2609,6 +2609,7 @@ EOF #pragma GCC visibility push(hidden) #pragma GCC visibility push(default) #include <string.h> @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ #pragma GCC visibility pop __attribute__ ((visibility ("default"))) void Func() { -@@ -2760,7 +2761,7 @@ __attribute__ ((visibility ("default"))) +@@ -2617,7 +2618,7 @@ __attribute__ ((visibility ("default"))) } EOF ac_cv_have_visibility_builtin_bug=no @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ ac_cv_have_visibility_builtin_bug=yes else if test `grep -c "@PLT" conftest.S` = 0; then -@@ -3216,14 +3217,22 @@ fi +@@ -3073,14 +3074,22 @@ fi AC_CACHE_CHECK( [for res_ninit()], ac_cv_func_res_ninit, @@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ [ac_cv_func_res_ninit=no]) ]) -@@ -3874,6 +3883,14 @@ if test -n "$YASM"; then +@@ -3712,6 +3721,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3901,11 +3918,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -3739,11 +3756,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -4062,6 +4075,22 @@ fi +@@ -3900,6 +3913,22 @@ fi AC_SUBST(MOZ_NATIVE_ICU) dnl ======================================================== @@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ dnl Java SDK support dnl ======================================================== -@@ -5281,6 +5310,12 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5117,6 +5146,12 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VP8_ENCODER=1 MOZ_VP8_ERROR_CONCEALMENT=1 @@ -109,7 +109,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5307,15 +5342,18 @@ AC_SUBST(MOZ_SRTP) +@@ -5139,15 +5174,18 @@ AC_SUBST(MOZ_SRTP) dnl Use integers over floats for audio on B2G and Android, because audio dnl backends for those platforms don't support floats. @@ -131,7 +131,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ dnl ======================================================== dnl = Disable Speech API code -@@ -8276,7 +8314,7 @@ case "$OS_TARGET" in +@@ -8112,7 +8150,7 @@ case "$OS_TARGET" in NECKO_WIFI=1 fi ;; @@ -140,7 +140,7 @@ $NetBSD: patch-aa,v 1.18 2013/12/15 13:54:37 ryoon Exp $ NECKO_WIFI=1 ;; Linux) -@@ -9005,6 +9043,14 @@ if test -n "$INTEL_ARCHITECTURE"; then +@@ -8853,6 +8891,14 @@ if test -n "$INTEL_ARCHITECTURE"; then fi fi diff --git a/www/firefox/patches/patch-ak b/www/firefox/patches/patch-ak index 6695a3d594f..3e2a629241c 100644 --- a/www/firefox/patches/patch-ak +++ b/www/firefox/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.9 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-ak,v 1.10 2014/02/08 09:36:00 ryoon Exp $ ---- js/src/ctypes/libffi/configure.orig 2013-01-04 23:44:34.000000000 +0000 +--- js/src/ctypes/libffi/configure.orig 2014-01-28 04:03:45.000000000 +0000 +++ js/src/ctypes/libffi/configure @@ -11278,7 +11278,7 @@ case "$host" in powerpc-*-aix* | rs6000-*-aix*) diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al index d5c3a93dc04..3b976a05ffb 100644 --- a/www/firefox/patches/patch-al +++ b/www/firefox/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.9 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-al,v 1.10 2014/02/08 09:36:00 ryoon Exp $ ---- storage/src/mozStorageConnection.cpp.orig 2013-01-04 23:44:44.000000000 +0000 +--- storage/src/mozStorageConnection.cpp.orig 2014-01-28 04:04:04.000000000 +0000 +++ storage/src/mozStorageConnection.cpp -@@ -584,6 +584,11 @@ Connection::initialize(nsIFile *aDatabas +@@ -694,6 +694,11 @@ Connection::initializeInternal(nsIFile* break; } diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao index 21e7af6cbdf..2f3af47df79 100644 --- a/www/firefox/patches/patch-ao +++ b/www/firefox/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.10 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-ao,v 1.11 2014/02/08 09:36:00 ryoon Exp $ ---- toolkit/mozapps/installer/packager.mk.orig 2013-10-25 22:27:43.000000000 +0000 +--- toolkit/mozapps/installer/packager.mk.orig 2014-01-28 04:04:06.000000000 +0000 +++ toolkit/mozapps/installer/packager.mk -@@ -680,9 +680,9 @@ endif +@@ -725,9 +725,9 @@ endif (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ (cd $(DESTDIR)$(installdir) && tar -xf -) $(NSINSTALL) -D $(DESTDIR)$(bindir) diff --git a/www/firefox/patches/patch-as b/www/firefox/patches/patch-as index a7392d09a80..dc6354b17f1 100644 --- a/www/firefox/patches/patch-as +++ b/www/firefox/patches/patch-as @@ -1,10 +1,10 @@ -$NetBSD: patch-as,v 1.6 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-as,v 1.7 2014/02/08 09:36:00 ryoon Exp $ Treat DragonFly like FreeBSD. ---- js/src/configure.in.orig 2013-12-05 16:07:35.000000000 +0000 +--- js/src/configure.in.orig 2014-01-28 04:03:45.000000000 +0000 +++ js/src/configure.in -@@ -2290,6 +2290,7 @@ EOF +@@ -2229,6 +2229,7 @@ EOF #pragma GCC visibility push(hidden) #pragma GCC visibility push(default) #include <string.h> @@ -12,7 +12,7 @@ Treat DragonFly like FreeBSD. #pragma GCC visibility pop __attribute__ ((visibility ("default"))) void Func() { -@@ -2298,7 +2299,7 @@ __attribute__ ((visibility ("default"))) +@@ -2237,7 +2238,7 @@ __attribute__ ((visibility ("default"))) } EOF ac_cv_have_visibility_builtin_bug=no @@ -21,7 +21,7 @@ Treat DragonFly like FreeBSD. ac_cv_have_visibility_builtin_bug=yes else if test `grep -c "@PLT" conftest.S` = 0; then -@@ -2515,7 +2516,7 @@ then +@@ -2454,7 +2455,7 @@ then fi case "$target" in @@ -30,7 +30,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lpthread, so don't specify it explicitly. -@@ -2600,14 +2601,22 @@ fi +@@ -2540,14 +2541,22 @@ fi AC_CACHE_CHECK( [for res_ninit()], ac_cv_func_res_ninit, @@ -56,7 +56,7 @@ Treat DragonFly like FreeBSD. [ac_cv_func_res_ninit=no]) ]) -@@ -3316,7 +3325,7 @@ if test "$MOZ_MEMORY"; then +@@ -3215,7 +3224,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; @@ -65,7 +65,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) -@@ -4339,6 +4348,16 @@ fi +@@ -4258,6 +4267,16 @@ fi dnl ======================================================== dnl JavaScript shell dnl ======================================================== diff --git a/www/firefox/patches/patch-bf b/www/firefox/patches/patch-bf index 700b7b2a50e..a049655265c 100644 --- a/www/firefox/patches/patch-bf +++ b/www/firefox/patches/patch-bf @@ -1,6 +1,6 @@ -$NetBSD: patch-bf,v 1.2 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-bf,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- js/src/jsnativestack.cpp.orig 2013-09-10 03:43:36.000000000 +0000 +--- js/src/jsnativestack.cpp.orig 2014-01-28 04:03:46.000000000 +0000 +++ js/src/jsnativestack.cpp @@ -114,7 +114,7 @@ js::GetNativeStackBaseImpl() pthread_attr_init(&sattr); diff --git a/www/firefox/patches/patch-bg b/www/firefox/patches/patch-bg index ff17c0d728a..b7b31a25f1e 100644 --- a/www/firefox/patches/patch-bg +++ b/www/firefox/patches/patch-bg @@ -1,6 +1,6 @@ -$NetBSD: patch-bg,v 1.2 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-bg,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- storage/src/SQLiteMutex.h.orig 2013-10-25 22:27:40.000000000 +0000 +--- storage/src/SQLiteMutex.h.orig 2014-01-28 04:04:04.000000000 +0000 +++ storage/src/SQLiteMutex.h @@ -108,15 +108,19 @@ public: void assertCurrentThreadOwns() diff --git a/www/firefox/patches/patch-bi b/www/firefox/patches/patch-bi index 244fefe5c18..94433f6443b 100644 --- a/www/firefox/patches/patch-bi +++ b/www/firefox/patches/patch-bi @@ -1,6 +1,6 @@ -$NetBSD: patch-bi,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-bi,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- gfx/angle/src/compiler/osinclude.h.orig 2013-01-04 23:44:32.000000000 +0000 +--- gfx/angle/src/compiler/osinclude.h.orig 2014-01-28 04:03:41.000000000 +0000 +++ gfx/angle/src/compiler/osinclude.h @@ -16,6 +16,7 @@ #define ANGLE_OS_WIN diff --git a/www/firefox/patches/patch-browser_app_profile_firefox.js b/www/firefox/patches/patch-browser_app_profile_firefox.js index d97001544b3..247902b9e6d 100644 --- a/www/firefox/patches/patch-browser_app_profile_firefox.js +++ b/www/firefox/patches/patch-browser_app_profile_firefox.js @@ -1,8 +1,8 @@ -$NetBSD: patch-browser_app_profile_firefox.js,v 1.1 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-browser_app_profile_firefox.js,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- browser/app/profile/firefox.js.orig 2013-09-10 03:43:20.000000000 +0000 +--- browser/app/profile/firefox.js.orig 2014-01-28 04:03:33.000000000 +0000 +++ browser/app/profile/firefox.js -@@ -354,6 +354,7 @@ pref("browser.search.log", false); +@@ -393,6 +393,7 @@ pref("browser.search.log", false); pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); diff --git a/www/firefox/patches/patch-browser_installer_package-manifest.in b/www/firefox/patches/patch-browser_installer_package-manifest.in index b917e26a618..c8f9252bb18 100644 --- a/www/firefox/patches/patch-browser_installer_package-manifest.in +++ b/www/firefox/patches/patch-browser_installer_package-manifest.in @@ -1,10 +1,10 @@ -$NetBSD: patch-browser_installer_package-manifest.in,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-browser_installer_package-manifest.in,v 1.2 2014/02/08 09:36:00 ryoon Exp $ Limit SPARC bits to just SPARC (untested, but fixes x86). ---- browser/installer/package-manifest.in.orig 2013-06-18 11:01:12.000000000 +0000 +--- browser/installer/package-manifest.in.orig 2014-01-28 04:03:34.000000000 +0000 +++ browser/installer/package-manifest.in -@@ -690,7 +690,7 @@ +@@ -702,7 +702,7 @@ @BINPATH@/components/pippki.xpt ; for Solaris SPARC diff --git a/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties b/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties index f27a7cca15e..7ebd84b3b5a 100644 --- a/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties +++ b/www/firefox/patches/patch-browser_locales_en-US_chrome_browser-region_region.properties @@ -1,6 +1,6 @@ -$NetBSD: patch-browser_locales_en-US_chrome_browser-region_region.properties,v 1.1 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-browser_locales_en-US_chrome_browser-region_region.properties,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- browser/locales/en-US/chrome/browser-region/region.properties.orig 2013-09-10 03:43:22.000000000 +0000 +--- browser/locales/en-US/chrome/browser-region/region.properties.orig 2014-01-28 04:03:34.000000000 +0000 +++ browser/locales/en-US/chrome/browser-region/region.properties @@ -9,6 +9,7 @@ browser.search.defaultenginename=Google browser.search.order.1=Google diff --git a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml b/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml index 6715d630595..c7a72f8d5d3 100644 --- a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml +++ b/www/firefox/patches/patch-browser_locales_en-US_searchplugins_duckduckgo.xml @@ -1,6 +1,6 @@ -$NetBSD: patch-browser_locales_en-US_searchplugins_duckduckgo.xml,v 1.1 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-browser_locales_en-US_searchplugins_duckduckgo.xml,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- browser/locales/en-US/searchplugins/duckduckgo.xml.orig 2013-09-14 15:17:46.000000000 +0000 +--- browser/locales/en-US/searchplugins/duckduckgo.xml.orig 2014-02-08 06:57:27.000000000 +0000 +++ browser/locales/en-US/searchplugins/duckduckgo.xml @@ -0,0 +1,11 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> diff --git a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt b/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt index debcccc95cd..c9dc55bdba2 100644 --- a/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt +++ b/www/firefox/patches/patch-browser_locales_en-US_searchplugins_list.txt @@ -1,6 +1,6 @@ -$NetBSD: patch-browser_locales_en-US_searchplugins_list.txt,v 1.1 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-browser_locales_en-US_searchplugins_list.txt,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- browser/locales/en-US/searchplugins/list.txt.orig 2013-09-10 03:43:22.000000000 +0000 +--- browser/locales/en-US/searchplugins/list.txt.orig 2014-01-28 04:03:34.000000000 +0000 +++ browser/locales/en-US/searchplugins/list.txt @@ -1,5 +1,6 @@ amazondotcom diff --git a/www/firefox/patches/patch-build_autoconf_nss.m4 b/www/firefox/patches/patch-build_autoconf_nss.m4 index e078e28a8f7..d4d69b505c6 100644 --- a/www/firefox/patches/patch-build_autoconf_nss.m4 +++ b/www/firefox/patches/patch-build_autoconf_nss.m4 @@ -1,6 +1,6 @@ -$NetBSD: patch-build_autoconf_nss.m4,v 1.2 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-build_autoconf_nss.m4,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- build/autoconf/nss.m4.orig 2013-10-25 22:27:10.000000000 +0000 +--- build/autoconf/nss.m4.orig 2014-01-28 04:03:34.000000000 +0000 +++ build/autoconf/nss.m4 @@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix, if test -n "$nss_config_exec_prefix"; then diff --git a/www/firefox/patches/patch-config_baseconfig.mk b/www/firefox/patches/patch-config_baseconfig.mk index 123dcb2f71c..e8c34fe280b 100644 --- a/www/firefox/patches/patch-config_baseconfig.mk +++ b/www/firefox/patches/patch-config_baseconfig.mk @@ -1,6 +1,6 @@ -$NetBSD: patch-config_baseconfig.mk,v 1.3 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-config_baseconfig.mk,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- config/baseconfig.mk.orig 2013-12-05 16:07:23.000000000 +0000 +--- config/baseconfig.mk.orig 2014-01-28 04:03:35.000000000 +0000 +++ config/baseconfig.mk @@ -1,7 +1,7 @@ -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) diff --git a/www/firefox/patches/patch-config_stl__wrappers_ios b/www/firefox/patches/patch-config_stl__wrappers_ios index 546c0ea1e73..45036066942 100644 --- a/www/firefox/patches/patch-config_stl__wrappers_ios +++ b/www/firefox/patches/patch-config_stl__wrappers_ios @@ -1,6 +1,6 @@ -$NetBSD: patch-config_stl__wrappers_ios,v 1.3 2013/06/27 15:52:51 joerg Exp $ +$NetBSD: patch-config_stl__wrappers_ios,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- config/stl_wrappers/ios.orig 2013-05-13 18:23:07.000000000 +0000 +--- config/stl_wrappers/ios.orig 2014-02-08 06:57:27.000000000 +0000 +++ config/stl_wrappers/ios @@ -0,0 +1,3 @@ +#pragma GCC visibility push(default) diff --git a/www/firefox/patches/patch-config_stl__wrappers_ostream b/www/firefox/patches/patch-config_stl__wrappers_ostream index e102961b889..6c844b23133 100644 --- a/www/firefox/patches/patch-config_stl__wrappers_ostream +++ b/www/firefox/patches/patch-config_stl__wrappers_ostream @@ -1,6 +1,6 @@ -$NetBSD: patch-config_stl__wrappers_ostream,v 1.3 2013/06/27 15:52:51 joerg Exp $ +$NetBSD: patch-config_stl__wrappers_ostream,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- config/stl_wrappers/ostream.orig 2013-05-13 18:22:40.000000000 +0000 +--- config/stl_wrappers/ostream.orig 2014-02-08 06:57:27.000000000 +0000 +++ config/stl_wrappers/ostream @@ -0,0 +1,3 @@ +#pragma GCC visibility push(default) diff --git a/www/firefox/patches/patch-config_system-headers b/www/firefox/patches/patch-config_system-headers index a442d3339b4..62d29df58c8 100644 --- a/www/firefox/patches/patch-config_system-headers +++ b/www/firefox/patches/patch-config_system-headers @@ -1,6 +1,6 @@ -$NetBSD: patch-config_system-headers,v 1.4 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-config_system-headers,v 1.5 2014/02/08 09:36:00 ryoon Exp $ ---- config/system-headers.orig 2013-12-05 16:07:23.000000000 +0000 +--- config/system-headers.orig 2014-01-28 04:03:35.000000000 +0000 +++ config/system-headers @@ -1144,3 +1144,4 @@ unicode/unum.h unicode/ustring.h diff --git a/www/firefox/patches/patch-config_system__wrappers_unwind.h b/www/firefox/patches/patch-config_system__wrappers_unwind.h index b3755fd338e..c1155b3d26e 100644 --- a/www/firefox/patches/patch-config_system__wrappers_unwind.h +++ b/www/firefox/patches/patch-config_system__wrappers_unwind.h @@ -1,6 +1,6 @@ -$NetBSD: patch-config_system__wrappers_unwind.h,v 1.3 2013/06/27 15:52:51 joerg Exp $ +$NetBSD: patch-config_system__wrappers_unwind.h,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- config/system_wrappers/unwind.h.orig 2013-05-13 19:56:18.000000000 +0000 +--- config/system_wrappers/unwind.h.orig 2014-02-08 06:57:27.000000000 +0000 +++ config/system_wrappers/unwind.h @@ -0,0 +1,4 @@ +#pragma GCC system_header diff --git a/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp index 0829da081c1..479b8f0464b 100644 --- a/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp +++ b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- dom/plugins/ipc/PluginModuleChild.cpp.orig 2013-05-11 19:19:27.000000000 +0000 +--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2014-01-28 04:03:39.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -201,7 +201,7 @@ PluginModuleChild::Init(const std::strin +@@ -197,7 +197,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -11,7 +11,7 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2013/07/17 11:00:13 j mShutdownFunc = (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); -@@ -1836,7 +1836,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin +@@ -1825,7 +1825,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin PLUGIN_LOG_DEBUG_METHOD; AssertPluginThread(); @@ -20,7 +20,7 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2013/07/17 11:00:13 j return true; #elif defined(OS_WIN) || defined(OS_MACOSX) *_retval = mGetEntryPointsFunc(&mFunctions); -@@ -1865,7 +1865,7 @@ PluginModuleChild::AnswerNP_Initialize(c +@@ -1854,7 +1854,7 @@ PluginModuleChild::AnswerNP_Initialize(c SendBackUpXResources(FileDescriptor(xSocketFd)); #endif diff --git a/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.h b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.h index c1c4629952d..4030063c535 100644 --- a/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.h +++ b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.h @@ -1,8 +1,8 @@ -$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- dom/plugins/ipc/PluginModuleChild.h.orig 2013-05-11 19:19:27.000000000 +0000 +--- dom/plugins/ipc/PluginModuleChild.h.orig 2014-01-28 04:03:39.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.h -@@ -325,7 +325,7 @@ private: +@@ -328,7 +328,7 @@ private: // we get this from the plugin NP_PLUGINSHUTDOWN mShutdownFunc; diff --git a/www/firefox/patches/patch-extensions_auth_nsAuthGSSAPI.cpp b/www/firefox/patches/patch-extensions_auth_nsAuthGSSAPI.cpp index 8fabf80eec4..1cbf57ace65 100644 --- a/www/firefox/patches/patch-extensions_auth_nsAuthGSSAPI.cpp +++ b/www/firefox/patches/patch-extensions_auth_nsAuthGSSAPI.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-extensions_auth_nsAuthGSSAPI.cpp,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-extensions_auth_nsAuthGSSAPI.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- extensions/auth/nsAuthGSSAPI.cpp.orig 2013-05-11 19:19:29.000000000 +0000 +--- extensions/auth/nsAuthGSSAPI.cpp.orig 2014-01-28 04:03:40.000000000 +0000 +++ extensions/auth/nsAuthGSSAPI.cpp -@@ -39,6 +39,9 @@ typedef KLStatus (*KLCacheHasValidTicket +@@ -40,6 +40,9 @@ typedef KLStatus (*KLCacheHasValidTicket #endif #if defined(HAVE_RES_NINIT) 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 a3bb06d8e72..6b029d6595b 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.1 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2013-09-10 03:43:29.000000000 +0000 +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2014-01-28 04:03:40.000000000 +0000 +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -417,6 +417,12 @@ mozHunspell::LoadDictionaryList() +@@ -426,6 +426,12 @@ mozHunspell::LoadDictionaryList() } } + // load system hunspell dictionaries + nsIFile* hunDir; -+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@PREFIX@/share/hunspell"), ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/usr/pkg/share/hunspell"), + true, &hunDir); + LoadDictionariesFromDir(hunDir); + diff --git a/www/firefox/patches/patch-gfx__skia__include__core__SkPreConfig.h b/www/firefox/patches/patch-gfx__skia__include__core__SkPreConfig.h index 9808f6feb9d..ea1e7812da0 100644 --- a/www/firefox/patches/patch-gfx__skia__include__core__SkPreConfig.h +++ b/www/firefox/patches/patch-gfx__skia__include__core__SkPreConfig.h @@ -1,9 +1,9 @@ -$NetBSD: patch-gfx__skia__include__core__SkPreConfig.h,v 1.2 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-gfx__skia__include__core__SkPreConfig.h,v 1.3 2014/02/08 09:36:00 ryoon Exp $ Configure sparc cpus as big endian (Bugzilla #884376) diff -r 581ea0e6531e gfx/skia/include/core/SkPreConfig.h ---- gfx/skia/include/core/SkPreConfig.h.orig 2013-10-25 22:27:18.000000000 +0000 +--- gfx/skia/include/core/SkPreConfig.h.orig 2014-01-28 04:03:41.000000000 +0000 +++ gfx/skia/include/core/SkPreConfig.h @@ -100,7 +100,7 @@ diff --git a/www/firefox/patches/patch-gfx_graphite2_src_Bidi.cpp b/www/firefox/patches/patch-gfx_graphite2_src_Bidi.cpp index 3fd49791634..a6b74fac486 100644 --- a/www/firefox/patches/patch-gfx_graphite2_src_Bidi.cpp +++ b/www/firefox/patches/patch-gfx_graphite2_src_Bidi.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-gfx_graphite2_src_Bidi.cpp,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-gfx_graphite2_src_Bidi.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- gfx/graphite2/src/Bidi.cpp.orig 2013-05-11 19:19:30.000000000 +0000 +--- gfx/graphite2/src/Bidi.cpp.orig 2014-01-28 04:03:41.000000000 +0000 +++ gfx/graphite2/src/Bidi.cpp @@ -30,6 +30,11 @@ of the License or (at your option) any l diff --git a/www/firefox/patches/patch-gfx_layers_BufferUnrotate.cpp b/www/firefox/patches/patch-gfx_layers_BufferUnrotate.cpp deleted file mode 100644 index cd634c377bc..00000000000 --- a/www/firefox/patches/patch-gfx_layers_BufferUnrotate.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-gfx_layers_BufferUnrotate.cpp,v 1.1 2014/01/03 14:30:28 martin Exp $ - -Addd missing include of string.h for memcpy(). - - ---- gfx/layers/BufferUnrotate.cpp.orig 2013-12-05 17:07:31.000000000 +0100 -+++ gfx/layers/BufferUnrotate.cpp 2014-01-03 15:03:25.000000000 +0100 -@@ -8,6 +8,7 @@ - #include <stdint.h> - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight, - int aByteStride, int aXBoundary, int aYBoundary) diff --git a/www/firefox/patches/patch-gfx_skia_moz.build b/www/firefox/patches/patch-gfx_skia_moz.build index 033141aa2de..fd398aad6b4 100644 --- a/www/firefox/patches/patch-gfx_skia_moz.build +++ b/www/firefox/patches/patch-gfx_skia_moz.build @@ -1,10 +1,10 @@ -$NetBSD: patch-gfx_skia_moz.build,v 1.3 2013/11/03 11:29:34 ryoon Exp $ +$NetBSD: patch-gfx_skia_moz.build,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- gfx/skia/moz.build.orig 2013-10-25 22:27:18.000000000 +0000 +--- gfx/skia/moz.build.orig 2014-01-28 04:03:41.000000000 +0000 +++ gfx/skia/moz.build @@ -197,7 +197,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt - 'SkFontHost_FreeType_common.cpp', - 'SkOSFile.cpp', + 'src/ports/SkFontHost_FreeType_common.cpp', + 'src/utils/SkOSFile.cpp', ] - if CONFIG['OS_TARGET'] == 'Linux': + if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux': diff --git a/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp b/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp index ce2c674b376..b9a6a7a524e 100644 --- a/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp +++ b/www/firefox/patches/patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp,v 1.3 2013/11/05 14:40:49 ryoon Exp $ +$NetBSD: patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp,v 1.4 2014/02/08 09:36:00 ryoon Exp $ * Use cpuset(3) for NetBSD. From rmind@. ---- gfx/skia/src/utils/SkThreadUtils_pthread_linux.cpp.orig 2013-10-25 22:27:18.000000000 +0000 +--- gfx/skia/src/utils/SkThreadUtils_pthread_linux.cpp.orig 2014-01-28 04:03:42.000000000 +0000 +++ gfx/skia/src/utils/SkThreadUtils_pthread_linux.cpp @@ -12,26 +12,47 @@ #include "SkThreadUtils.h" diff --git a/www/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp b/www/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp index 5e5bcea13b6..893b1e61272 100644 --- a/www/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp +++ b/www/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- image/decoders/nsJPEGDecoder.cpp.orig 2013-05-11 19:19:31.000000000 +0000 +--- image/decoders/nsJPEGDecoder.cpp.orig 2014-01-28 04:03:42.000000000 +0000 +++ image/decoders/nsJPEGDecoder.cpp -@@ -19,13 +19,28 @@ +@@ -21,13 +21,28 @@ extern "C" { #include "iccjpeg.h" @@ -32,7 +32,7 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:12:13 ryoon static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); -@@ -338,6 +353,7 @@ nsJPEGDecoder::WriteInternal(const char +@@ -340,6 +355,7 @@ nsJPEGDecoder::WriteInternal(const char case JCS_GRAYSCALE: case JCS_RGB: case JCS_YCbCr: @@ -40,7 +40,7 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:12:13 ryoon // if we're not color managing we can decode directly to // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB if (mCMSMode != eCMSMode_All) { -@@ -346,6 +362,9 @@ nsJPEGDecoder::WriteInternal(const char +@@ -348,6 +364,9 @@ nsJPEGDecoder::WriteInternal(const char } else { mInfo.out_color_space = JCS_RGB; } @@ -50,7 +50,7 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:12:13 ryoon break; case JCS_CMYK: case JCS_YCCK: -@@ -413,6 +432,15 @@ nsJPEGDecoder::WriteInternal(const char +@@ -409,6 +428,15 @@ nsJPEGDecoder::WriteInternal(const char return; /* I/O suspension */ } @@ -66,7 +66,7 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:12:13 ryoon /* If this is a progressive JPEG ... */ mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -558,7 +586,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus +@@ -575,7 +603,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus uint32_t *imageRow = ((uint32_t*)mImageData) + (mInfo.output_scanline * mInfo.output_width); @@ -78,7 +78,7 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:12:13 ryoon /* Special case: scanline will be directly converted into packed ARGB */ if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { *suspend = true; /* suspend */ -@@ -868,6 +900,282 @@ term_source (j_decompress_ptr jd) +@@ -885,6 +917,282 @@ term_source (j_decompress_ptr jd) } // namespace mozilla diff --git a/www/firefox/patches/patch-intl_hyphenation_src_hnjalloc.h b/www/firefox/patches/patch-intl_hyphenation_src_hnjalloc.h index 257565ec4f3..a39b0baded2 100644 --- a/www/firefox/patches/patch-intl_hyphenation_src_hnjalloc.h +++ b/www/firefox/patches/patch-intl_hyphenation_src_hnjalloc.h @@ -1,8 +1,8 @@ -$NetBSD: patch-intl_hyphenation_src_hnjalloc.h,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-intl_hyphenation_src_hnjalloc.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- intl/hyphenation/src/hnjalloc.h.orig 2013-05-11 19:19:31.000000000 +0000 +--- intl/hyphenation/src/hnjalloc.h.orig 2014-01-28 04:03:43.000000000 +0000 +++ intl/hyphenation/src/hnjalloc.h -@@ -56,6 +56,9 @@ +@@ -24,6 +24,9 @@ */ #include <stdio.h> /* ensure stdio.h is loaded before our macros */ diff --git a/www/firefox/patches/patch-ipc_chromium_Makefile.in b/www/firefox/patches/patch-ipc_chromium_Makefile.in index 2182687abcb..a92cd75e30c 100644 --- a/www/firefox/patches/patch-ipc_chromium_Makefile.in +++ b/www/firefox/patches/patch-ipc_chromium_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_Makefile.in,v 1.3 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-ipc_chromium_Makefile.in,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/Makefile.in.orig 2013-10-25 22:27:21.000000000 +0000 +--- ipc/chromium/Makefile.in.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/Makefile.in -@@ -22,9 +22,7 @@ vpath %.c \ +@@ -11,9 +11,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) else # } else { @@ -13,7 +13,7 @@ $NetBSD: patch-ipc_chromium_Makefile.in,v 1.3 2013/11/02 22:57:55 ryoon Exp $ endif # } vpath %.cc \ -@@ -45,6 +43,33 @@ DEFINES += -DANDROID -D_POSIX_MONOTONIC_ +@@ -32,6 +30,33 @@ DEFINES += -DANDROID -D_POSIX_MONOTONIC_ endif # Android endif # } Not WINNT (OS_POSIX) diff --git a/www/firefox/patches/patch-ipc_chromium_chromium-config.mk b/www/firefox/patches/patch-ipc_chromium_chromium-config.mk deleted file mode 100644 index 306d2260bbd..00000000000 --- a/www/firefox/patches/patch-ipc_chromium_chromium-config.mk +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.2 2013/08/07 12:17:54 ryoon Exp $ - ---- ipc/chromium/chromium-config.mk.orig 2013-07-30 00:58:17.000000000 +0000 -+++ ipc/chromium/chromium-config.mk -@@ -105,6 +105,14 @@ DEFINES += \ - $(NULL) - - else # } { -+ifeq ($(OS_ARCH),SunOS) # { -+ -+OS_SOLARIS = 1 -+DEFINES += \ -+ -DOS_SOLARIS=1 \ -+ $(NULL) -+ -+else # } { - - OS_LINUX = 1 - DEFINES += \ -@@ -117,4 +125,5 @@ endif # } - endif # } - endif # } - endif # } -+endif # } - 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 index 3aa47f91500..08c3fe4a226 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_base__paths.h +++ b/www/firefox/patches/patch-ipc_chromium_src_base_base__paths.h @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.2 2014/02/08 09:36:00 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.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/base_paths.h @@ -13,7 +13,7 @@ #include "base/base_paths_win.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 index 0d8acfbe868..20494ff331c 100644 --- 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 @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.2 2014/02/08 09:36:00 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.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/debug_util_posix.cc -@@ -107,7 +107,7 @@ bool DebugUtil::BeingDebugged() { +@@ -110,7 +110,7 @@ bool DebugUtil::BeingDebugged() { return being_debugged; } diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_file__util.h b/www/firefox/patches/patch-ipc_chromium_src_base_file__util.h index eaeb6e1f196..ab99c942a06 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_file__util.h +++ b/www/firefox/patches/patch-ipc_chromium_src_base_file__util.h @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/file_util.h.orig 2013-12-05 16:07:35.000000000 +0000 +--- ipc/chromium/src/base/file_util.h.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/file_util.h @@ -16,7 +16,9 @@ #include <sys/stat.h> diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_file__util__posix.cc index b134852c85d..5c00b6e3a35 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_file__util__posix.cc +++ b/www/firefox/patches/patch-ipc_chromium_src_base_file__util__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/file_util_posix.cc.orig 2013-12-05 16:07:35.000000000 +0000 +--- ipc/chromium/src/base/file_util_posix.cc.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/file_util_posix.cc @@ -8,7 +8,7 @@ #include <errno.h> diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h b/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h index 492909c8e12..d29e2c32dcd 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h +++ b/www/firefox/patches/patch-ipc_chromium_src_base_file__version__info.h @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_file__version__info.h,v 1.1 2013/09/21 09:58:49 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_file__version__info.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ * Treat Solaris/SunOS like Linux, fix build. ---- ipc/chromium/src/base/file_version_info.h.orig 2013-09-11 03:22:31.000000000 +0000 +--- ipc/chromium/src/base/file_version_info.h.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/file_version_info.h @@ -86,7 +86,7 @@ class FileVersionInfo { explicit FileVersionInfo(NSBundle *bundle); 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 index 093ed3cd4f3..eb60c6913d7 100644 --- 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 @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_message__pump__libevent.cc,v 1.2 2014/02/08 09:36:00 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.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/message_pump_libevent.cc @@ -16,7 +16,7 @@ #include "base/scoped_ptr.h" diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h b/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h index 2320a5b4052..be4540dec68 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h +++ b/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.2 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/platform_thread.h.orig 2013-09-10 03:43:34.000000000 +0000 +--- ipc/chromium/src/base/platform_thread.h.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h @@ -25,6 +25,9 @@ typedef pthread_t PlatformThreadHandle; #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(__GLIBC__) diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc index b9f49fea019..691a682f602 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc +++ b/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2013-09-10 03:43:34.000000000 +0000 +--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc @@ -10,7 +10,9 @@ #if defined(OS_MACOSX) @@ -12,7 +12,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2013/09/19 #elif defined(OS_LINUX) #include <sys/syscall.h> #include <sys/prctl.h> -@@ -110,7 +112,8 @@ void PlatformThread::SetName(const char* +@@ -114,7 +116,8 @@ void PlatformThread::SetName(const char* pthread_setname_np(pthread_self(), "%s", (void *)name); #elif defined(OS_BSD) && !defined(__GLIBC__) pthread_set_name_np(pthread_self(), name); 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 f048690bf4c..cd2406970b2 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,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2013/09/19 12:37:49 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/process_util.h.orig 2013-09-10 03:43:34.000000000 +0000 +--- ipc/chromium/src/base/process_util.h.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/process_util.h @@ -13,7 +13,7 @@ #if defined(OS_WIN) @@ -21,7 +21,7 @@ $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2013/09/19 12:37:49 r // TODO(port): we should not rely on a Win32 structure. struct ProcessEntry { int pid; -@@ -316,7 +319,7 @@ class NamedProcessIterator { +@@ -250,7 +253,7 @@ class NamedProcessIterator { #if defined(OS_WIN) HANDLE snapshot_; bool started_iteration_; diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_process__util__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_process__util__posix.cc index 10b780e04ae..9a7bc82114d 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_process__util__posix.cc +++ b/www/firefox/patches/patch-ipc_chromium_src_base_process__util__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/process_util_posix.cc.orig 2013-05-11 19:19:32.000000000 +0000 +--- ipc/chromium/src/base/process_util_posix.cc.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/process_util_posix.cc @@ -110,7 +110,7 @@ void CloseSuperfluousFds(const base::Inj #if defined(ANDROID) diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc index bbd727b18a0..e204764a921 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc +++ b/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/sys_info_posix.cc.orig 2013-05-11 19:19:32.000000000 +0000 +--- ipc/chromium/src/base/sys_info_posix.cc.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/sys_info_posix.cc @@ -119,7 +119,11 @@ std::wstring SysInfo::GetEnvVar(const wc diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_time__posix.cc b/www/firefox/patches/patch-ipc_chromium_src_base_time__posix.cc index 53db838e7d4..bf8a52e95a4 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_base_time__posix.cc +++ b/www/firefox/patches/patch-ipc_chromium_src_base_time__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_time__posix.cc,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-ipc_chromium_src_base_time__posix.cc,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/base/time_posix.cc.orig 2013-05-11 19:19:32.000000000 +0000 +--- ipc/chromium/src/base/time_posix.cc.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/base/time_posix.cc @@ -65,8 +65,10 @@ Time Time::FromExploded(bool is_local, c timestruct.tm_wday = exploded.day_of_week; // mktime/timegm ignore this diff --git a/www/firefox/patches/patch-ipc_chromium_src_build_build__config.h b/www/firefox/patches/patch-ipc_chromium_src_build_build__config.h index 24233811c24..93f059f7bf0 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_build_build__config.h +++ b/www/firefox/patches/patch-ipc_chromium_src_build_build__config.h @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/build/build_config.h.orig 2013-05-11 19:19:32.000000000 +0000 +--- ipc/chromium/src/build/build_config.h.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/build/build_config.h @@ -27,6 +27,8 @@ #define OS_NETBSD 1 diff --git a/www/firefox/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h b/www/firefox/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h index 6776d9e7fc6..4b707e234ca 100644 --- a/www/firefox/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h +++ b/www/firefox/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/chromium/src/chrome/common/transport_dib.h.orig 2013-05-11 19:19:32.000000000 +0000 +--- ipc/chromium/src/chrome/common/transport_dib.h.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/chromium/src/chrome/common/transport_dib.h @@ -70,7 +70,7 @@ class TransportDIB { typedef base::SharedMemoryHandle Handle; diff --git a/www/firefox/patches/patch-ipc_glue_AsyncChannel.cpp b/www/firefox/patches/patch-ipc_glue_AsyncChannel.cpp deleted file mode 100644 index 9136f312deb..00000000000 --- a/www/firefox/patches/patch-ipc_glue_AsyncChannel.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ipc_glue_AsyncChannel.cpp,v 1.1 2013/07/17 11:00:13 jperkin Exp $ - ---- ipc/glue/AsyncChannel.cpp.orig 2013-05-11 19:19:32.000000000 +0000 -+++ ipc/glue/AsyncChannel.cpp -@@ -682,7 +682,7 @@ AsyncChannel::ProcessLink::OnChannelOpen - mExistingListener = mTransport->set_listener(this); - #ifdef DEBUG - if (mExistingListener) { -- queue<Message> pending; -+ std::queue<Message> pending; - mExistingListener->GetQueuedMessages(pending); - MOZ_ASSERT(pending.empty()); - } -@@ -699,7 +699,7 @@ AsyncChannel::ProcessLink::OnTakeConnect - { - AssertIOThread(); - -- queue<Message> pending; -+ std::queue<Message> pending; - { - MonitorAutoLock lock(*mChan->mMonitor); - diff --git a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp index d54053c5b2d..2bfa06e439e 100644 --- a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp +++ b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2013/08/07 12:17:54 ryoon Exp $ +$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/glue/GeckoChildProcessHost.cpp.orig 2013-07-30 00:58:17.000000000 +0000 +--- ipc/glue/GeckoChildProcessHost.cpp.orig 2014-01-28 04:03:44.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 @@ -16,7 +16,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2013/08/07 12:17:54 ryoo #include "base/command_line.h" #include "base/path_service.h" -@@ -490,7 +496,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -494,7 +500,7 @@ GeckoChildProcessHost::PerformAsyncLaunc // and passing wstrings from one config to the other is unsafe. So // we split the logic here. @@ -25,7 +25,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2013/08/07 12:17:54 ryoo base::environment_map newEnvVars; ChildPrivileges privs = mPrivileges; if (privs == base::PRIVILEGES_DEFAULT) { -@@ -509,7 +515,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -513,7 +519,7 @@ GeckoChildProcessHost::PerformAsyncLaunc if (NS_SUCCEEDED(rv)) { nsCString path; greDir->GetNativePath(path); @@ -34,7 +34,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2013/08/07 12:17:54 ryoo # if defined(MOZ_WIDGET_ANDROID) path += "/lib"; # endif // MOZ_WIDGET_ANDROID -@@ -618,7 +624,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -622,7 +628,7 @@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(pidstring); #if defined(MOZ_CRASHREPORTER) @@ -43,7 +43,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2013/08/07 12:17:54 ryoo int childCrashFd, childCrashRemapFd; if (!CrashReporter::CreateNotificationPipeForChild( &childCrashFd, &childCrashRemapFd)) -@@ -651,7 +657,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -655,7 +661,7 @@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(childProcessType); base::LaunchApp(childArgv, mFileMap, diff --git a/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py b/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py index 9da29b7409a..b87b6a1df08 100644 --- a/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py +++ b/www/firefox/patches/patch-ipc_ipdl_ipdl_lower.py @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-ipc_ipdl_ipdl_lower.py,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- ipc/ipdl/ipdl/lower.py.orig 2013-01-04 23:44:34.000000000 +0000 +--- ipc/ipdl/ipdl/lower.py.orig 2014-01-28 04:03:44.000000000 +0000 +++ ipc/ipdl/ipdl/lower.py -@@ -1797,7 +1797,7 @@ def _generateMessageClass(clsname, msgid +@@ -1811,7 +1811,7 @@ def _generateMessageClass(clsname, msgid StmtExpr(ExprCall( ExprVar('StringAppendF'), args=[ ExprAddrOf(msgvar), diff --git a/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp b/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp index 08107c131d0..7a6b33b3a45 100644 --- a/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp +++ b/www/firefox/patches/patch-js__src__vm__SPSProfiler.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.4 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.5 2014/02/08 09:36:00 ryoon Exp $ Unclear fallout from our version of bug 840242, attachment v1: some architectures fail to link if we do not add the inlines here - might be compiler/arch specific. ---- js/src/vm/SPSProfiler.cpp.orig 2013-12-05 16:07:40.000000000 +0000 +--- js/src/vm/SPSProfiler.cpp.orig 2014-01-28 04:03:48.000000000 +0000 +++ js/src/vm/SPSProfiler.cpp @@ -4,12 +4,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/www/firefox/patches/patch-js_src_Makefile.in b/www/firefox/patches/patch-js_src_Makefile.in index 1b66be2ac9e..3b394934537 100644 --- a/www/firefox/patches/patch-js_src_Makefile.in +++ b/www/firefox/patches/patch-js_src_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-js_src_Makefile.in,v 1.4 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-js_src_Makefile.in,v 1.5 2014/02/08 09:36:00 ryoon Exp $ ---- js/src/Makefile.in.orig 2013-12-05 16:07:35.000000000 +0000 +--- js/src/Makefile.in.orig 2014-01-28 04:03:44.000000000 +0000 +++ js/src/Makefile.in -@@ -467,6 +467,13 @@ EXTRA_LIBS += -lposix4 -ldl -lnsl -lsock +@@ -480,6 +480,13 @@ EXTRA_LIBS += -lposix4 -ldl -lnsl -lsock endif endif diff --git a/www/firefox/patches/patch-js_src_config_system-headers b/www/firefox/patches/patch-js_src_config_system-headers index 90ee34ad9a0..d6b669121f2 100644 --- a/www/firefox/patches/patch-js_src_config_system-headers +++ b/www/firefox/patches/patch-js_src_config_system-headers @@ -1,6 +1,6 @@ -$NetBSD: patch-js_src_config_system-headers,v 1.4 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-js_src_config_system-headers,v 1.5 2014/02/08 09:36:00 ryoon Exp $ ---- js/src/config/system-headers.orig 2013-12-05 16:07:35.000000000 +0000 +--- js/src/config/system-headers.orig 2014-01-28 04:03:45.000000000 +0000 +++ js/src/config/system-headers @@ -1144,3 +1144,4 @@ unicode/unum.h unicode/ustring.h diff --git a/www/firefox/patches/patch-js_src_ctypes_CTypes.h b/www/firefox/patches/patch-js_src_ctypes_CTypes.h index 07d82afc429..164fd49a26f 100644 --- a/www/firefox/patches/patch-js_src_ctypes_CTypes.h +++ b/www/firefox/patches/patch-js_src_ctypes_CTypes.h @@ -1,10 +1,10 @@ -$NetBSD: patch-js_src_ctypes_CTypes.h,v 1.1 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-js_src_ctypes_CTypes.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- js/src/ctypes/CTypes.h.orig 2013-09-10 03:43:34.000000000 +0000 +--- js/src/ctypes/CTypes.h.orig 2014-01-28 04:03:45.000000000 +0000 +++ js/src/ctypes/CTypes.h -@@ -13,6 +13,23 @@ - - #include "js/HashTable.h" +@@ -14,6 +14,23 @@ + #include "js/Vector.h" + #include "vm/String.h" +#if defined(__NetBSD__) +#include <stdint.h> diff --git a/www/firefox/patches/patch-js_src_frontend_ParseMaps.cpp b/www/firefox/patches/patch-js_src_frontend_ParseMaps.cpp index 206bd1f2464..741f7a9bc38 100644 --- a/www/firefox/patches/patch-js_src_frontend_ParseMaps.cpp +++ b/www/firefox/patches/patch-js_src_frontend_ParseMaps.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-js_src_frontend_ParseMaps.cpp,v 1.1 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-js_src_frontend_ParseMaps.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- js/src/frontend/ParseMaps.cpp.orig 2013-09-10 03:43:34.000000000 +0000 +--- js/src/frontend/ParseMaps.cpp.orig 2014-01-28 04:03:45.000000000 +0000 +++ js/src/frontend/ParseMaps.cpp -@@ -132,5 +132,5 @@ frontend::InitAtomMap(JSContext *cx, fro +@@ -132,5 +132,5 @@ frontend::InitAtomMap(frontend::AtomInde } } diff --git a/www/firefox/patches/patch-js_src_jit_AsmJSSignalHandlers.cpp b/www/firefox/patches/patch-js_src_jit_AsmJSSignalHandlers.cpp deleted file mode 100644 index 4420ed4b04c..00000000000 --- a/www/firefox/patches/patch-js_src_jit_AsmJSSignalHandlers.cpp +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-js_src_jit_AsmJSSignalHandlers.cpp,v 1.2 2013/09/21 09:58:49 ryoon Exp $ - -* REG_EIP is not defined on Solaris/SunOS, use REG_PC instead. - ---- js/src/jit/AsmJSSignalHandlers.cpp.orig 2013-09-11 03:22:33.000000000 +0000 -+++ js/src/jit/AsmJSSignalHandlers.cpp -@@ -59,10 +59,11 @@ using namespace mozilla; - #elif defined(__linux__) || defined(SOLARIS) - # if defined(__linux__) - # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) -+# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) - # else - # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i]) -+# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC]) - # endif --# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) - # define RIP_sig(p) ((p)->uc_mcontext.gregs[REG_RIP]) - # define PC_sig(p) ((p)->uc_mcontext.arm_pc) - # define RAX_sig(p) ((p)->uc_mcontext.gregs[REG_RAX]) -@@ -269,7 +270,7 @@ LookupHeapAccess(const AsmJSModule &modu - # if defined(JS_CPU_X64) - # if defined(__DragonFly__) - # include <machine/npx.h> // for union savefpu --# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - # include <machine/fpu.h> // for struct savefpu/fxsave64 - # endif - # endif diff --git a/www/firefox/patches/patch-js_src_jscompartment.h b/www/firefox/patches/patch-js_src_jscompartment.h deleted file mode 100644 index 18fbbe0dcf4..00000000000 --- a/www/firefox/patches/patch-js_src_jscompartment.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-js_src_jscompartment.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $ - ---- js/src/jscompartment.h.orig 2013-06-17 22:13:11.000000000 +0000 -+++ js/src/jscompartment.h -@@ -396,9 +396,9 @@ class js::AutoDebugModeGC - GC(rt, GC_NORMAL, JS::gcreason::DEBUG_MODE_GC); - } - -- void scheduleGC(Zone *zone) { -+ void scheduleGC(JS::Zone *zone) { - JS_ASSERT(!rt->isHeapBusy()); -- PrepareZoneForGC(zone); -+ JS::PrepareZoneForGC(zone); - needGC = true; - } - }; diff --git a/www/firefox/patches/patch-js_src_jsmath.cpp b/www/firefox/patches/patch-js_src_jsmath.cpp index c0e5a214454..bb85c38f9c2 100644 --- a/www/firefox/patches/patch-js_src_jsmath.cpp +++ b/www/firefox/patches/patch-js_src_jsmath.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-js_src_jsmath.cpp,v 1.2 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-js_src_jsmath.cpp,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- js/src/jsmath.cpp.orig 2013-09-10 03:43:36.000000000 +0000 +--- js/src/jsmath.cpp.orig 2014-01-28 04:03:46.000000000 +0000 +++ js/src/jsmath.cpp -@@ -244,7 +244,7 @@ js::ecmaAtan2(double y, double x) +@@ -277,7 +277,7 @@ js::ecmaAtan2(double y, double x) } #endif diff --git a/www/firefox/patches/patch-mb b/www/firefox/patches/patch-mb index c58e97f0fc9..a9ff644ed2d 100644 --- a/www/firefox/patches/patch-mb +++ b/www/firefox/patches/patch-mb @@ -1,8 +1,8 @@ -$NetBSD: patch-mb,v 1.6 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-mb,v 1.7 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2013-09-10 03:43:57.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -183,7 +183,7 @@ endif +@@ -174,7 +174,7 @@ endif # # NetBSD/PPC # @@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.6 2013/09/19 12:37:50 ryoon Exp $ ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s endif -@@ -235,6 +235,13 @@ ifneq (,$(filter OpenBSDsparc64 FreeBSDs +@@ -226,6 +226,13 @@ ifneq (,$(filter OpenBSDsparc64 FreeBSDs ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s endif # diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c index 4b647308797..a3fc05ed761 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c @@ -1,6 +1,6 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.1 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- media/libcubeb/src/cubeb_alsa.c.orig 2013-10-25 22:27:33.000000000 +0000 +--- media/libcubeb/src/cubeb_alsa.c.orig 2014-01-28 04:03:54.000000000 +0000 +++ media/libcubeb/src/cubeb_alsa.c @@ -6,6 +6,9 @@ */ diff --git a/www/firefox/patches/patch-media_libpng_pngpriv.h b/www/firefox/patches/patch-media_libpng_pngpriv.h index cb0c4ba72ff..a04a3bc97d6 100644 --- a/www/firefox/patches/patch-media_libpng_pngpriv.h +++ b/www/firefox/patches/patch-media_libpng_pngpriv.h @@ -1,6 +1,6 @@ -$NetBSD: patch-media_libpng_pngpriv.h,v 1.2 2013/08/07 12:17:54 ryoon Exp $ +$NetBSD: patch-media_libpng_pngpriv.h,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- media/libpng/pngpriv.h.orig 2013-07-30 00:58:46.000000000 +0000 +--- media/libpng/pngpriv.h.orig 2014-01-28 04:03:54.000000000 +0000 +++ media/libpng/pngpriv.h @@ -38,6 +38,7 @@ * still required (as of 2011-05-02.) @@ -9,4 +9,4 @@ $NetBSD: patch-media_libpng_pngpriv.h,v 1.2 2013/08/07 12:17:54 ryoon Exp $ +#define _XOPEN_SOURCE 600 #ifndef PNG_VERSION_INFO_ONLY - /* This is required for the definition of abort(), used as a last ditch + /* Standard library headers not required by png.h: */ diff --git a/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp b/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp index f168e26a935..058bf6500d6 100644 --- a/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp +++ b/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $ +$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2013-06-17 22:13:19.000000000 +0000 +--- media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2014-01-28 04:03:54.000000000 +0000 +++ media/libsoundtouch/src/cpu_detect_x86.cpp @@ -131,6 +131,9 @@ uint detectCPUextensions(void) diff --git a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h b/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h index 44ad2214e73..5e5764cc726 100644 --- a/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h +++ b/www/firefox/patches/patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h @@ -1,6 +1,6 @@ -$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.3 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2013-12-05 16:07:48.000000000 +0000 +--- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2014-01-28 04:03:56.000000000 +0000 +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h @@ -30,12 +30,15 @@ * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $ diff --git a/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp b/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp index cc9afe29906..5d0d57ede90 100644 --- a/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp +++ b/www/firefox/patches/patch-media_webrtc_signaling_signaling.gyp @@ -1,6 +1,6 @@ -$NetBSD: patch-media_webrtc_signaling_signaling.gyp,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-media_webrtc_signaling_signaling.gyp,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- media/webrtc/signaling/signaling.gyp.orig 2013-12-05 16:07:48.000000000 +0000 +--- media/webrtc/signaling/signaling.gyp.orig 2014-01-28 04:03:57.000000000 +0000 +++ media/webrtc/signaling/signaling.gyp @@ -244,6 +244,19 @@ 'cflags_mozilla': [ diff --git a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in b/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in index 769e719cb3d..95360247019 100644 --- a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in +++ b/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-media_webrtc_signaling_test_Makefile.in,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-media_webrtc_signaling_test_Makefile.in,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- media/webrtc/signaling/test/Makefile.in.orig 2013-12-05 16:07:48.000000000 +0000 +--- media/webrtc/signaling/test/Makefile.in.orig 2014-01-28 04:03:58.000000000 +0000 +++ media/webrtc/signaling/test/Makefile.in @@ -7,6 +7,7 @@ LIBS = \ $(NSPR_LIBS) \ diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi index e62334b2b00..848713f9552 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi @@ -1,6 +1,6 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.4 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.5 2014/02/08 09:36:00 ryoon Exp $ ---- media/webrtc/trunk/webrtc/build/common.gypi.orig 2013-12-05 16:07:49.000000000 +0000 +--- media/webrtc/trunk/webrtc/build/common.gypi.orig 2014-01-28 04:03:58.000000000 +0000 +++ media/webrtc/trunk/webrtc/build/common.gypi @@ -78,9 +78,9 @@ 'enable_protobuf%': 1, diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc index 10a863132fd..e546997155e 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.3 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2013-10-25 22:27:35.000000000 +0000 +--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2014-01-28 04:03:58.000000000 +0000 +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc @@ -19,18 +19,30 @@ #include <stdlib.h> diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc index e2d02f68093..922d955b751 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.3 2013/11/02 22:57:55 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2013-10-25 22:27:35.000000000 +0000 +--- media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2014-01-28 04:03:58.000000000 +0000 +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -18,13 +18,16 @@ #include <string.h> diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi index 443bae61535..54de053b62c 100644 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi @@ -1,6 +1,6 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.2 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2013-09-10 03:43:47.000000000 +0000 +--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2014-01-28 04:03:58.000000000 +0000 +++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi @@ -7,6 +7,9 @@ # be found in the AUTHORS file in the root of the source tree. @@ -12,7 +12,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g 'targets': [ { 'target_name': 'video_capture_module', -@@ -49,6 +52,16 @@ +@@ -47,6 +50,16 @@ }, { # include_internal_video_capture == 1 'conditions': [ ['include_v4l2_video_capture==1', { diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_clock.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_clock.cc deleted file mode 100644 index dc80266fd9a..00000000000 --- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_clock.cc +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_clock.cc,v 1.1 2013/12/15 13:54:37 ryoon Exp $ - ---- media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc.orig 2013-12-05 16:07:50.000000000 +0000 -+++ media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc -@@ -15,7 +15,7 @@ - #include <Windows.h> - #include <WinSock.h> - #include <MMSystem.h> --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - #include <sys/time.h> - #include <time.h> - #endif -@@ -209,7 +209,7 @@ class WindowsRealTimeClock : public Real - WindowsHelpTimer* _helpTimer; - }; - --#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC)) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - class UnixRealTimeClock : public RealTimeClock { - public: - UnixRealTimeClock() {} -@@ -240,7 +240,7 @@ Clock* Clock::GetRealTimeClock() { - #if defined(_WIN32) - static WindowsRealTimeClock clock(&global_help_timer); - return &clock; --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) -+#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC)) - static UnixRealTimeClock clock; - return &clock; - #else 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 22060e66c1f..ec2fda10488 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,6 +1,6 @@ -$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2013-12-05 16:07:50.000000000 +0000 +--- media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2014-01-28 04:03:59.000000000 +0000 +++ media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -1,1688 +1,1695 @@ -//Templated spread_sort library
diff --git a/www/firefox/patches/patch-memory_mozalloc_fallible.h b/www/firefox/patches/patch-memory_mozalloc_fallible.h index 66dc8849a2a..ad2d86d16a8 100644 --- a/www/firefox/patches/patch-memory_mozalloc_fallible.h +++ b/www/firefox/patches/patch-memory_mozalloc_fallible.h @@ -1,6 +1,6 @@ -$NetBSD: patch-memory_mozalloc_fallible.h,v 1.1 2013/11/29 13:00:32 joerg Exp $ +$NetBSD: patch-memory_mozalloc_fallible.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- memory/mozalloc/fallible.h.orig 2013-11-18 16:22:30.000000000 +0000 +--- memory/mozalloc/fallible.h.orig 2014-01-28 04:03:59.000000000 +0000 +++ memory/mozalloc/fallible.h @@ -5,9 +5,22 @@ #ifndef mozilla_fallible_h diff --git a/www/firefox/patches/patch-memory_mozalloc_mozalloc.cpp b/www/firefox/patches/patch-memory_mozalloc_mozalloc.cpp index 236f7e99fb2..584fdd0cd4d 100644 --- a/www/firefox/patches/patch-memory_mozalloc_mozalloc.cpp +++ b/www/firefox/patches/patch-memory_mozalloc_mozalloc.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-memory_mozalloc_mozalloc.cpp,v 1.1 2013/11/29 13:00:32 joerg Exp $ +$NetBSD: patch-memory_mozalloc_mozalloc.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ https://bugzilla.mozilla.org/show_bug.cgi?id=928808 ---- memory/mozalloc/mozalloc.cpp.orig 2013-10-25 22:27:35.000000000 +0000 +--- memory/mozalloc/mozalloc.cpp.orig 2014-01-28 04:03:59.000000000 +0000 +++ memory/mozalloc/mozalloc.cpp @@ -229,3 +229,76 @@ namespace mozilla { const fallible_t fallible = fallible_t(); diff --git a/www/firefox/patches/patch-memory_mozalloc_mozalloc.h b/www/firefox/patches/patch-memory_mozalloc_mozalloc.h index 24e6b4a5bfa..4935c617bfa 100644 --- a/www/firefox/patches/patch-memory_mozalloc_mozalloc.h +++ b/www/firefox/patches/patch-memory_mozalloc_mozalloc.h @@ -1,8 +1,8 @@ -$NetBSD: patch-memory_mozalloc_mozalloc.h,v 1.1 2013/11/29 13:00:32 joerg Exp $ +$NetBSD: patch-memory_mozalloc_mozalloc.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ https://bugzilla.mozilla.org/show_bug.cgi?id=928808 ---- memory/mozalloc/mozalloc.h.orig 2013-10-25 22:27:35.000000000 +0000 +--- memory/mozalloc/mozalloc.h.orig 2014-01-28 04:03:59.000000000 +0000 +++ memory/mozalloc/mozalloc.h @@ -39,15 +39,6 @@ # define MOZALLOC_EXPORT diff --git a/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp b/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp index a74d769ba62..4ca1b062b06 100644 --- a/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp +++ b/www/firefox/patches/patch-memory_mozalloc_mozalloc__abort.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-memory_mozalloc_mozalloc__abort.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- memory/mozalloc/mozalloc_abort.cpp.orig 2013-05-11 19:19:46.000000000 +0000 +--- memory/mozalloc/mozalloc_abort.cpp.orig 2014-01-28 04:03:59.000000000 +0000 +++ memory/mozalloc/mozalloc_abort.cpp @@ -34,7 +34,11 @@ mozalloc_abort(const char* const msg) // Define abort() here, so that it is used instead of the system abort(). This diff --git a/www/firefox/patches/patch-mfbt_Poison.cpp b/www/firefox/patches/patch-mfbt_Poison.cpp index 6073877da2f..75a3766f412 100644 --- a/www/firefox/patches/patch-mfbt_Poison.cpp +++ b/www/firefox/patches/patch-mfbt_Poison.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-mfbt_Poison.cpp,v 1.2 2013/09/21 10:33:34 ryoon Exp $ +$NetBSD: patch-mfbt_Poison.cpp,v 1.3 2014/02/08 09:36:00 ryoon Exp $ * Use posix_madvise(3) instead of madvise(3) for Solaris/SunOS. Solaris/SunOS's madvise(3) is not enabled in this context, and its first argument type is different from NetBSD/Linux's one. ---- mfbt/Poison.cpp.orig 2013-09-11 03:22:45.000000000 +0000 +--- mfbt/Poison.cpp.orig 2014-01-28 04:03:59.000000000 +0000 +++ mfbt/Poison.cpp @@ -125,7 +125,11 @@ ReleaseRegion(void *region, uintptr_t si static bool diff --git a/www/firefox/patches/patch-modules_libjar_nsZipArchive.cpp b/www/firefox/patches/patch-modules_libjar_nsZipArchive.cpp index 8a53104de3c..bcb761c5e6a 100644 --- a/www/firefox/patches/patch-modules_libjar_nsZipArchive.cpp +++ b/www/firefox/patches/patch-modules_libjar_nsZipArchive.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-modules_libjar_nsZipArchive.cpp,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-modules_libjar_nsZipArchive.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- modules/libjar/nsZipArchive.cpp.orig 2013-06-18 11:01:37.000000000 +0000 +--- modules/libjar/nsZipArchive.cpp.orig 2014-01-28 04:04:00.000000000 +0000 +++ modules/libjar/nsZipArchive.cpp @@ -590,7 +590,9 @@ MOZ_WIN_MEM_TRY_BEGIN // Success means optimized jar layout from bug 559961 is in effect diff --git a/www/firefox/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c b/www/firefox/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c index 93c78d4232c..d4b78ec17d5 100644 --- a/www/firefox/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c +++ b/www/firefox/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c @@ -1,6 +1,6 @@ -$NetBSD: patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c,v 1.1 2013/06/26 11:32:12 ryoon Exp $ +$NetBSD: patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/sctp/src/netinet6/sctp6_usrreq.c.orig 2013-06-17 22:13:23.000000000 +0000 +--- netwerk/sctp/src/netinet6/sctp6_usrreq.c.orig 2014-01-28 04:04:00.000000000 +0000 +++ netwerk/sctp/src/netinet6/sctp6_usrreq.c @@ -459,6 +459,8 @@ sctp6_notify(struct sctp_inpcb *inp, (icmph->icmp6_code == ICMP_UNREACH_HOST_PROHIB) || diff --git a/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__os__userspace.h b/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__os__userspace.h index 4f5c98dc6b8..b0f7f89858d 100644 --- a/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__os__userspace.h +++ b/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__os__userspace.h @@ -1,6 +1,6 @@ -$NetBSD: patch-netwerk_sctp_src_netinet_sctp__os__userspace.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $ +$NetBSD: patch-netwerk_sctp_src_netinet_sctp__os__userspace.h,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/sctp/src/netinet/sctp_os_userspace.h.orig 2013-06-17 22:13:23.000000000 +0000 +--- netwerk/sctp/src/netinet/sctp_os_userspace.h.orig 2014-01-28 04:04:00.000000000 +0000 +++ netwerk/sctp/src/netinet/sctp_os_userspace.h @@ -383,7 +383,7 @@ struct udphdr { #else /* !defined(Userspace_os_Windows) */ diff --git a/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__usrreq.c b/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__usrreq.c index 5be2b66e3b3..912c30d5425 100644 --- a/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__usrreq.c +++ b/www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__usrreq.c @@ -1,6 +1,6 @@ -$NetBSD: patch-netwerk_sctp_src_netinet_sctp__usrreq.c,v 1.1 2013/06/26 11:32:12 ryoon Exp $ +$NetBSD: patch-netwerk_sctp_src_netinet_sctp__usrreq.c,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/sctp/src/netinet/sctp_usrreq.c.orig 2013-06-17 22:13:23.000000000 +0000 +--- netwerk/sctp/src/netinet/sctp_usrreq.c.orig 2014-01-28 04:04:00.000000000 +0000 +++ netwerk/sctp/src/netinet/sctp_usrreq.c @@ -414,6 +414,8 @@ sctp_notify(struct sctp_inpcb *inp, (icmph->icmp_code == ICMP_UNREACH_HOST_PROHIB) || diff --git a/www/firefox/patches/patch-netwerk_sctp_src_user__recv__thread.c b/www/firefox/patches/patch-netwerk_sctp_src_user__recv__thread.c index 39275b9effa..1694b8dbf92 100644 --- a/www/firefox/patches/patch-netwerk_sctp_src_user__recv__thread.c +++ b/www/firefox/patches/patch-netwerk_sctp_src_user__recv__thread.c @@ -1,6 +1,6 @@ -$NetBSD: patch-netwerk_sctp_src_user__recv__thread.c,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-netwerk_sctp_src_user__recv__thread.c,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/sctp/src/user_recv_thread.c.orig 2013-05-11 19:19:49.000000000 +0000 +--- netwerk/sctp/src/user_recv_thread.c.orig 2014-01-28 04:04:00.000000000 +0000 +++ netwerk/sctp/src/user_recv_thread.c @@ -35,7 +35,7 @@ #include <netinet/in.h> diff --git a/www/firefox/patches/patch-netwerk_sctp_src_user__socket.c b/www/firefox/patches/patch-netwerk_sctp_src_user__socket.c index 46b3ad82819..1f38a8aad30 100644 --- a/www/firefox/patches/patch-netwerk_sctp_src_user__socket.c +++ b/www/firefox/patches/patch-netwerk_sctp_src_user__socket.c @@ -1,8 +1,8 @@ -$NetBSD: patch-netwerk_sctp_src_user__socket.c,v 1.1 2013/06/26 11:32:12 ryoon Exp $ +$NetBSD: patch-netwerk_sctp_src_user__socket.c,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/sctp/src/user_socket.c.orig 2013-06-17 22:13:23.000000000 +0000 +--- netwerk/sctp/src/user_socket.c.orig 2014-01-28 04:04:00.000000000 +0000 +++ netwerk/sctp/src/user_socket.c -@@ -1104,8 +1104,13 @@ userspace_sctp_recvmsg(struct socket *so +@@ -1044,8 +1044,13 @@ userspace_sctp_recvmsg(struct socket *so (struct sctp_sndrcvinfo *)sinfo, 1); if (error) { @@ -16,7 +16,7 @@ $NetBSD: patch-netwerk_sctp_src_user__socket.c,v 1.1 2013/06/26 11:32:12 ryoon E error = 0; } if ((fromlenp != NULL) && (fromlen > 0) && (from != NULL)) { -@@ -1193,7 +1198,11 @@ usrsctp_recvv(struct socket *so, +@@ -1133,7 +1138,11 @@ usrsctp_recvv(struct socket *so, (struct sctp_sndrcvinfo *)&seinfo, 1); if (errno) { if (auio.uio_resid != (int)ulen && @@ -28,7 +28,7 @@ $NetBSD: patch-netwerk_sctp_src_user__socket.c,v 1.1 2013/06/26 11:32:12 ryoon E errno = 0; } } -@@ -2143,7 +2152,11 @@ int user_connect(struct socket *so, stru +@@ -2083,7 +2092,11 @@ int user_connect(struct socket *so, stru error = pthread_cond_wait(SOCK_COND(so), SOCK_MTX(so)); #endif if (error) { @@ -40,7 +40,7 @@ $NetBSD: patch-netwerk_sctp_src_user__socket.c,v 1.1 2013/06/26 11:32:12 ryoon E interrupted = 1; break; } -@@ -2157,8 +2170,10 @@ int user_connect(struct socket *so, stru +@@ -2097,8 +2110,10 @@ int user_connect(struct socket *so, stru bad: if (!interrupted) so->so_state &= ~SS_ISCONNECTING; diff --git a/www/firefox/patches/patch-netwerk_sctp_src_user__socketvar.h b/www/firefox/patches/patch-netwerk_sctp_src_user__socketvar.h index 70bd3e69213..4696fbedf7f 100644 --- a/www/firefox/patches/patch-netwerk_sctp_src_user__socketvar.h +++ b/www/firefox/patches/patch-netwerk_sctp_src_user__socketvar.h @@ -1,6 +1,6 @@ -$NetBSD: patch-netwerk_sctp_src_user__socketvar.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $ +$NetBSD: patch-netwerk_sctp_src_user__socketvar.h,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/sctp/src/user_socketvar.h.orig 2013-06-17 22:13:23.000000000 +0000 +--- netwerk/sctp/src/user_socketvar.h.orig 2014-01-28 04:04:00.000000000 +0000 +++ netwerk/sctp/src/user_socketvar.h @@ -47,7 +47,7 @@ /* #include <sys/_lock.h> was 0 byte file */ diff --git a/www/firefox/patches/patch-netwerk_wifi_moz.build b/www/firefox/patches/patch-netwerk_wifi_moz.build index 76ab2625781..f3ad291d006 100644 --- a/www/firefox/patches/patch-netwerk_wifi_moz.build +++ b/www/firefox/patches/patch-netwerk_wifi_moz.build @@ -1,9 +1,9 @@ -$NetBSD: patch-netwerk_wifi_moz.build,v 1.3 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-netwerk_wifi_moz.build,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/wifi/moz.build.orig 2013-12-05 16:07:52.000000000 +0000 +--- netwerk/wifi/moz.build.orig 2014-01-28 04:04:01.000000000 +0000 +++ netwerk/wifi/moz.build @@ -38,6 +38,10 @@ if CONFIG['OS_ARCH'] == 'Darwin': - CMMSRCS += [ + SOURCES += [ 'osx_corewlan.mm', ] +elif CONFIG['OS_ARCH'] == 'FreeBSD': @@ -11,5 +11,5 @@ $NetBSD: patch-netwerk_wifi_moz.build,v 1.3 2013/12/15 13:54:37 ryoon Exp $ + 'nsWifiScannerFreeBSD.cpp', + ] elif CONFIG['OS_ARCH'] == 'WINNT': - CPP_SOURCES += [ + SOURCES += [ 'nsWifiScannerWin.cpp', diff --git a/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp b/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp index 2268fedd8d8..28e9009ef5b 100644 --- a/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp +++ b/www/firefox/patches/patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp,v 1.1 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- netwerk/wifi/nsWifiScannerFreeBSD.cpp.orig 2013-09-14 15:17:47.000000000 +0000 +--- netwerk/wifi/nsWifiScannerFreeBSD.cpp.orig 2014-02-08 06:57:28.000000000 +0000 +++ netwerk/wifi/nsWifiScannerFreeBSD.cpp @@ -0,0 +1,172 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public diff --git a/www/firefox/patches/patch-pb b/www/firefox/patches/patch-pb index 2a486db3c8d..022e1baf686 100644 --- a/www/firefox/patches/patch-pb +++ b/www/firefox/patches/patch-pb @@ -1,6 +1,6 @@ -$NetBSD: patch-pb,v 1.2 2013/08/07 12:17:54 ryoon Exp $ +$NetBSD: patch-pb,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- xulrunner/installer/libxul.pc.in.orig 2013-07-30 00:59:18.000000000 +0000 +--- xulrunner/installer/libxul.pc.in.orig 2014-01-28 04:04:07.000000000 +0000 +++ xulrunner/installer/libxul.pc.in @@ -7,5 +7,5 @@ Name: libxul Description: The Mozilla Runtime and Embedding Engine diff --git a/www/firefox/patches/patch-pc b/www/firefox/patches/patch-pc index cbb4e7bef97..c528e9a152f 100644 --- a/www/firefox/patches/patch-pc +++ b/www/firefox/patches/patch-pc @@ -1,6 +1,6 @@ -$NetBSD: patch-pc,v 1.2 2013/08/07 12:17:54 ryoon Exp $ +$NetBSD: patch-pc,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- xulrunner/installer/libxul-embedding.pc.in.orig 2013-07-30 00:59:18.000000000 +0000 +--- xulrunner/installer/libxul-embedding.pc.in.orig 2014-01-28 04:04:07.000000000 +0000 +++ xulrunner/installer/libxul-embedding.pc.in @@ -6,5 +6,6 @@ idldir=%idldir% Name: libxul-embedding diff --git a/www/firefox/patches/patch-rc b/www/firefox/patches/patch-rc index 77238838924..ce15cbaa224 100644 --- a/www/firefox/patches/patch-rc +++ b/www/firefox/patches/patch-rc @@ -1,6 +1,6 @@ -$NetBSD: patch-rc,v 1.3 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-rc,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2013-01-04 23:44:28.000000000 +0000 +--- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2014-01-28 04:03:33.000000000 +0000 +++ browser/branding/unofficial/locales/en-US/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/www/firefox/patches/patch-security_manager_ssl_src_JARSignatureVerification.cpp b/www/firefox/patches/patch-security_manager_ssl_src_JARSignatureVerification.cpp index 1ef179f4d4f..b8bd4b9b1e9 100644 --- a/www/firefox/patches/patch-security_manager_ssl_src_JARSignatureVerification.cpp +++ b/www/firefox/patches/patch-security_manager_ssl_src_JARSignatureVerification.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-security_manager_ssl_src_JARSignatureVerification.cpp,v 1.1 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-security_manager_ssl_src_JARSignatureVerification.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- security/manager/ssl/src/JARSignatureVerification.cpp.orig 2013-09-10 03:43:51.000000000 +0000 +--- security/manager/ssl/src/JARSignatureVerification.cpp.orig 2014-01-28 04:04:01.000000000 +0000 +++ security/manager/ssl/src/JARSignatureVerification.cpp @@ -596,9 +596,9 @@ OpenSignedJARFile(nsIFile * aJarFile, } diff --git a/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp index 7fcd53325a8..618d7ba1f30 100644 --- a/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ b/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-security_manager_ssl_src_nsNSSComponent.cpp,v 1.2 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-security_manager_ssl_src_nsNSSComponent.cpp,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig 2013-09-10 03:43:51.000000000 +0000 +--- security/manager/ssl/src/nsNSSComponent.cpp.orig 2014-01-28 04:04:01.000000000 +0000 +++ security/manager/ssl/src/nsNSSComponent.cpp -@@ -49,6 +49,7 @@ +@@ -53,6 +53,7 @@ #include "nss.h" #include "ssl.h" diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm index 4b0a30a148d..965e312bc59 100644 --- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm +++ b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__back.jsm @@ -1,76 +1,65 @@ -$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.2 2013/11/13 14:12:31 ryoon Exp $ +$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.3 2014/02/08 09:36:00 ryoon Exp $ Based on martin@'s patch for firefox 27.0 * Use off_t for st_size * Use function name for NetBSD ---- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2013-10-25 22:27:41.000000000 +0000 +--- toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2014-01-28 04:04:04.000000000 +0000 +++ toolkit/components/osfile/modules/osfile_unix_back.jsm -@@ -170,7 +170,7 @@ - } - - stat.add_field_at(OS.Constants.libc.OSFILE_OFFSETOF_STAT_ST_SIZE, -- "st_size", Types.size_t.implementation); -+ "st_size", Types.off_t.implementation); - Types.stat = stat.getType(); - } - -@@ -397,10 +397,17 @@ - /*oflags*/Types.int, - /*mode*/ Types.int); +@@ -380,9 +380,17 @@ + /*oflags*/Type.int, + /*mode*/ Type.int); + if (OS.Constants.Sys.Name == "NetBSD") { -+ UnixFile.opendir = -+ declareFFI("__opendir30", ctypes.default_abi, -+ /*return*/ Types.null_or_DIR_ptr, -+ /*path*/ Types.path); ++ // NetBSD 5.0 uses *30, and netbsd-6 uses *50 ++ let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50"; ++ declareLazyFFI(SysFile, "opendir", libc, "__opendir"+v, ctypes.default_abi, ++ /*return*/ Type.null_or_DIR_ptr, ++ /*path*/ Type.path); + } else { - UnixFile.opendir = - declareFFI("opendir", ctypes.default_abi, - /*return*/ Types.null_or_DIR_ptr, - /*path*/ Types.path); -+ } + declareLazyFFI(SysFile, "opendir", libc, "opendir", ctypes.default_abi, + /*return*/ Type.null_or_DIR_ptr, + /*path*/ Type.path); ++ } - UnixFile.pread = - declareFFI("pread", ctypes.default_abi, -@@ -434,6 +441,11 @@ - declareFFI("readdir$INODE64", ctypes.default_abi, - /*return*/Types.null_or_dirent_ptr, - /*dir*/ Types.DIR.in_ptr); // For MacOS X -+ } else if (OS.Constants.Sys.Name == "NetBSD") { -+ UnixFile.readdir = -+ declareFFI("__readdir30", ctypes.default_abi, -+ /*return*/Types.null_or_dirent_ptr, -+ /*dir*/ Types.DIR.in_ptr); + declareLazyFFI(SysFile, "pread", libc, "pread", ctypes.default_abi, + /*return*/ Type.negativeone_or_ssize_t, +@@ -419,6 +427,12 @@ + declareLazyFFI(SysFile, "readdir", libc, "readdir$INODE64", ctypes.default_abi, + /*return*/Type.null_or_dirent_ptr, + /*dir*/ Type.DIR.in_ptr); // For MacOS X ++ } else if (OS.Constants.Sys.Name == "NetBD") { ++ // NetBSD 5.0 uses *30, and netbsd-6 uses *50 ++ let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50"; ++ declareLazyFFI(SysFile, "readdir", libc, "__readdir"+v, ctypes.default_abi, ++ /*return*/Type.null_or_dirent_ptr, ++ /*dir*/ Type.DIR.in_ptr); } else { - UnixFile.readdir = - declareFFI("readdir", ctypes.default_abi, -@@ -553,6 +565,27 @@ - UnixFile.fstat = function stat(fd, buf) { - return fxstat(ver, fd, buf); + declareLazyFFI(SysFile, "readdir", libc, "readdir", ctypes.default_abi, + /*return*/Type.null_or_dirent_ptr, +@@ -529,6 +543,24 @@ + SysFile.fstat = function fstat(fd, buf) { + return Stat.fxstat(ver, fd, buf); }; + } else if (OS.Constants.Sys.Name == "NetBSD") { + // NetBSD 5.0 uses *30, and netbsd-6 uses *50 + let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50"; -+ UnixFile.stat = -+ declareFFI("__stat"+v, ctypes.default_abi, -+ /*return*/ Types.negativeone_or_nothing, -+ /*path*/ Types.path, -+ /*buf*/ Types.stat.out_ptr ++ declareLazyFFI(SysFile, "stat", libc, "__stat"+v, ctypes.default_abi, ++ /*return*/ Type.negativeone_or_nothing, ++ /*path*/ Type.path, ++ /*buf*/ Type.stat.out_ptr + ); -+ UnixFile.lstat = -+ declareFFI("__lstat"+v, ctypes.default_abi, -+ /*return*/ Types.negativeone_or_nothing, -+ /*path*/ Types.path, -+ /*buf*/ Types.stat.out_ptr ++ declareLazyFFI(SysFile, "lstat", libc, "__lstat"+v, ctypes.default_abi, ++ /*return*/ Type.negativeone_or_nothing, ++ /*path*/ Type.path, ++ /*buf*/ Type.stat.out_ptr + ); -+ UnixFile.fstat = -+ declareFFI("__fstat"+v, ctypes.default_abi, -+ /*return*/ Types.negativeone_or_nothing, -+ /*fd*/ Types.fd, -+ /*buf*/ Types.stat.out_ptr ++ declareLazyFFI(SysFile, "fstat", libc, "__fstat"+v, ctypes.default_abi, ++ /*return*/ Type.negativeone_or_nothing, ++ /*fd*/ Type.fd, ++ /*buf*/ Type.stat.out_ptr + ); } else { // Mac OS X 32-bits, other Unix - UnixFile.stat = + declareLazyFFI(SysFile, "stat", libc, "stat", ctypes.default_abi, diff --git a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm b/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm deleted file mode 100644 index 6570d17c772..00000000000 --- a/www/firefox/patches/patch-toolkit_components_osfile_modules_osfile__unix__front.jsm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.1 2013/11/07 15:47:23 ryoon Exp $ - -* Use off_t for st_size - ---- toolkit/components/osfile/modules/osfile_unix_front.jsm.orig 2013-10-25 22:27:41.000000000 +0000 -+++ toolkit/components/osfile/modules/osfile_unix_front.jsm -@@ -734,7 +734,7 @@ - File.Info = function Info(stat) { - let isDir = (stat.st_mode & OS.Constants.libc.S_IFMT) == OS.Constants.libc.S_IFDIR; - let isSymLink = (stat.st_mode & OS.Constants.libc.S_IFMT) == OS.Constants.libc.S_IFLNK; -- let size = exports.OS.Shared.Type.size_t.importFromC(stat.st_size); -+ let size = exports.OS.Shared.Type.off_t.importFromC(stat.st_size); - - let lastAccessDate = new Date(stat.st_atime * 1000); - let lastModificationDate = new Date(stat.st_mtime * 1000); diff --git a/www/firefox/patches/patch-toolkit_library_Makefile.in b/www/firefox/patches/patch-toolkit_library_Makefile.in index 872dec163ff..1ce35bfdb3c 100644 --- a/www/firefox/patches/patch-toolkit_library_Makefile.in +++ b/www/firefox/patches/patch-toolkit_library_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_library_Makefile.in,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-toolkit_library_Makefile.in,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- toolkit/library/Makefile.in.orig 2013-12-05 16:07:57.000000000 +0000 +--- toolkit/library/Makefile.in.orig 2014-01-28 04:04:05.000000000 +0000 +++ toolkit/library/Makefile.in -@@ -399,6 +399,7 @@ endif +@@ -407,6 +407,7 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) ifdef MOZ_WEBRTC @@ -10,7 +10,7 @@ $NetBSD: patch-toolkit_library_Makefile.in,v 1.2 2013/12/15 13:54:37 ryoon Exp $ ifdef MOZ_PEERCONNECTION COMPONENT_LIBS += peerconnection endif -@@ -541,6 +542,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm) +@@ -552,6 +553,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm) EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols endif @@ -19,5 +19,5 @@ $NetBSD: patch-toolkit_library_Makefile.in,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +endif + ifeq ($(OS_ARCH),WINNT) - OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet) + OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid) ifdef ACCESSIBILITY diff --git a/www/firefox/patches/patch-toolkit_mozapps_update_updater_updater.cpp b/www/firefox/patches/patch-toolkit_mozapps_update_updater_updater.cpp index 0481d4d60f7..626cc7a0878 100644 --- a/www/firefox/patches/patch-toolkit_mozapps_update_updater_updater.cpp +++ b/www/firefox/patches/patch-toolkit_mozapps_update_updater_updater.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_mozapps_update_updater_updater.cpp,v 1.1 2013/08/22 21:19:01 joerg Exp $ +$NetBSD: patch-toolkit_mozapps_update_updater_updater.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- toolkit/mozapps/update/updater/updater.cpp.orig 2013-08-20 13:38:52.000000000 +0000 +--- toolkit/mozapps/update/updater/updater.cpp.orig 2014-01-28 04:04:06.000000000 +0000 +++ toolkit/mozapps/update/updater/updater.cpp -@@ -123,7 +123,10 @@ static bool sUseHardLinks = true; +@@ -127,7 +127,10 @@ static bool sUseHardLinks = true; // declare it here to avoid including that entire header file. #define BZ2_CRC32TABLE_UNDECLARED diff --git a/www/firefox/patches/patch-toolkit_toolkit.mozbuild b/www/firefox/patches/patch-toolkit_toolkit.mozbuild index e0d1b78f304..4967e0df5b7 100644 --- a/www/firefox/patches/patch-toolkit_toolkit.mozbuild +++ b/www/firefox/patches/patch-toolkit_toolkit.mozbuild @@ -1,6 +1,6 @@ -$NetBSD: patch-toolkit_toolkit.mozbuild,v 1.2 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-toolkit_toolkit.mozbuild,v 1.3 2014/02/08 09:36:00 ryoon Exp $ ---- toolkit/toolkit.mozbuild.orig 2013-12-05 16:07:58.000000000 +0000 +--- toolkit/toolkit.mozbuild.orig 2014-01-28 04:04:06.000000000 +0000 +++ toolkit/toolkit.mozbuild @@ -43,8 +43,8 @@ add_tier_dir('platform', [ if CONFIG['MOZ_AUTH_EXTENSION']: diff --git a/www/firefox/patches/patch-toolkit_xre_Makefile.in b/www/firefox/patches/patch-toolkit_xre_Makefile.in index 780d784010e..860d8b44b5b 100644 --- a/www/firefox/patches/patch-toolkit_xre_Makefile.in +++ b/www/firefox/patches/patch-toolkit_xre_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_xre_Makefile.in,v 1.1 2013/09/19 12:37:50 ryoon Exp $ +$NetBSD: patch-toolkit_xre_Makefile.in,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- toolkit/xre/Makefile.in.orig 2013-09-10 03:43:56.000000000 +0000 +--- toolkit/xre/Makefile.in.orig 2014-01-28 04:04:06.000000000 +0000 +++ toolkit/xre/Makefile.in -@@ -216,5 +216,3 @@ GARBAGE += platform.ini +@@ -191,5 +191,3 @@ GARBAGE += platform.ini libs:: platform.ini $(INSTALL) $^ $(DIST)/bin diff --git a/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp b/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp index a1c130735c4..61e454b22e7 100644 --- a/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp +++ b/www/firefox/patches/patch-toolkit_xre_nsEmbedFunctions.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- toolkit/xre/nsEmbedFunctions.cpp.orig 2013-05-11 19:19:55.000000000 +0000 +--- toolkit/xre/nsEmbedFunctions.cpp.orig 2014-01-28 04:04:06.000000000 +0000 +++ toolkit/xre/nsEmbedFunctions.cpp -@@ -239,7 +239,7 @@ XRE_SetRemoteExceptionHandler(const char +@@ -242,7 +242,7 @@ XRE_SetRemoteExceptionHandler(const char { #if defined(XP_WIN) || defined(XP_MACOSX) return CrashReporter::SetRemoteExceptionHandler(nsDependentCString(aPipe)); @@ -11,7 +11,7 @@ $NetBSD: patch-toolkit_xre_nsEmbedFunctions.cpp,v 1.1 2013/07/17 11:00:13 jperki return CrashReporter::SetRemoteExceptionHandler(); #else # error "OOP crash reporter unsupported on this platform" -@@ -351,7 +351,7 @@ XRE_InitChildProcess(int aArgc, +@@ -390,7 +390,7 @@ XRE_InitChildProcess(int aArgc, // Bug 684322 will add better visibility into this condition NS_WARNING("Could not setup crash reporting\n"); } diff --git a/www/firefox/patches/patch-xb b/www/firefox/patches/patch-xb index 8e6bc80d8b2..8a77456a3c3 100644 --- a/www/firefox/patches/patch-xb +++ b/www/firefox/patches/patch-xb @@ -1,8 +1,8 @@ -$NetBSD: patch-xb,v 1.3 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xb,v 1.4 2014/02/08 09:36:00 ryoon Exp $ NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2013-01-09 15:25:54.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2014-02-08 06:57:28.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp @@ -0,0 +1,84 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/www/firefox/patches/patch-xc b/www/firefox/patches/patch-xc index cb184ec9803..6264f7edd9d 100644 --- a/www/firefox/patches/patch-xc +++ b/www/firefox/patches/patch-xc @@ -1,8 +1,8 @@ -$NetBSD: patch-xc,v 1.3 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xc,v 1.4 2014/02/08 09:36:00 ryoon Exp $ NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2013-01-09 15:25:54.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2014-02-08 06:57:28.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s @@ -0,0 +1,66 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/www/firefox/patches/patch-xe b/www/firefox/patches/patch-xe index c279674d445..0073cdc5c0a 100644 --- a/www/firefox/patches/patch-xe +++ b/www/firefox/patches/patch-xe @@ -1,6 +1,6 @@ -$NetBSD: patch-xe,v 1.3 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xe,v 1.4 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp @@ -100,6 +100,15 @@ extern "C" { } diff --git a/www/firefox/patches/patch-xf b/www/firefox/patches/patch-xf index 677b4d2fd74..d4f3c1cffdf 100644 --- a/www/firefox/patches/patch-xf +++ b/www/firefox/patches/patch-xf @@ -1,8 +1,8 @@ -$NetBSD: patch-xf,v 1.3 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xf,v 1.4 2014/02/08 09:36:00 ryoon Exp $ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae. ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp @@ -91,17 +91,27 @@ extern "C" { } diff --git a/www/firefox/patches/patch-xg b/www/firefox/patches/patch-xg index d7acfa1fd6d..e880e24272c 100644 --- a/www/firefox/patches/patch-xg +++ b/www/firefox/patches/patch-xg @@ -1,8 +1,8 @@ -$NetBSD: patch-xg,v 1.3 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xg,v 1.4 2014/02/08 09:36:00 ryoon Exp $ NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm. ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp @@ -86,18 +86,23 @@ PrepareAndDispatch(nsXPTCStubBase* self, * so they are contiguous with values passed on the stack, and then calls diff --git a/www/firefox/patches/patch-xj b/www/firefox/patches/patch-xj deleted file mode 100644 index b4c0d9a6687..00000000000 --- a/www/firefox/patches/patch-xj +++ /dev/null @@ -1,128 +0,0 @@ -$NetBSD: patch-xj,v 1.3 2013/05/23 13:12:13 ryoon Exp $ - -NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. - ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2013-01-04 23:44:47.000000000 +0000 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp -@@ -6,6 +6,7 @@ - // Implement shared vtbl methods. - - #include "xptcprivate.h" -+#include "xptiprivate.h" - - // The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral - // parameters and the first 8 floating point parameters in registers -@@ -36,7 +37,6 @@ PrepareAndDispatch(nsXPTCStubBase* self, - { - nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; - nsXPTCMiniVariant* dispatchParams = NULL; -- nsIInterfaceInfo* iface_info = NULL; - const nsXPTMethodInfo* info; - uint32_t paramCount; - uint32_t i; -@@ -44,11 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self, - - NS_ASSERTION(self,"no self"); - -- self->GetInterfaceInfo(&iface_info); -- NS_ASSERTION(iface_info,"no interface info"); -- if (! iface_info) -- return NS_ERROR_UNEXPECTED; -- -+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info); - iface_info->GetMethodInfo(uint16_t(methodIndex), &info); - NS_ASSERTION(info,"no method info"); - if (! info) -@@ -84,8 +80,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, - if ((uint32_t) ap & 4) ap++; // doubles are 8-byte aligned on stack - dp->val.d = *(double*) ap; - ap += 2; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 2; -+#endif - } - continue; - } -@@ -95,8 +93,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, - else { - dp->val.f = *(float*) ap; - ap += 1; -+#if __GXX_ABI_VERSION < 100 - if (gpr < GPR_COUNT) - gpr += 1; -+#endif - } - continue; - } -@@ -144,9 +144,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, - } - } - -- result = self->CallMethod((uint16_t) methodIndex, info, dispatchParams); -- -- NS_RELEASE(iface_info); -+ result = self->mOuter->CallMethod((PRUint16) methodIndex, -+ info, -+ dispatchParams); - - if (dispatchParams != paramBuffer) - delete [] dispatchParams; -@@ -160,7 +160,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, - // however, it's quick, dirty, and'll break when the ABI changes on - // us, which is what we want ;-). - --#define STUB_ENTRY(n) \ -+#if __GXX_ABI_VERSION < 100 -+// gcc-2 version -+# define STUB_ENTRY(n) \ - __asm__ ( \ - ".section \".text\" \n\t" \ - ".align 2 \n\t" \ -@@ -171,6 +173,46 @@ __asm__ ( - "li 11,"#n" \n\t" \ - "b SharedStub@local \n" \ - ); -+#else -+// gcc-3 version -+// -+// As G++3 ABI contains the length of the functionname in the mangled -+// name, it is difficult to get a generic assembler mechanism like -+// in the G++ 2.95 case. -+// Create names would be like: -+// _ZN14nsXPTCStubBase5Stub1Ev -+// _ZN14nsXPTCStubBase6Stub12Ev -+// _ZN14nsXPTCStubBase7Stub123Ev -+// _ZN14nsXPTCStubBase8Stub1234Ev -+// etc. -+// Use assembler directives to get the names right... -+ -+# define STUB_ENTRY(n) \ -+__asm__ ( \ -+ ".align 2 \n\t" \ -+ ".if "#n" < 10 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 100 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ -+ \ -+ ".elseif "#n" < 1000 \n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ -+ \ -+ ".else \n\t" \ -+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ -+ ".endif \n\t" \ -+ \ -+ "li 11,"#n" \n\t" \ -+ "b SharedStub@local \n" \ -+); -+#endif - - #define SENTINEL_ENTRY(n) \ - nsresult nsXPTCStubBase::Sentinel##n() \ diff --git a/www/firefox/patches/patch-xl b/www/firefox/patches/patch-xl index a1a3aea2833..0f12df46474 100644 --- a/www/firefox/patches/patch-xl +++ b/www/firefox/patches/patch-xl @@ -1,8 +1,8 @@ -$NetBSD: patch-xl,v 1.4 2014/02/08 06:47:08 obache Exp $ +$NetBSD: patch-xl,v 1.5 2014/02/08 09:36:00 ryoon Exp $ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla. ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2013-12-05 16:08:00.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s @@ -20,15 +20,15 @@ diff --git a/www/firefox/patches/patch-xm b/www/firefox/patches/patch-xm index 5ec641e821c..62e97c58537 100644 --- a/www/firefox/patches/patch-xm +++ b/www/firefox/patches/patch-xm @@ -1,8 +1,8 @@ -$NetBSD: patch-xm,v 1.3 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xm,v 1.4 2014/02/08 09:36:00 ryoon Exp $ NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla. ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2013-01-04 23:44:47.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp @@ -5,9 +5,9 @@ diff --git a/www/firefox/patches/patch-xn b/www/firefox/patches/patch-xn index d1df51f4031..6fad28bd0ee 100644 --- a/www/firefox/patches/patch-xn +++ b/www/firefox/patches/patch-xn @@ -1,6 +1,6 @@ -$NetBSD: patch-xn,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xn,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2013-01-04 23:44:47.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s @@ -16,6 +16,47 @@ #include <sys/asm.h> diff --git a/www/firefox/patches/patch-xo b/www/firefox/patches/patch-xo index 3b559851216..dc09a79bce5 100644 --- a/www/firefox/patches/patch-xo +++ b/www/firefox/patches/patch-xo @@ -1,6 +1,6 @@ -$NetBSD: patch-xo,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xo,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2013-01-04 23:44:47.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s @@ -14,6 +14,47 @@ #include <sys/asm.h> diff --git a/www/firefox/patches/patch-xpcom_base_nsMemoryInfoDumper.cpp b/www/firefox/patches/patch-xpcom_base_nsMemoryInfoDumper.cpp index 36ad1f8ad09..5212daeb585 100644 --- a/www/firefox/patches/patch-xpcom_base_nsMemoryInfoDumper.cpp +++ b/www/firefox/patches/patch-xpcom_base_nsMemoryInfoDumper.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-xpcom_base_nsMemoryInfoDumper.cpp,v 1.1 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-xpcom_base_nsMemoryInfoDumper.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/base/nsMemoryInfoDumper.cpp.orig 2013-12-05 16:08:00.000000000 +0000 +--- xpcom/base/nsMemoryInfoDumper.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/base/nsMemoryInfoDumper.cpp -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include <unistd.h> #endif @@ -11,7 +11,7 @@ $NetBSD: patch-xpcom_base_nsMemoryInfoDumper.cpp,v 1.1 2013/12/15 13:54:37 ryoon #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -@@ -109,7 +109,7 @@ private: +@@ -110,7 +110,7 @@ private: } // anonymous namespace @@ -20,7 +20,7 @@ $NetBSD: patch-xpcom_base_nsMemoryInfoDumper.cpp,v 1.1 2013/12/15 13:54:37 ryoon namespace { /* -@@ -548,7 +548,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( +@@ -549,7 +549,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper( /* static */ void nsMemoryInfoDumper::Initialize() { diff --git a/www/firefox/patches/patch-xpcom_base_nsMemoryReporterManager.cpp b/www/firefox/patches/patch-xpcom_base_nsMemoryReporterManager.cpp index ae1df00b4f1..9bb9fd1691f 100644 --- a/www/firefox/patches/patch-xpcom_base_nsMemoryReporterManager.cpp +++ b/www/firefox/patches/patch-xpcom_base_nsMemoryReporterManager.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-xpcom_base_nsMemoryReporterManager.cpp,v 1.1 2013/12/15 13:54:37 ryoon Exp $ +$NetBSD: patch-xpcom_base_nsMemoryReporterManager.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/base/nsMemoryReporterManager.cpp.orig 2013-12-05 16:08:00.000000000 +0000 +--- xpcom/base/nsMemoryReporterManager.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/base/nsMemoryReporterManager.cpp -@@ -196,6 +196,43 @@ static nsresult GetResidentFast(int64_t* - return GetResident(aN); +@@ -201,6 +201,43 @@ ResidentFastDistinguishedAmount(int64_t* + return ResidentDistinguishedAmount(aN); } +#ifdef __FreeBSD__ @@ -46,8 +46,8 @@ $NetBSD: patch-xpcom_base_nsMemoryReporterManager.cpp,v 1.1 2013/12/15 13:54:37 #elif defined(SOLARIS) #include <procfs.h> -@@ -370,6 +407,24 @@ static nsresult GetResidentFast(int64_t* - } +@@ -428,6 +465,24 @@ public: + }; #define HAVE_PRIVATE_REPORTER +static nsresult @@ -71,7 +71,7 @@ $NetBSD: patch-xpcom_base_nsMemoryReporterManager.cpp,v 1.1 2013/12/15 13:54:37 class PrivateReporter MOZ_FINAL : public MemoryUniReporter { public: -@@ -382,21 +437,10 @@ public: +@@ -440,21 +495,10 @@ public: NS_IMETHOD GetAmount(int64_t* aAmount) { @@ -95,7 +95,7 @@ $NetBSD: patch-xpcom_base_nsMemoryReporterManager.cpp,v 1.1 2013/12/15 13:54:37 #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS class VsizeReporter MOZ_FINAL : public MemoryUniReporter -@@ -780,7 +824,7 @@ nsMemoryReporterManager::Init() +@@ -842,7 +886,7 @@ nsMemoryReporterManager::Init() RegisterReporter(new mozilla::dmd::DMDReporter); #endif diff --git a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp index 77004ba7228..5d5ede4901a 100644 --- a/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp +++ b/www/firefox/patches/patch-xpcom_base_nsStackWalk.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.1 2013/07/17 11:00:13 jperkin Exp $ +$NetBSD: patch-xpcom_base_nsStackWalk.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/base/nsStackWalk.cpp.orig 2013-05-11 19:19:56.000000000 +0000 +--- xpcom/base/nsStackWalk.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/base/nsStackWalk.cpp @@ -853,7 +853,7 @@ void DemangleSymbol(const char * aSymbol } diff --git a/www/firefox/patches/patch-xpcom_ds_TimeStamp.h b/www/firefox/patches/patch-xpcom_ds_TimeStamp.h index 156e30f6c26..eb6787a09dd 100644 --- a/www/firefox/patches/patch-xpcom_ds_TimeStamp.h +++ b/www/firefox/patches/patch-xpcom_ds_TimeStamp.h @@ -1,10 +1,10 @@ -$NetBSD: patch-xpcom_ds_TimeStamp.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xpcom_ds_TimeStamp.h,v 1.2 2014/02/08 09:36:00 ryoon Exp $ http://gnats.netbsd.org/47233 ---- xpcom/ds/TimeStamp.h.orig 2013-01-04 23:44:47.000000000 +0000 +--- xpcom/ds/TimeStamp.h.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/ds/TimeStamp.h -@@ -130,11 +130,11 @@ private: +@@ -161,11 +161,11 @@ private: // NOTE: this MUST be a >= test, because int64_t(double(INT64_MAX)) // overflows and gives INT64_MIN. if (aTicks >= double(INT64_MAX)) diff --git a/www/firefox/patches/patch-xpcom_ds_moz.build b/www/firefox/patches/patch-xpcom_ds_moz.build deleted file mode 100644 index cf300e2d329..00000000000 --- a/www/firefox/patches/patch-xpcom_ds_moz.build +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-xpcom_ds_moz.build,v 1.3 2013/12/15 13:54:37 ryoon Exp $ - -* Honor sFirstTimeStamp and sProcessCreation, fix segfault. - ---- xpcom/ds/moz.build.orig 2013-12-05 16:08:00.000000000 +0000 -+++ xpcom/ds/moz.build -@@ -90,7 +90,6 @@ CPP_SOURCES += [ - 'nsSupportsArrayEnumerator.cpp', - 'nsSupportsPrimitives.cpp', - 'nsVariant.cpp', -- 'TimeStamp.cpp', - ] - - if CONFIG['OS_ARCH'] == 'WINNT': -@@ -108,6 +107,10 @@ elif CONFIG['OS_ARCH'] == 'Darwin': - else: - error('No TimeStamp implementation on this platform. Build will not succeed') - -+CPP_SOURCES += [ -+ 'TimeStamp.cpp', -+] -+ - EXTRA_COMPONENTS += [ - 'nsINIProcessor.js', - 'nsINIProcessor.manifest', diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_moz.build b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_moz.build index 71b68c243d7..6b706638fc6 100644 --- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_moz.build +++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_moz.build @@ -1,17 +1,17 @@ -$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_moz.build,v 1.2 2013/09/24 22:19:03 ryoon Exp $ +$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_moz.build,v 1.3 2014/02/08 09:36:00 ryoon Exp $ * Support NetBSD/amd64 and DragonFly/amd64. ---- xpcom/reflect/xptcall/src/md/unix/moz.build.orig 2013-09-11 03:22:57.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/moz.build.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/moz.build -@@ -19,14 +19,14 @@ if CONFIG['OS_ARCH'] == 'Darwin': - 'xptcstubs_gcc_x86_unix.cpp', - ] +@@ -12,14 +12,14 @@ if CONFIG['OS_ARCH'] == 'Darwin': + 'xptcstubs_darwin.cpp', + ] -if CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD', 'GNU'): +if CONFIG['OS_ARCH'] in ('OpenBSD', 'GNU'): if CONFIG['CPU_ARCH'] == 'x86': - CPP_SOURCES += [ + SOURCES += [ 'xptcinvoke_gcc_x86_unix.cpp', 'xptcstubs_gcc_x86_unix.cpp' ] @@ -20,4 +20,4 @@ $NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_moz.build,v 1.2 2013/09/24 22:1 +if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'DragonFly') or \ CONFIG['OS_ARCH'].startswith('GNU_'): if CONFIG['OS_TEST'] == 'x86_64': - CPP_SOURCES += [ + SOURCES += [ diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp index 2f1a49545cb..7ea22e5c46e 100644 --- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp +++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp.orig 2013-05-11 19:19:56.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp @@ -9,7 +9,7 @@ #include "xptc_gcc_x86_unix.h" diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp index f0d9d00e511..3309248e552 100644 --- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp +++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.1 2013/05/23 13:12:13 ryoon Exp $ +$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.2 2014/02/08 09:36:00 ryoon Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp.orig 2013-05-11 19:19:56.000000000 +0000 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp.orig 2014-01-28 04:04:07.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp @@ -10,7 +10,7 @@ #include "xptc_gcc_x86_unix.h" diff --git a/www/firefox/patches/patch-xpcom_string_public_nsAlgorithm.h b/www/firefox/patches/patch-xpcom_string_public_nsAlgorithm.h deleted file mode 100644 index 4c7c0fbc11f..00000000000 --- a/www/firefox/patches/patch-xpcom_string_public_nsAlgorithm.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-xpcom_string_public_nsAlgorithm.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $ - ---- xpcom/string/public/nsAlgorithm.h.orig 2013-05-11 19:19:56.000000000 +0000 -+++ xpcom/string/public/nsAlgorithm.h -@@ -45,7 +45,10 @@ XPCOM_MAX( const T& a, const T& b ) - return a > b ? a : b; - } - --#if defined(_MSC_VER) && (_MSC_VER < 1600) -+#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \ -+ ((defined(__GLIBCXX__) && __GLIBCXX__ < 20121005) && \ -+ (defined(_GLIBCXX_USE_LONG_LONG) && \ -+ (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC))) - namespace std { - inline - long long diff --git a/www/firefox/patches/patch-xulrunner_installer_Makefile.in b/www/firefox/patches/patch-xulrunner_installer_Makefile.in index 734ce512554..df055631973 100644 --- a/www/firefox/patches/patch-xulrunner_installer_Makefile.in +++ b/www/firefox/patches/patch-xulrunner_installer_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-xulrunner_installer_Makefile.in,v 1.1 2013/08/07 12:17:54 ryoon Exp $ +$NetBSD: patch-xulrunner_installer_Makefile.in,v 1.2 2014/02/08 09:36:00 ryoon Exp $ * Install pkg-config pc files to package specific directory. ---- xulrunner/installer/Makefile.in.orig 2013-07-30 00:59:18.000000000 +0000 +--- xulrunner/installer/Makefile.in.orig 2014-01-28 04:04:07.000000000 +0000 +++ xulrunner/installer/Makefile.in -@@ -96,7 +96,7 @@ endif +@@ -86,7 +86,7 @@ endif install:: $(pkg_config_files) @echo pkg_config_file: $(pkg_config_files) |