diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-03-17 19:50:42 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-03-17 19:50:42 +0000 |
| commit | df64fbb76a3a413e305aa625768827b70062fb4e (patch) | |
| tree | 571891b0f12db93d26c7035142675a4d0bf916ac | |
| parent | 52cca330a0a22fe57e74e824bee4aaefe42a6684 (diff) | |
| download | pkgsrc-df64fbb76a3a413e305aa625768827b70062fb4e.tar.gz | |
Update to 2.33
* gnome option is broken. Disable it.
Changelog:
What's New in SeaMonkey 2.33
SeaMonkey 2.33 contains the following major changes relative to SeaMonkey 2.32.1:
SeaMonkey-specific changes
Security notification bars now feature tracking controls.
The tracking/privacy preferences pane has been updated.
Mozilla platform changes
The Flash protected-mode sandbox has been disabled on Windows in order to evaluate the stability impact of protected mode.
Insecure RC4 ciphers are no longer accepted whenever possible.
Certificates with 1024-bit RSA keys have been phased out.
A subset of the Media Source Extensions (MSE) API has been implemented in order to allow native HTML5 playback on YouTube. Full support is on the way.
The performance of the new ES6 generator functions has been improved.
Also see Firefox 36 for Developers.
Fixed several stability issues.
Bugs fixed in this release
SeaMonkey bugs
Thunderbird bugs (including both shared MailNews- and Thunderbird-only bugs)
Relevant security fixes are listed on Security Advisories for SeaMonkey.
* Security advisories are not available yet.
66 files changed, 892 insertions, 863 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 1fdd5ec7a36..4453fbad997 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.126 2015/02/21 23:35:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.127 2015/03/17 19:50:42 ryoon Exp $ DISTNAME= # empty PKGNAME= seamonkey-${SM_VER:S/b/beta/} -PKGREVISION= 1 -SM_VER= 2.32.1 +SM_VER= 2.33 #LIGHTNINGVER= 1.9 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST index 9debe859f29..47e35a7a88e 100644 --- a/www/seamonkey/PLIST +++ b/www/seamonkey/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.49 2015/02/15 02:11:03 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.50 2015/03/17 19:50:42 ryoon Exp $ bin/seamonkey lib/seamonkey/application.ini lib/seamonkey/blocklist.xml @@ -373,6 +373,7 @@ lib/seamonkey/chrome/classic/skin/classic/navigator/tabbrowser.css lib/seamonkey/chrome/comm/content/branding/about.png lib/seamonkey/chrome/comm/content/branding/aboutRights.js lib/seamonkey/chrome/comm/content/branding/aboutRights.xhtml +lib/seamonkey/chrome/comm/content/branding/icon32.png lib/seamonkey/chrome/comm/content/branding/icon48.png lib/seamonkey/chrome/comm/content/branding/icon64.png lib/seamonkey/chrome/comm/content/branding/messenger-start-bg.png @@ -547,7 +548,6 @@ lib/seamonkey/chrome/comm/content/communicator/pref/preferences.js lib/seamonkey/chrome/comm/content/communicator/pref/preferences.xul lib/seamonkey/chrome/comm/content/communicator/pref/prefpanels.css lib/seamonkey/chrome/comm/content/communicator/pref/prefpanels.xml -lib/seamonkey/chrome/comm/content/communicator/printPreviewBindings.xml lib/seamonkey/chrome/comm/content/communicator/profile/profileSelection.js lib/seamonkey/chrome/comm/content/communicator/profile/profileSelection.xul lib/seamonkey/chrome/comm/content/communicator/safeMode.js @@ -1536,6 +1536,8 @@ lib/seamonkey/chrome/messenger/content/messenger/aw-incoming.js lib/seamonkey/chrome/messenger/content/messenger/aw-outgoing.js lib/seamonkey/chrome/messenger/content/messenger/browserRequest.js lib/seamonkey/chrome/messenger/content/messenger/browserRequest.xul +lib/seamonkey/chrome/messenger/content/messenger/charsetList.css +lib/seamonkey/chrome/messenger/content/messenger/charsetList.xml lib/seamonkey/chrome/messenger/content/messenger/commandglue.js lib/seamonkey/chrome/messenger/content/messenger/dateFormat.js lib/seamonkey/chrome/messenger/content/messenger/downloadheaders.js @@ -1734,6 +1736,8 @@ lib/seamonkey/chrome/toolkit/content/global/aboutAbout.js lib/seamonkey/chrome/toolkit/content/global/aboutAbout.xhtml lib/seamonkey/chrome/toolkit/content/global/aboutCache.js lib/seamonkey/chrome/toolkit/content/global/aboutCompartments.xhtml +lib/seamonkey/chrome/toolkit/content/global/aboutMedia.js +lib/seamonkey/chrome/toolkit/content/global/aboutMedia.xhtml lib/seamonkey/chrome/toolkit/content/global/aboutMemory.css lib/seamonkey/chrome/toolkit/content/global/aboutMemory.js lib/seamonkey/chrome/toolkit/content/global/aboutMemory.xhtml @@ -1746,7 +1750,9 @@ lib/seamonkey/chrome/toolkit/content/global/aboutSupport.xhtml lib/seamonkey/chrome/toolkit/content/global/aboutTelemetry.css lib/seamonkey/chrome/toolkit/content/global/aboutTelemetry.js lib/seamonkey/chrome/toolkit/content/global/aboutTelemetry.xhtml -lib/seamonkey/chrome/toolkit/content/global/aboutWebrtc.xhtml +lib/seamonkey/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.css +lib/seamonkey/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.js +lib/seamonkey/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.xhtml lib/seamonkey/chrome/toolkit/content/global/accessibility/AccessFu.css lib/seamonkey/chrome/toolkit/content/global/accessibility/clicked.ogg lib/seamonkey/chrome/toolkit/content/global/accessibility/content-script.js @@ -2094,12 +2100,8 @@ lib/seamonkey/chrome/toolkit/skin/classic/global/icons/wrap.png lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/check.png lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/check@2x.png lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/common.css -lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/dropdown-disabled.png -lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/dropdown-disabled@2x.png -lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/dropdown.png -lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/dropdown@2x.png -lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/help-glyph.png -lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/help-glyph@2x.png +lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/dropdown.svg +lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/help-glyph.svg lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/sorter.png lib/seamonkey/chrome/toolkit/skin/classic/global/in-content/sorter@2x.png lib/seamonkey/chrome/toolkit/skin/classic/global/inContentUI.css @@ -2212,7 +2214,6 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.p lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/extensions.css -lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/extensions.svg lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/heart.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/navigation.png @@ -2263,6 +2264,7 @@ lib/seamonkey/components/BrowserElementParent.js lib/seamonkey/components/ColorAnalyzer.js lib/seamonkey/components/ConsoleAPIStorage.js lib/seamonkey/components/ContactManager.js +lib/seamonkey/components/ContentProcessSingleton.js lib/seamonkey/components/DataStoreImpl.js lib/seamonkey/components/DownloadLegacy.js lib/seamonkey/components/FeedConverter.js @@ -2270,6 +2272,7 @@ lib/seamonkey/components/FeedProcessor.js lib/seamonkey/components/FeedWriter.js lib/seamonkey/components/FormAutofillContentService.js lib/seamonkey/components/FormHistoryStartup.js +lib/seamonkey/components/MainProcessSingleton.js lib/seamonkey/components/NetworkGeolocationProvider.js lib/seamonkey/components/PermissionSettings.js lib/seamonkey/components/PhoneNumberService.js @@ -2297,7 +2300,6 @@ lib/seamonkey/components/glautocomp.js lib/seamonkey/components/interfaces.xpt lib/seamonkey/components/jsconsole-clhandler.js lib/seamonkey/components/jsmimeemitter.js -${PLIST.gnome}lib/seamonkey/components/libdbusservice.so lib/seamonkey/components/libmozgnome.so lib/seamonkey/components/libsuite.so lib/seamonkey/components/mdn-service.js @@ -2652,6 +2654,9 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/glo lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/listbox.css lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/mac/tree/sort-asc.gif lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/mac/tree/sort-dsc.gif +lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/media/TopLevelImageDocument.css +lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/media/TopLevelVideoDocument.css +lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/media/checkerboard.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/media/clicktoplay-bgtexture.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/media/error.png lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/media/muteButton.png @@ -3112,7 +3117,6 @@ lib/seamonkey/modules/BinarySearch.jsm lib/seamonkey/modules/BookmarkHTMLUtils.jsm lib/seamonkey/modules/BookmarkJSONUtils.jsm lib/seamonkey/modules/Bookmarks.jsm -lib/seamonkey/modules/BrowserElementParent.jsm lib/seamonkey/modules/BrowserElementPromptService.jsm lib/seamonkey/modules/BrowserUtils.jsm lib/seamonkey/modules/CertUtils.jsm @@ -3174,6 +3178,7 @@ lib/seamonkey/modules/History.jsm lib/seamonkey/modules/Http.jsm lib/seamonkey/modules/IOUtils.js lib/seamonkey/modules/ISO8601DateUtils.jsm +lib/seamonkey/modules/ImportExport.jsm lib/seamonkey/modules/IndexedDBHelper.jsm lib/seamonkey/modules/InlineSpellChecker.jsm lib/seamonkey/modules/InlineSpellCheckerContent.jsm @@ -3191,6 +3196,7 @@ lib/seamonkey/modules/LoginManagerContent.jsm lib/seamonkey/modules/LoginManagerParent.jsm lib/seamonkey/modules/LoginStore.jsm lib/seamonkey/modules/MailUtils.js +lib/seamonkey/modules/ManifestProcessor.jsm lib/seamonkey/modules/MessagePortBase.jsm lib/seamonkey/modules/MessagePortWorker.js lib/seamonkey/modules/Microformats.js @@ -3203,6 +3209,7 @@ lib/seamonkey/modules/OAuth2.jsm lib/seamonkey/modules/OfflineCacheInstaller.jsm lib/seamonkey/modules/OperatorApps.jsm lib/seamonkey/modules/PageMenu.jsm +lib/seamonkey/modules/PageThumbUtils.jsm lib/seamonkey/modules/PageThumbs.jsm lib/seamonkey/modules/PageThumbsWorker.js lib/seamonkey/modules/PerfMeasurement.jsm @@ -3226,6 +3233,7 @@ lib/seamonkey/modules/Preferences.jsm lib/seamonkey/modules/PrivateBrowsingUtils.jsm lib/seamonkey/modules/Promise-backend.js lib/seamonkey/modules/Promise.jsm +lib/seamonkey/modules/PromiseUtils.jsm lib/seamonkey/modules/PromiseWorker.jsm lib/seamonkey/modules/PropertyListUtils.jsm lib/seamonkey/modules/PushService.jsm @@ -3325,6 +3333,8 @@ lib/seamonkey/modules/commonjs/diffpatcher/test/index.js lib/seamonkey/modules/commonjs/diffpatcher/test/patch.js lib/seamonkey/modules/commonjs/diffpatcher/test/tap.js lib/seamonkey/modules/commonjs/framescript/FrameScriptManager.jsm +lib/seamonkey/modules/commonjs/framescript/LoaderHelper.jsm +lib/seamonkey/modules/commonjs/framescript/contextmenu-events.js lib/seamonkey/modules/commonjs/framescript/tab-events.js lib/seamonkey/modules/commonjs/method/core.js lib/seamonkey/modules/commonjs/method/test/browser.js @@ -3343,12 +3353,15 @@ lib/seamonkey/modules/commonjs/sdk/console/plain-text.js lib/seamonkey/modules/commonjs/sdk/console/traceback.js lib/seamonkey/modules/commonjs/sdk/content/content-worker.js lib/seamonkey/modules/commonjs/sdk/content/content.js +lib/seamonkey/modules/commonjs/sdk/content/context-menu.js lib/seamonkey/modules/commonjs/sdk/content/events.js lib/seamonkey/modules/commonjs/sdk/content/loader.js lib/seamonkey/modules/commonjs/sdk/content/mod.js lib/seamonkey/modules/commonjs/sdk/content/sandbox.js lib/seamonkey/modules/commonjs/sdk/content/thumbnail.js lib/seamonkey/modules/commonjs/sdk/content/utils.js +lib/seamonkey/modules/commonjs/sdk/content/worker-child.js +lib/seamonkey/modules/commonjs/sdk/content/worker-parent.js lib/seamonkey/modules/commonjs/sdk/content/worker.js lib/seamonkey/modules/commonjs/sdk/context-menu.js lib/seamonkey/modules/commonjs/sdk/core/disposable.js @@ -3520,7 +3533,6 @@ lib/seamonkey/modules/commonjs/sdk/util/collection.js lib/seamonkey/modules/commonjs/sdk/util/contract.js lib/seamonkey/modules/commonjs/sdk/util/deprecate.js lib/seamonkey/modules/commonjs/sdk/util/dispatcher.js -lib/seamonkey/modules/commonjs/sdk/util/iteration.js lib/seamonkey/modules/commonjs/sdk/util/list.js lib/seamonkey/modules/commonjs/sdk/util/match-pattern.js lib/seamonkey/modules/commonjs/sdk/util/object.js @@ -3547,6 +3559,7 @@ lib/seamonkey/modules/commonjs/sdk/worker/utils.js lib/seamonkey/modules/commonjs/sdk/zip/utils.js lib/seamonkey/modules/commonjs/test.js lib/seamonkey/modules/commonjs/toolkit/loader.js +lib/seamonkey/modules/commonjs/toolkit/require.js lib/seamonkey/modules/ctypes.jsm lib/seamonkey/modules/debug.js lib/seamonkey/modules/devtools/Console.jsm @@ -3566,6 +3579,7 @@ lib/seamonkey/modules/devtools/app-actor-front.js lib/seamonkey/modules/devtools/async-utils.js lib/seamonkey/modules/devtools/client/connection-manager.js lib/seamonkey/modules/devtools/content-observer.js +lib/seamonkey/modules/devtools/content-server.jsm lib/seamonkey/modules/devtools/css-color.js lib/seamonkey/modules/devtools/dbg-client.jsm lib/seamonkey/modules/devtools/dbg-server.jsm @@ -3671,12 +3685,15 @@ lib/seamonkey/modules/devtools/jsbeautify/beautify.js lib/seamonkey/modules/devtools/jsbeautify/sanitytest.js lib/seamonkey/modules/devtools/jsbeautify/urlencode_unpacker.js lib/seamonkey/modules/devtools/output-parser.js +lib/seamonkey/modules/devtools/path.js lib/seamonkey/modules/devtools/pretty-fast.js lib/seamonkey/modules/devtools/qrcode/decoder/index.js lib/seamonkey/modules/devtools/qrcode/encoder/index.js lib/seamonkey/modules/devtools/qrcode/index.js +lib/seamonkey/modules/devtools/server/actors/actor-registry.js lib/seamonkey/modules/devtools/server/actors/call-watcher.js lib/seamonkey/modules/devtools/server/actors/canvas.js +lib/seamonkey/modules/devtools/server/actors/child-process.js lib/seamonkey/modules/devtools/server/actors/childtab.js lib/seamonkey/modules/devtools/server/actors/common.js lib/seamonkey/modules/devtools/server/actors/csscoverage.js @@ -3684,6 +3701,7 @@ lib/seamonkey/modules/devtools/server/actors/device.js lib/seamonkey/modules/devtools/server/actors/eventlooplag.js lib/seamonkey/modules/devtools/server/actors/framerate.js lib/seamonkey/modules/devtools/server/actors/gcli.js +lib/seamonkey/modules/devtools/server/actors/highlighter.css lib/seamonkey/modules/devtools/server/actors/highlighter.js lib/seamonkey/modules/devtools/server/actors/inspector.js lib/seamonkey/modules/devtools/server/actors/layout.js @@ -3854,7 +3872,6 @@ lib/seamonkey/modules/workers/PromiseWorker.js lib/seamonkey/modules/workers/lz4.js lib/seamonkey/modules/workers/lz4_internal.js lib/seamonkey/modules/workers/require.js -lib/seamonkey/mozilla-xremote-client lib/seamonkey/platform.ini lib/seamonkey/plugin-container lib/seamonkey/removed-files @@ -3902,7 +3919,6 @@ lib/seamonkey/res/table-remove-row.gif lib/seamonkey/run-mozilla.sh lib/seamonkey/seamonkey lib/seamonkey/seamonkey-bin -lib/seamonkey/searchplugins/creativecommons.xml lib/seamonkey/searchplugins/duckduckgo.xml lib/seamonkey/searchplugins/google.xml lib/seamonkey/searchplugins/wikipedia.xml diff --git a/www/seamonkey/PLIST.chatzilla b/www/seamonkey/PLIST.chatzilla index 9ef541ff570..ef84d65ef7e 100644 --- a/www/seamonkey/PLIST.chatzilla +++ b/www/seamonkey/PLIST.chatzilla @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.chatzilla,v 1.5 2015/02/15 02:11:03 ryoon Exp $ +@comment $NetBSD: PLIST.chatzilla,v 1.6 2015/03/17 19:50:42 ryoon Exp $ lib/seamonkey/extensions/inspector@mozilla.org/chrome.manifest lib/seamonkey/extensions/inspector@mozilla.org/chrome/.mkdir.done lib/seamonkey/extensions/inspector@mozilla.org/chrome/icons/default/winInspectorMain.ico @@ -306,6 +306,7 @@ lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/skin/modern/insp lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/skin/modern/inspector/viewers/styleRules/styleRules.css lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/skin/modern/inspector/viewers/xblBindings/xblBindings.css lib/seamonkey/extensions/inspector@mozilla.org/components/inspector-cmdline.js +lib/seamonkey/extensions/inspector@mozilla.org/components/inspector-cmdline.js lib/seamonkey/extensions/inspector@mozilla.org/defaults/preferences/inspector.js lib/seamonkey/extensions/inspector@mozilla.org/install.rdf lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest @@ -440,4 +441,5 @@ lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/def lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js +lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js lib/seamonkey/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf diff --git a/www/seamonkey/PLIST.lightning b/www/seamonkey/PLIST.lightning index 6c5802df5fb..d1db86c456e 100644 --- a/www/seamonkey/PLIST.lightning +++ b/www/seamonkey/PLIST.lightning @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.lightning,v 1.19 2015/01/02 04:26:21 ryoon Exp $ +@comment $NetBSD: PLIST.lightning,v 1.20 2015/03/17 19:50:42 ryoon Exp $ lib/seamonkey/extensions/quitter@mozilla.org/chrome.manifest lib/seamonkey/extensions/quitter@mozilla.org/chrome/.mkdir.done lib/seamonkey/extensions/quitter@mozilla.org/chrome/quitter/content/contentscript.js @@ -350,6 +350,7 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/wind lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-daypicker.css lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog-attendees.png lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog-toolbar-aero.png +lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog-toolbar-inverted.png lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog-toolbar-small.png lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog-toolbar.png lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-event-dialog.css @@ -373,6 +374,7 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/wind lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/datetimepickers/datetimepickers.css lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/ok-cancel.png lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/tasks-actions-aero.png +lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/tasks-actions-inverted.png lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/tasks-actions.png lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/today-pane.css lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/toolbar-aero-inverted.png @@ -457,6 +459,7 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calRecur lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageHelpers.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageUpgrade.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils.jsm +lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calViewUtils.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calXMLUtils.jsm lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ical.js lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 55e1c2cf12e..42877ee2731 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,25 +1,26 @@ -$NetBSD: distinfo,v 1.119 2015/02/15 02:11:03 ryoon Exp $ +$NetBSD: distinfo,v 1.120 2015/03/17 19:50:42 ryoon Exp $ SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7 Size (enigmail-1.7.2.tar.gz) = 1420346 bytes -SHA1 (seamonkey-2.32.1.source.tar.bz2) = 48cb9bd57bf30ead350d4c1123099896a3bb552b -RMD160 (seamonkey-2.32.1.source.tar.bz2) = d8d492f18a44230e5a695a5675200d719273c9d3 -Size (seamonkey-2.32.1.source.tar.bz2) = 199617565 bytes -SHA1 (patch-aa) = 1503b066cd37fc26554bbdba1ec330660354ad00 +SHA1 (seamonkey-2.33.source.tar.bz2) = c0ea89b96345b6cd8cf911cd136e4a8d58cfa645 +RMD160 (seamonkey-2.33.source.tar.bz2) = 45e04a0d13412148ed24a920d8eac241dd851cb5 +Size (seamonkey-2.33.source.tar.bz2) = 203205893 bytes +SHA1 (patch-aa) = 21421051f61d852631ac510fac1372048c91ecb5 SHA1 (patch-ak) = 5495058581061d5291a0d3d329c146a926d5fbf2 SHA1 (patch-al) = 2643bc1585ec320c63acb5d47c34573a517cd3db SHA1 (patch-ao) = 2185bc6e95e08f6b4279f4c64db09b56ea7e880a -SHA1 (patch-as) = 39848bde0aa369731329f0a0b7fedb5b3b44921f +SHA1 (patch-as) = dee521998229f57e17fdf04f22d366d5daa44f8b SHA1 (patch-bf) = cf7fef695c6db66a3653d3258a2385c6f1eb709e SHA1 (patch-bg) = 9aba8618a4f0777527c6e7af33cb234cb0627501 -SHA1 (patch-config_baseconfig.mk) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 541604f0f63f5c1b3ce5509260517f68f417eb73 SHA1 (patch-ldap_sdks_c-sdk_ldap_include_portable.h) = 4ce9e1a0e8f0d05367243e8d2b5118606a35da94 SHA1 (patch-mail_app_Makefile.in) = 4d69a03cac313bd7f55c6dd5a54d8d361c3a9131 SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = 0cbabcf5b188e86404e3ded8452c73a7f498efe3 +SHA1 (patch-mozilla_b2g_installer_Makefile.in) = 9281d16c242b7e7d8608244363bd32ab431fc5f0 +SHA1 (patch-mozilla_b2g_installer_package-manifest.in) = 2de99fe5dc609e0955d5b20d78813143c461e40f SHA1 (patch-mozilla_browser_app_nsBrowserApp.cpp) = 895b2e788b924ab0d5f7ac7c264d3e8e1c5934ed -SHA1 (patch-mozilla_browser_installer_package-manifest.in) = aa83f2e7d2b545beb83da1571594333722dc369e +SHA1 (patch-mozilla_browser_installer_package-manifest.in) = 84825ae3eb2ed39da9792e890a5bfbf8fa7e4708 SHA1 (patch-mozilla_build_autoconf_compiler-opts.m4) = 1970fa246049adde4f2338ccd51f3651081bea56 SHA1 (patch-mozilla_build_autoconf_nss.m4) = 3b05127e72a76ac2f87c8362cbde13ce76485a19 SHA1 (patch-mozilla_build_gyp.mozbuild) = 6362ff65a0ade82ed5145cb5a278b58bc3d827e5 @@ -27,22 +28,22 @@ SHA1 (patch-mozilla_build_pgo_profileserver.py) = 33acdc58e155ada7a4090bf3dcb7d2 SHA1 (patch-mozilla_config_Makefile.in) = 3806a60bbdc2f54d0fc974e245bfc9e5c3057ece SHA1 (patch-mozilla_config_baseconfig.mk) = 09754212f7c01fc4effc2698fea5b12b12ec022a SHA1 (patch-mozilla_config_external_moz.build) = 172f2066e14f38ac56defc76b41e0f3104f6674d -SHA1 (patch-mozilla_config_rules.mk) = b70916b54b761235af904c725747b6fc63a88441 +SHA1 (patch-mozilla_config_rules.mk) = ce24fd149c05a252acffc05a72dc0f86eabe16b4 SHA1 (patch-mozilla_config_stl__wrappers_ios) = 9200935d025d899a5810dc615345b9a7005369b2 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 232e253bca5d8f7f0de1b880dc34b613f8852ee7 SHA1 (patch-mozilla_config_system-headers) = 13aaec8d3a4a45da6e26fe05ddeccb31d007876a SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = e88b3a5d1f884bc645762a74f95bc4b7e360c9bf -SHA1 (patch-mozilla_content_base_src_moz.build) = a9f58230ce22cacb6e90318f81afa78481b12624 -SHA1 (patch-mozilla_content_media_AudioStream.h) = 432375ad85dc638193e31f94a52bb37125cd9eb5 -SHA1 (patch-mozilla_content_media_gmp_GMPChild.cpp) = b3edf8769d7ee143216c2f4ac2dd544db366b372 -SHA1 (patch-mozilla_content_media_gmp_GMPParent.cpp) = f4b93d692f978237eedd3675f4ae76e770f9695b -SHA1 (patch-mozilla_content_media_gstreamer_GStreamerAllocator.cpp) = 0aa91baa53e77065a8462960d90b63a716625d96 -SHA1 (patch-mozilla_content_media_moz.build) = 361bc48dd67eb5358c312d19c0a75dcd188ff7e9 -SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 400a5af9988d4392d92e493c73bbe61cd1915edb +SHA1 (patch-mozilla_dom_base_moz.build) = de05328ca4339e0e3a92da3e4517697df9d3b53a +SHA1 (patch-mozilla_dom_media_AudioStream.h) = 92029dfdf3cfd168b88e313806340db9d13d408f +SHA1 (patch-mozilla_dom_media_gmp_GMPChild.cpp) = 39bd9871057efd69853f26b2230f58bcf9e4c94b +SHA1 (patch-mozilla_dom_media_gmp_GMPParent.cpp) = 8e3c3738e80c63503b34d20437a389e595cf4acb +SHA1 (patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp) = c160b78d4ea5058df602c74be43be9476cb78d1f +SHA1 (patch-mozilla_dom_media_moz.build) = 5d6e2ce865bf96c4efc271eb99f1065e9ee2d627 +SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 16a7d1d6d951911f966f85e9cacf7c742681c332 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 14038ce0ee2b38db6c7952056a97a65839a2c1a9 -SHA1 (patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp) = f29ed121d90a6fc4c02e36da8d440d6c3337e63a -SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = e69fd11a0ab95a2142a4a24995a5dfb2ea96357b -SHA1 (patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 2feb7c9f3d608fbca7d5f94ed01366356c2ced83 +SHA1 (patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp) = ef2b3f3c134be64c9dbb688e36a8b767c25a008a +SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = 9faf89e6dbaced276077c5f1ff9c726991d5675c +SHA1 (patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 186f9e6e064f84c16143a843e8d19f4d4975a49b SHA1 (patch-mozilla_gfx_graphite2_moz-gr-update.sh) = ba55405496adf27442dd26a5420397e51a784539 SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = fb97becdfeeea742e8c0bc51e10efc124a2a11f3 SHA1 (patch-mozilla_gfx_moz.build) = 9cd67c170321c399b85f9f7729a6d130bb331f17 @@ -51,7 +52,7 @@ SHA1 (patch-mozilla_gfx_skia_moz.build) = 32a5330cecb8b4dadd823bc13aebc1e5891c39 SHA1 (patch-mozilla_gfx_thebes_moz.build) = c9fc7811cf24c735f1f829f206af5d8bba27d505 SHA1 (patch-mozilla_gfx_ycbcr_moz.build) = 263c37980558d485e868a7097689cdf35c5f678d SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = 74c70bad49b9781dae6be4fd46c33da886bcfd34 -SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = 316bfe765e20f188c847efa30cfa0ccc9f4fc7e5 +SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = b64b83c9abd0a9b454fbb6061278e51c6754a193 SHA1 (patch-mozilla_intl_hyphenation_hnjalloc.h) = ec6eeebc8d7edb2f6d021d22d9621b057141c736 SHA1 (patch-mozilla_intl_unicharutil_util_moz.build) = 20a291273822f4e6a8310ca98408ca30da94b686 SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 78241924f121b0344b2fe5a42413eddf9cc3e7fd @@ -77,37 +78,46 @@ SHA1 (patch-mozilla_ipc_glue_moz.build) = 28377845abc15356181f6c3b640391bad2b004 SHA1 (patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py) = 9e193b1f50b05573d3c580bd629b21c7ee38ef61 SHA1 (patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py) = d7f0c9af3df86236c5dc754aa2e8c8393f1b2446 SHA1 (patch-mozilla_ipc_ipdl_ipdl_lower.py) = b77cdb2593bd264843167742211a1746d02f25af -SHA1 (patch-mozilla_js_src_Makefile.in) = 13f47e24bb19193ab00c8f6d7e2d5f39c858a4b4 -SHA1 (patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp) = e76d50718186e0c6cfbeb9ec589d6f2c3dc601b1 +SHA1 (patch-mozilla_js_src_Makefile.in) = 714f47ab1f8833618f1558c3049ac8a5d97a66c7 +SHA1 (patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp) = 9df8c3e48040396c7232f80b0e96ba41a81a4523 SHA1 (patch-mozilla_js_src_ctypes_CTypes.h) = 37ef9e49c21199d8506e7c0c048a7651800a249a SHA1 (patch-mozilla_js_src_frontend_ParseMaps.cpp) = af9c153c78a3d50e926f7820db3c98b7fe1db063 SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 89c6b8d6a35c0168e8d28ea4daa205c154a56a2a -SHA1 (patch-mozilla_js_src_jit_ExecutableAllocator.h) = 6cb6c9671222b18dd5fe80ae031bfd4c5faf4bf4 -SHA1 (patch-mozilla_js_src_jit_arm_Architecture-arm.cpp) = a7748058cd9b3a0fcb029d7adcda23e1949f3dc3 +SHA1 (patch-mozilla_js_src_gc_Statistics.cpp) = 8940aea6179c00a187df598cd4e9faf1c581f860 +SHA1 (patch-mozilla_js_src_jit_ExecutableAllocator.h) = 5687ea907bcbe66a1a1c4de2a37879119fa68e47 +SHA1 (patch-mozilla_js_src_jit_LIR.cpp) = 1fd3e14c30aef91cba99be6dec61446ac9820157 +SHA1 (patch-mozilla_js_src_jit_MIR.cpp) = fe9c165234c7796697b58bd06b8708e17e7b5e80 +SHA1 (patch-mozilla_js_src_jit_arm_Architecture-arm.cpp) = e855d5d835b4ac75aa99c19be252e6dd1738035c +SHA1 (patch-mozilla_js_src_jsapi.cpp) = fded9355907bc06175dcab4416dc550ba585ec34 +SHA1 (patch-mozilla_js_src_jsdate.cpp) = 459f93773b7dbc8de85509971e7aab2770916ca3 +SHA1 (patch-mozilla_js_src_jskwgen.cpp) = efcb5898c6ddcd012bf37ff04dcbb223e753ee94 SHA1 (patch-mozilla_js_src_jsmath.cpp) = 25225d4b9f05766314dfb7a809e8f4cf7ffa1f4b +SHA1 (patch-mozilla_js_src_shell_jsoptparse.cpp) = 962a545ae4742b0dc871ddefe071965a213df2a5 SHA1 (patch-mozilla_js_src_vm_SPSProfiler.cpp) = f609c8f2feac9aa6d5a6f37bf4ac0270bde7e8a4 SHA1 (patch-mozilla_js_xpconnect_src_xpcprivate.h) = 56e9de48605f2310fdc2777b4fcab8ce2de50d0a SHA1 (patch-mozilla_media_libcubeb_AUTHORS) = 1a516754289470319fd181315f0bc7a04a4aaf85 SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = f4018f850cfd2b73226c66dbddb310e1efe40475 -SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = f98878673c1f8a673689ed33658f1d9073a549d6 -SHA1 (patch-mozilla_media_libcubeb_src_cubeb__oss.c) = c6baed916237542a630f719bcceb71a210342c42 +SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 808a1d8d4b8d6dbc3d16d8b7f1280234703a114e +SHA1 (patch-mozilla_media_libcubeb_src_cubeb__oss.c) = 808c5b237e83c9db99095def1ef546fdb3ad3b3c SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = 1dd0bbca331d487b589b582c6ad9d6324003e519 SHA1 (patch-mozilla_media_libpng_pngpriv.h) = b3bf9d7aeaf00a7cd0c9cc491fe6ac474c002655 SHA1 (patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp) = 1029bc985d6eadf3f030492a8aa51d008fa27740 -SHA1 (patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = 3ff2e66b02d3406f6df83198082948e3f1520f81 -SHA1 (patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = fc041686ccd5bbf4fec931354dd3c47902ae33b8 -SHA1 (patch-mozilla_media_libtheora_Makefile.in) = dfb7007a72a80b8da35a7ef9162357c4978c3adf +SHA1 (patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = 137ed7eb0124f0f76a76898261400e5a8509aaec +SHA1 (patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c) = 9c88ea6472cb86e958dfc883f06be7bdfbc3c46c +SHA1 (patch-mozilla_media_libstagefright_system_core_liblog_logprint.c) = c1af77a08ec9c651fa0d83eed4c4347dcb5dd56b SHA1 (patch-mozilla_media_libtheora_lib_arm_armcpu.c) = 544bbb808bbecb24b519a96358c956dcacdfd5be -SHA1 (patch-mozilla_media_libtheora_moz.build) = ab6f10f2e44898f8fd7be77e172f482cefa1bc56 +SHA1 (patch-mozilla_media_libtheora_lib_info.c) = f533e75730d5afa51b4ebd04c54bff02b70b03b0 +SHA1 (patch-mozilla_media_libtheora_moz.build) = cd4f9ba595335bd1015a187e9350b9ce1ed52578 SHA1 (patch-mozilla_media_libtremor_Makefile.in) = b5b921df3afa31944891291efd13a237e720eeb1 SHA1 (patch-mozilla_media_libtremor_moz.build) = 4eea9cea611e15e8a39fcd4e55e48f474c8d0e03 SHA1 (patch-mozilla_media_libvorbis_Makefile.in) = 9d139eccfd1c446a2cac3182dec2b6cd673b5113 +SHA1 (patch-mozilla_media_libvorbis_lib_vorbis__info.c) = 8e622c5e54c504fca1f420160a694f749e2a0766 SHA1 (patch-mozilla_media_libvorbis_moz.build) = fb6fcfe90569aac85a78013f8ac7769f1414c4f9 SHA1 (patch-mozilla_media_libyuv_include_libyuv_scale__row.h) = c61f35af1a6cf9f71041c8871cff3a0b22e6593b SHA1 (patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c) = 7990869143e4edb253b1cd67ab20c78ca2a573ea SHA1 (patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = 9e3198f44e9689d98b538efd62c9bfb66a10277e SHA1 (patch-mozilla_media_webrtc_signaling_signaling.gyp) = 4b24e7c4c96c25613a912a559c7b0191f43daeec -SHA1 (patch-mozilla_media_webrtc_signaling_test_moz.build) = 8677719316fe054a323a771d1a4470e77950b383 +SHA1 (patch-mozilla_media_webrtc_signaling_test_moz.build) = 05a191e253420669b140d680cd74f90949c9d3cc SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi) = 523391b109802a604c90c30af6d06b45e14554ab SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = 52b95a931d931d51e5dc8260cff745089dc349a0 SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc) = 11477be4a67107f2a6e0e7a2cf3fff38164270ed @@ -115,8 +125,9 @@ SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__c SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = ef8baef63c072f34a3d7137f0ea286a93e8793c4 SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 80cb51d4641de3eb69c23c33867661413df9357d SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 3dcb786a83d9daf8aed8f7eaf2a761de9df7ccc9 +SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc) = 9e75e1e55b80dab35c71aef1777a84dd6e43034d SHA1 (patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = e35964a2e645125e014ee10a2a9cc923dc2a238c -SHA1 (patch-mozilla_memory_build_mozjemalloc__compat.c) = ad7781894f90863545ed9a9ff4086c4492b4bd0c +SHA1 (patch-mozilla_memory_build_mozjemalloc__compat.c) = edad841566cdd9da8475a79910781fa8a8dad00a SHA1 (patch-mozilla_memory_jemalloc_Makefile.in) = 711184596fedbafea25be1fd708eaaa429dc067c SHA1 (patch-mozilla_memory_jemalloc_src_configure) = a20a0bfe688b6b92ac56eaacb2479c542326b277 SHA1 (patch-mozilla_memory_mozalloc_VolatileBufferOSX.cpp) = 9c4614bc438b90c6eeff2ea643192b268910638d @@ -124,40 +135,34 @@ SHA1 (patch-mozilla_memory_mozalloc_mozalloc__abort.cpp) = d7d97bc0d6f2804bb0942 SHA1 (patch-mozilla_mfbt_Alignment.h) = 74e67cdaa109db06a5d72a33c826102ac672e757 SHA1 (patch-mozilla_mfbt_Attributes.h) = 2e47958d46edf5d5d23cf6635e083f7b00d6b041 SHA1 (patch-mozilla_mfbt_Poison.cpp) = 8a45775687244c6d1d6e422dbaa2364862fb33b7 +SHA1 (patch-mozilla_mobile_android_installer_Makefile.in) = 51a82959db4a672c1e9c6aa7178d72c80406f35a +SHA1 (patch-mozilla_mobile_android_installer_package-manifest.in) = 53aab8a32f10eb110fe16a35601abb76e8184b91 SHA1 (patch-mozilla_modules_libjar_nsZipArchive.cpp) = a399e0bd0e83c47938bbee077eaa79fc52386241 +SHA1 (patch-mozilla_netwerk_base_public_nsNetUtil.h) = f4ea538b3166d2336dca932affae644a0f037714 SHA1 (patch-mozilla_netwerk_dns_Makefile.in) = 20fe4e68220ebe49556d1505a99f34002f357ee3 SHA1 (patch-mozilla_netwerk_dns_moz.build) = 67b664fac0bf1542debfca570251622e43fd869b +SHA1 (patch-mozilla_netwerk_protocol_http_Http2Session.cpp) = 91b725fcddd276a45eabbc7218ec194d970f44e8 SHA1 (patch-mozilla_netwerk_wifi_moz.build) = 69fcddff29dfe3a0001561ceaa06f2c1ca15d20e SHA1 (patch-mozilla_netwerk_wifi_nsWifiScannerFreeBSD.cpp) = 2ac991e5ddee0862f8ba7d7cd5966552dc70b720 -SHA1 (patch-mozilla_probes_Makefile.in) = 1022eef505f6e6642e4f803461baa2349b200e05 SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = 0ab4f1ff35d400159d4227b39fde956eb0fbe96e -SHA1 (patch-mozilla_toolkit_components_alerts_nsAlertsService.cpp) = 37f251316b81304a29be6b31198cfb855624a83f SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = abf9d1bb447264172ac7e7421e98113d926f44cd SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 9637d1ecc330845c43b02ab75873c2c1f4e446a2 -SHA1 (patch-mozilla_toolkit_library_moz.build) = 381f91426ac4354e68da7b14fddb2662c057f0ae +SHA1 (patch-mozilla_toolkit_library_moz.build) = 58482170e1a9db292627e1880f86b1b5d1389331 SHA1 (patch-mozilla_toolkit_modules_GMPInstallManager.jsm) = efdffba110265916fcddfd0396366ecddc89d987 SHA1 (patch-mozilla_toolkit_mozapps_extensions_internal_OpenH264Provider.jsm) = 4db8e40a60754cf7216039deb6726ef97563d9a4 -SHA1 (patch-mozilla_toolkit_system_gnome_moz.build) = 942723ecbce0b9b0dd2f51f5f71bb440a2fff667 -SHA1 (patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.cpp) = 6c679f5dd4a9302d2cba669490815eb1013cffc6 -SHA1 (patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.h) = 16fee5c30ef0bcdafe855e09f9827fca451e2ffc -SHA1 (patch-mozilla_toolkit_system_gnome_nsGnomeModule.cpp) = 34e21004c7ef14dfa743ff6f8e429ad836ff731d -SHA1 (patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.cpp) = 7dbc4f71bfdd0a467bb90b8a0e40adace0830bac -SHA1 (patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.h) = fd494c9d5a9311e19282f3950eb1766006beba04 SHA1 (patch-mozilla_toolkit_xre_nsAppRunner.cpp) = 6ce047ed4a029f0935ebc9c297e99c8b9ccd76f1 SHA1 (patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp) = 70030e59b2ed09b9bc9827d35e17b12be7f0cd71 SHA1 (patch-mozilla_webapprt_moz.build) = 8323bfea8fe835571bf60d95cfa59859b745083f SHA1 (patch-mozilla_widget_gtk_gtk3drawing.c) = 77fa2626fefa09e76eadda1fcd341a5c05fa565d -SHA1 (patch-mozilla_widget_gtk_mozgtk_mozgtk.c) = 980687a749b7fa13af8ffffaa64b909959083b67 SHA1 (patch-mozilla_widget_gtk_nsLookAndFeel.cpp) = f8156a206e82e8c6c4d020e50df791253ae7397d SHA1 (patch-mozilla_widget_gtk_nsLookAndFeel.h) = 7d8d06975af97f54e50754f57c7ae9152e3fa9d2 -SHA1 (patch-mozilla_widget_gtk_nsWindow.cpp) = 25e6af77b5316a76b075dc4e2197c91a609c488a SHA1 (patch-mozilla_xpcom_base_nsStackWalk.cpp) = 9edfb7d97266513eabdc4c2acbcdae3cd6aed154 SHA1 (patch-mozilla_xpcom_base_nscore.h) = a69c532d2891ac2a2227445e85e581749685153e SHA1 (patch-mozilla_xpcom_build_PoisonIOInterposer.h) = aa3e168c7c23ad6e63f521044336a03354ec9030 SHA1 (patch-mozilla_xpcom_build_XPCOMInit.cpp) = eab706573133ba1cec868b5f854693d5e7c935f7 SHA1 (patch-mozilla_xpcom_glue_standalone_nsXPCOMGlue.cpp) = 87924ccc21ef5d1cc6adadfa4ce3c14d4fd1d33b SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in) = 2681b1371352c8b0c0f7a574e89da9e2b41ed5cd -SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build) = 72977c261cd5eee8f8da796afc8ad919fce19963 +SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build) = 54b4efb465302fccd34d8d83e41071032a5d43a7 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = cb2a4769f04351e92580e3daaca88fc7f1dfedbd SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = fd7da8e0a424030e5a4a129d6dda521459d8ab73 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 4ba8ce148b5cd8df3dd02ec623a7da4ac5309473 diff --git a/www/seamonkey/options.mk b/www/seamonkey/options.mk index b6574e2e7df..02981cb2c3c 100644 --- a/www/seamonkey/options.mk +++ b/www/seamonkey/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.30 2015/01/02 04:26:21 ryoon Exp $ +# $NetBSD: options.mk,v 1.31 2015/03/17 19:50:42 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.seamonkey -PKG_SUPPORTED_OPTIONS= alsa debug mozilla-jemalloc gnome mozilla-enigmail +PKG_SUPPORTED_OPTIONS= alsa debug mozilla-jemalloc mozilla-enigmail # gnome PKG_SUPPORTED_OPTIONS+= mozilla-lightning webrtc mozilla-chatzilla pulseaudio PLIST_VARS+= debug gnome jemalloc diff --git a/www/seamonkey/patches/patch-aa b/www/seamonkey/patches/patch-aa index bfd3b99dd00..a2908ae28cb 100644 --- a/www/seamonkey/patches/patch-aa +++ b/www/seamonkey/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ +$NetBSD: patch-aa,v 1.26 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/configure.in.orig 2015-02-05 04:39:33.000000000 +0000 +--- mozilla/configure.in.orig 2015-03-09 05:34:34.000000000 +0000 +++ mozilla/configure.in -@@ -1444,7 +1444,7 @@ if test "$GNU_CC"; then - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wtype-limits" - - # Treat some warnings as errors: -- _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts" -+ #_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts" - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=comment" - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=endif-labels" - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=enum-compare" -@@ -1717,7 +1717,13 @@ Linux) +@@ -1766,7 +1766,13 @@ Linux) MOZ_ENABLE_PROFILER_SPS= esac ;; @@ -26,7 +17,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ *) MOZ_ENABLE_PROFILER_SPS= ;; -@@ -1821,7 +1827,7 @@ case "$host" in +@@ -1870,7 +1876,7 @@ case "$host" in ;; *-darwin*) @@ -35,7 +26,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; -@@ -1953,7 +1959,6 @@ case "$target" in +@@ -2002,7 +2008,6 @@ case "$target" in AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit' else @@ -43,7 +34,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' # The ExceptionHandling framework is needed for Objective-C exception -@@ -2569,8 +2574,7 @@ MOZ_CXX11 +@@ -2622,8 +2627,7 @@ MOZ_CXX11 AC_LANG_C @@ -53,7 +44,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3614,6 +3618,14 @@ if test -n "$YASM"; then +@@ -3645,6 +3649,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -68,7 +59,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3641,11 +3653,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -3672,11 +3684,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -81,7 +72,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -4348,6 +4356,10 @@ cairo-gonk) +@@ -4391,6 +4399,10 @@ cairo-gonk) esac @@ -92,7 +83,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ AC_SUBST(MOZ_PDF_PRINTING) if test "$MOZ_PDF_PRINTING"; then PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" -@@ -5088,6 +5100,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5131,6 +5143,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VPX=1 MOZ_VPX_ERROR_CONCEALMENT=1 @@ -102,7 +93,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5191,6 +5206,57 @@ if test "${ac_cv_c_attribute_aligned}" ! +@@ -5234,6 +5249,57 @@ if test "${ac_cv_c_attribute_aligned}" ! fi dnl ======================================================== @@ -160,7 +151,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ dnl = Disable Opus audio codec support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(opus, -@@ -5199,6 +5265,89 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5242,6 +5308,89 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -250,7 +241,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -@@ -5557,6 +5706,60 @@ fi +@@ -5600,6 +5749,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -264,33 +255,40 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ + ;; +esac + -+MOZ_ARG_DISABLE_BOOL(oss, -+[ --disable-oss Disable OpenSoundSystem support], -+ MOZ_OSS=, -+ MOZ_OSS=1) ++MOZ_ARG_WITH_STRING(oss, ++[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], ++ OSSPREFIX=$withval) ++ ++if test -n "$OSSPREFIX"; then ++ if test "$OSSPREFIX" != "no"; then ++ MOZ_OSS=1 ++ else ++ MOZ_OSS= ++ fi ++fi + +_SAVE_CFLAGS=$CFLAGS +_SAVE_LIBS=$LIBS +if test -n "$MOZ_OSS"; then + dnl Prefer 4Front implementation + AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) -+ if test -z "$MOZ_OSS_CFLAGS"; then -+ for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do -+ if test -e "$oss_conf"; then -+ . "$oss_conf" -+ fi -+ done ++ if test "$OSSPREFIX" != "yes"; then ++ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf ++ if test -f "$oss_conf"; then ++ . "$oss_conf" ++ else ++ OSSLIBDIR=$OSSPREFIX/lib/oss ++ fi + if test -d "$OSSLIBDIR"; then -+ MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include" ++ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" + fi + fi + AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) + + CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" -+ MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h) ++ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) + + if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ -+ "$ac_cv_header_linux_soundcard_h" != "yes" -a \ + "$ac_cv_header_soundcard_h" != "yes"; then + AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --disable-ogg --disable-wave --disable-webm.]) + fi @@ -298,7 +296,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ + dnl Assume NetBSD implementation over SunAudio + AC_CHECK_LIB(ossaudio, _oss_ioctl, + [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") -+ MOZ_OSS_LIBS="-lossaudio"]) ++ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) +fi +CFLAGS=$_SAVE_CFLAGS +LIBS=$_SAVE_LIBS @@ -311,7 +309,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -5570,12 +5773,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, +@@ -5613,12 +5823,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, MOZ_ALSA=1, MOZ_ALSA=) @@ -335,7 +333,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ AC_SUBST(MOZ_ALSA) dnl ======================================================== -@@ -5999,7 +6213,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, +@@ -6046,7 +6267,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, if test "$MOZ_GAMEPAD"; then case "$OS_TARGET" in Darwin) @@ -346,7 +344,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ ;; WINNT) case "$MOZ_WINSDK_MAXVER" in -@@ -8123,6 +8339,49 @@ if test "$USE_FC_FREETYPE"; then +@@ -8089,6 +8312,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== @@ -396,7 +394,7 @@ $NetBSD: patch-aa,v 1.25 2015/02/15 02:11:03 ryoon Exp $ dnl Check for pixman and cairo dnl ======================================================== -@@ -8378,7 +8637,7 @@ case "$OS_TARGET" in +@@ -8344,7 +8610,7 @@ case "$OS_TARGET" in NECKO_WIFI=1 fi ;; diff --git a/www/seamonkey/patches/patch-as b/www/seamonkey/patches/patch-as index 001123a6139..810a0068d8b 100644 --- a/www/seamonkey/patches/patch-as +++ b/www/seamonkey/patches/patch-as @@ -1,19 +1,11 @@ -$NetBSD: patch-as,v 1.20 2015/02/15 02:11:03 ryoon Exp $ +$NetBSD: patch-as,v 1.21 2015/03/17 19:50:42 ryoon Exp $ * Fix _res is not supported for multi-threaded programs. error. * Treat DragonFly like FreeBSD. ---- mozilla/js/src/configure.in.orig 2015-02-05 04:38:38.000000000 +0000 +--- mozilla/js/src/configure.in.orig 2015-03-09 05:34:27.000000000 +0000 +++ mozilla/js/src/configure.in -@@ -1200,7 +1200,6 @@ if test "$GNU_CC"; then - - # Treat some warnings as errors: - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=address" -- _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=char-subscripts" - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=comment" - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=empty-body" - _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=endif-labels" -@@ -2180,8 +2179,7 @@ AC_LANG_CPLUSPLUS +@@ -2201,8 +2201,7 @@ AC_LANG_CPLUSPLUS MOZ_CXX11 @@ -23,7 +15,7 @@ $NetBSD: patch-as,v 1.20 2015/02/15 02:11:03 ryoon Exp $ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3095,7 +3093,7 @@ if test "$MOZ_MEMORY"; then +@@ -3082,7 +3081,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; @@ -32,7 +24,7 @@ $NetBSD: patch-as,v 1.20 2015/02/15 02:11:03 ryoon Exp $ AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) -@@ -3989,6 +3987,16 @@ MOZ_SUBCONFIGURE_ICU() +@@ -3974,6 +3973,16 @@ MOZ_SUBCONFIGURE_ICU() dnl ======================================================== dnl JavaScript shell dnl ======================================================== diff --git a/www/seamonkey/patches/patch-config_baseconfig.mk b/www/seamonkey/patches/patch-config_baseconfig.mk deleted file mode 100644 index ecfba5f6904..00000000000 --- a/www/seamonkey/patches/patch-config_baseconfig.mk +++ /dev/null @@ -1,2 +0,0 @@ -$NetBSD: patch-config_baseconfig.mk,v 1.6 2015/02/15 02:11:03 ryoon Exp $ - diff --git a/www/seamonkey/patches/patch-mozilla_b2g_installer_Makefile.in b/www/seamonkey/patches/patch-mozilla_b2g_installer_Makefile.in new file mode 100644 index 00000000000..31a0a7c5a7a --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_b2g_installer_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-mozilla_b2g_installer_Makefile.in,v 1.3 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/b2g/installer/Makefile.in.orig 2015-03-09 05:34:16.000000000 +0000 ++++ mozilla/b2g/installer/Makefile.in +@@ -79,6 +79,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS) + DEFINES += -DMOZ_RTSP + endif + ++ifdef MOZ_DEBUG ++DEFINES += -DMOZ_DEBUG=1 ++endif ++ + ifdef GKMEDIAS_SHARED_LIBRARY + DEFINES += -DGKMEDIAS_SHARED_LIBRARY + endif diff --git a/www/seamonkey/patches/patch-mozilla_b2g_installer_package-manifest.in b/www/seamonkey/patches/patch-mozilla_b2g_installer_package-manifest.in new file mode 100644 index 00000000000..f8c8f58c7c2 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_b2g_installer_package-manifest.in @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_b2g_installer_package-manifest.in,v 1.3 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/b2g/installer/package-manifest.in.orig 2015-03-09 05:34:16.000000000 +0000 ++++ mozilla/b2g/installer/package-manifest.in +@@ -609,7 +609,7 @@ + @BINPATH@/components/EngineeringModeAPI.js + @BINPATH@/components/EngineeringModeService.js + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @BINPATH@/components/TestInterfaceJS.js + @BINPATH@/components/TestInterfaceJS.manifest + #endif diff --git a/www/seamonkey/patches/patch-mozilla_browser_installer_package-manifest.in b/www/seamonkey/patches/patch-mozilla_browser_installer_package-manifest.in index 92a38b4ef44..71b466dfa3e 100644 --- a/www/seamonkey/patches/patch-mozilla_browser_installer_package-manifest.in +++ b/www/seamonkey/patches/patch-mozilla_browser_installer_package-manifest.in @@ -1,17 +1,17 @@ -$NetBSD: patch-mozilla_browser_installer_package-manifest.in,v 1.3 2014/11/02 05:40:31 ryoon Exp $ +$NetBSD: patch-mozilla_browser_installer_package-manifest.in,v 1.4 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/browser/installer/package-manifest.in.orig 2014-10-14 06:36:04.000000000 +0000 +--- mozilla/browser/installer/package-manifest.in.orig 2015-03-09 05:34:28.000000000 +0000 +++ mozilla/browser/installer/package-manifest.in -@@ -578,7 +578,7 @@ - @BINPATH@/components/MozKeyboard.js - @BINPATH@/components/InputMethod.manifest +@@ -609,7 +609,7 @@ + @RESPATH@/components/MozKeyboard.js + @RESPATH@/components/InputMethod.manifest -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @BINPATH@/components/TestInterfaceJS.js - @BINPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest #endif -@@ -752,7 +752,7 @@ +@@ -788,7 +788,7 @@ #endif ; for Solaris SPARC diff --git a/www/seamonkey/patches/patch-mozilla_config_rules.mk b/www/seamonkey/patches/patch-mozilla_config_rules.mk index e1db0b69a41..6860b792fa8 100644 --- a/www/seamonkey/patches/patch-mozilla_config_rules.mk +++ b/www/seamonkey/patches/patch-mozilla_config_rules.mk @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_config_rules.mk,v 1.2 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_config_rules.mk,v 1.3 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/config/rules.mk.orig 2014-12-03 06:22:33.000000000 +0000 +--- mozilla/config/rules.mk.orig 2015-03-09 05:34:34.000000000 +0000 +++ mozilla/config/rules.mk -@@ -779,6 +779,7 @@ endif +@@ -765,6 +765,7 @@ endif ifdef DTRACE_PROBE_OBJ EXTRA_DEPS += $(DTRACE_PROBE_OBJ) OBJS += $(DTRACE_PROBE_OBJ) @@ -10,21 +10,3 @@ $NetBSD: patch-mozilla_config_rules.mk,v 1.2 2015/01/02 04:26:21 ryoon Exp $ endif $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(STATIC_LIBS_DEPS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS)) $(EXTRA_DEPS) $(GLOBAL_DEPS) -@@ -814,7 +815,7 @@ ifdef DTRACE_PROBE_OBJ - ifndef DTRACE_LIB_DEPENDENT - NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS)) - $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS) -- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) -+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) - endif - endif - endif -@@ -832,7 +833,7 @@ ifndef INCREMENTAL_LINKER - endif - ifdef DTRACE_LIB_DEPENDENT - ifndef XP_MACOSX -- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) -+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) - endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS)) - @$(RM) $(DTRACE_PROBE_OBJ) diff --git a/www/seamonkey/patches/patch-mozilla_content_base_src_moz.build b/www/seamonkey/patches/patch-mozilla_content_base_src_moz.build deleted file mode 100644 index 5e4f1562315..00000000000 --- a/www/seamonkey/patches/patch-mozilla_content_base_src_moz.build +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_content_base_src_moz.build,v 1.2 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/content/base/src/moz.build.orig 2014-12-03 06:22:33.000000000 +0000 -+++ mozilla/content/base/src/moz.build -@@ -196,6 +196,9 @@ SOURCES += [ - 'nsObjectLoadingContent.cpp', - ] - -+if CONFIG['MOZ_NATIVE_HARFBUZZ']: -+ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - EXTRA_COMPONENTS += [ - 'contentAreaDropListener.js', - 'contentAreaDropListener.manifest', diff --git a/www/seamonkey/patches/patch-mozilla_content_media_AudioStream.h b/www/seamonkey/patches/patch-mozilla_content_media_AudioStream.h deleted file mode 100644 index 6da0d737634..00000000000 --- a/www/seamonkey/patches/patch-mozilla_content_media_AudioStream.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_content_media_AudioStream.h,v 1.3 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/content/media/AudioStream.h.orig 2014-12-03 06:22:34.000000000 +0000 -+++ mozilla/content/media/AudioStream.h -@@ -17,7 +17,7 @@ - #include "CubebUtils.h" - - namespace soundtouch { --class SoundTouch; -+class MOZ_IMPORT_API SoundTouch; - } - - namespace mozilla { diff --git a/www/seamonkey/patches/patch-mozilla_dom_base_moz.build b/www/seamonkey/patches/patch-mozilla_dom_base_moz.build new file mode 100644 index 00000000000..9fccafdc73a --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_dom_base_moz.build @@ -0,0 +1,14 @@ +$NetBSD: patch-mozilla_dom_base_moz.build,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/dom/base/moz.build.orig 2015-03-09 05:34:37.000000000 +0000 ++++ mozilla/dom/base/moz.build +@@ -361,6 +361,9 @@ if CONFIG['INTEL_ARCHITECTURE']: + SOURCES += ['nsTextFragmentSSE2.cpp'] + SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + EXTRA_COMPONENTS += [ + 'ConsoleAPI.manifest', + 'ConsoleAPIStorage.js', diff --git a/www/seamonkey/patches/patch-mozilla_dom_media_AudioStream.h b/www/seamonkey/patches/patch-mozilla_dom_media_AudioStream.h new file mode 100644 index 00000000000..e35ebfb7538 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_dom_media_AudioStream.h @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_dom_media_AudioStream.h,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/dom/media/AudioStream.h.orig 2015-03-09 05:34:51.000000000 +0000 ++++ mozilla/dom/media/AudioStream.h +@@ -17,7 +17,7 @@ + #include "CubebUtils.h" + + namespace soundtouch { +-class SoundTouch; ++class MOZ_IMPORT_API SoundTouch; + } + + namespace mozilla { diff --git a/www/seamonkey/patches/patch-mozilla_content_media_gmp_GMPChild.cpp b/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp index 013d43f5e9c..12465908ecc 100644 --- a/www/seamonkey/patches/patch-mozilla_content_media_gmp_GMPChild.cpp +++ b/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_content_media_gmp_GMPChild.cpp,v 1.2 2015/02/15 02:11:03 ryoon Exp $ +$NetBSD: patch-mozilla_dom_media_gmp_GMPChild.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/content/media/gmp/GMPChild.cpp.orig 2015-02-05 04:39:37.000000000 +0000 -+++ mozilla/content/media/gmp/GMPChild.cpp -@@ -91,21 +91,14 @@ GetFileBase(const std::string& aPluginPa +--- mozilla/dom/media/gmp/GMPChild.cpp.orig 2015-03-09 05:34:53.000000000 +0000 ++++ mozilla/dom/media/gmp/GMPChild.cpp +@@ -82,21 +82,14 @@ GetFileBase(const std::string& aPluginPa } #endif diff --git a/www/seamonkey/patches/patch-mozilla_content_media_gmp_GMPParent.cpp b/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp index 7231da3c5bd..8d62f97745f 100644 --- a/www/seamonkey/patches/patch-mozilla_content_media_gmp_GMPParent.cpp +++ b/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_content_media_gmp_GMPParent.cpp,v 1.2 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_dom_media_gmp_GMPParent.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/content/media/gmp/GMPParent.cpp.orig 2014-12-03 06:22:34.000000000 +0000 -+++ mozilla/content/media/gmp/GMPParent.cpp -@@ -90,23 +90,16 @@ GMPParent::Init(GeckoMediaPluginService +--- mozilla/dom/media/gmp/GMPParent.cpp.orig 2015-03-09 05:34:53.000000000 +0000 ++++ mozilla/dom/media/gmp/GMPParent.cpp +@@ -96,23 +96,16 @@ GMPParent::Init(GeckoMediaPluginService mService = aService; mDirectory = aPluginDir; diff --git a/www/seamonkey/patches/patch-mozilla_content_media_gstreamer_GStreamerAllocator.cpp b/www/seamonkey/patches/patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp index a339382946f..4baf2764525 100644 --- a/www/seamonkey/patches/patch-mozilla_content_media_gstreamer_GStreamerAllocator.cpp +++ b/www/seamonkey/patches/patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-mozilla_content_media_gstreamer_GStreamerAllocator.cpp,v 1.3 2014/11/02 05:40:31 ryoon Exp $ +$NetBSD: patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/content/media/gstreamer/GStreamerAllocator.cpp.orig 2014-10-14 06:36:06.000000000 +0000 -+++ mozilla/content/media/gstreamer/GStreamerAllocator.cpp +--- mozilla/dom/media/gstreamer/GStreamerAllocator.cpp.orig 2015-03-09 05:34:53.000000000 +0000 ++++ mozilla/dom/media/gstreamer/GStreamerAllocator.cpp @@ -51,7 +51,6 @@ typedef struct #pragma GCC diagnostic ignored "-Wunused-function" G_DEFINE_TYPE(MozGfxMemoryAllocator, moz_gfx_memory_allocator, GST_TYPE_ALLOCATOR); diff --git a/www/seamonkey/patches/patch-mozilla_content_media_moz.build b/www/seamonkey/patches/patch-mozilla_dom_media_moz.build index cbb5b08ba7c..55deec5e543 100644 --- a/www/seamonkey/patches/patch-mozilla_content_media_moz.build +++ b/www/seamonkey/patches/patch-mozilla_dom_media_moz.build @@ -1,12 +1,11 @@ -$NetBSD: patch-mozilla_content_media_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_dom_media_moz.build,v 1.1 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/content/media/moz.build.orig 2014-12-03 06:22:34.000000000 +0000 -+++ mozilla/content/media/moz.build -@@ -213,3 +213,24 @@ if CONFIG['ANDROID_VERSION'] > '15': - +--- mozilla/dom/media/moz.build.orig 2015-03-09 05:34:53.000000000 +0000 ++++ mozilla/dom/media/moz.build +@@ -270,6 +270,27 @@ if CONFIG['ANDROID_VERSION'] > '15': CFLAGS += CONFIG['GSTREAMER_CFLAGS'] CXXFLAGS += CONFIG['GSTREAMER_CFLAGS'] -+ + +if CONFIG['MOZ_NATIVE_OGG']: + CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] + @@ -27,3 +26,7 @@ $NetBSD: patch-mozilla_content_media_moz.build,v 1.1 2015/01/02 04:26:21 ryoon E + +if CONFIG['MOZ_NATIVE_SOUNDTOUCH']: + CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] ++ + include('/ipc/chromium/chromium-config.mozbuild') + + FINAL_LIBRARY = 'xul' diff --git a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp index 727235193d8..cdcbee3bc71 100644 --- a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp +++ b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.8 2013/08/11 03:18:46 ryoon Exp $ +$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.9 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2013-08-04 03:05:22.000000000 +0000 +--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2015-03-09 05:35:00.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp -@@ -203,7 +203,7 @@ PluginModuleChild::Init(const std::strin +@@ -307,7 +307,7 @@ PluginModuleChild::InitForChrome(const s // TODO: use PluginPRLibrary here @@ -11,16 +11,16 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.8 2013/08/11 03 mShutdownFunc = (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); -@@ -1834,7 +1834,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin - PLUGIN_LOG_DEBUG_METHOD; +@@ -1869,7 +1869,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin AssertPluginThread(); + MOZ_ASSERT(mIsChrome); -#if defined(OS_LINUX) || defined(OS_BSD) +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS) return true; #elif defined(OS_WIN) || defined(OS_MACOSX) *_retval = mGetEntryPointsFunc(&mFunctions); -@@ -1863,7 +1863,7 @@ PluginModuleChild::AnswerNP_Initialize(c +@@ -1899,7 +1899,7 @@ PluginModuleChild::AnswerNP_Initialize(c SendBackUpXResources(FileDescriptor(xSocketFd)); #endif diff --git a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp index 2af088f176d..c274ee034b0 100644 --- a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp +++ b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp,v 1.1 2014/06/22 08:54:39 ryoon Exp $ +$NetBSD: patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/dom/plugins/ipc/PluginProcessChild.cpp.orig 2014-06-13 00:45:23.000000000 +0000 +--- mozilla/dom/plugins/ipc/PluginProcessChild.cpp.orig 2015-03-09 05:35:00.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginProcessChild.cpp -@@ -42,7 +42,7 @@ namespace plugins { - bool - PluginProcessChild::Init() +@@ -56,7 +56,7 @@ PluginProcessChild::Init() { + nsDebugImpl::SetMultiprocessMode("NPAPI"); + -#if defined(XP_MACOSX) +#if defined(MOZ_WIDGET_COCOA) // Remove the trigger for "dyld interposing" that we added in diff --git a/www/seamonkey/patches/patch-mozilla_dom_system_OSFileConstants.cpp b/www/seamonkey/patches/patch-mozilla_dom_system_OSFileConstants.cpp index 1231a919bb2..fa6f411eb07 100644 --- a/www/seamonkey/patches/patch-mozilla_dom_system_OSFileConstants.cpp +++ b/www/seamonkey/patches/patch-mozilla_dom_system_OSFileConstants.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.5 2014/11/02 05:40:31 ryoon Exp $ +$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.6 2015/03/17 19:50:42 ryoon Exp $ * NetBSD 5 does not support posix_spawn(3) ---- mozilla/dom/system/OSFileConstants.cpp.orig 2014-10-14 06:36:08.000000000 +0000 +--- mozilla/dom/system/OSFileConstants.cpp.orig 2015-03-09 05:35:03.000000000 +0000 +++ mozilla/dom/system/OSFileConstants.cpp @@ -9,6 +9,10 @@ @@ -15,7 +15,17 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.5 2014/11/02 05:40:31 #if defined(XP_UNIX) #include "unistd.h" #include "dirent.h" -@@ -26,9 +30,9 @@ +@@ -18,7 +22,9 @@ + #define statvfs statfs + #else + #include "sys/statvfs.h" ++#if !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000)) + #include <spawn.h> ++#endif // !NetBSD 5.* + #endif // defined(ANDROID) + #endif // defined(XP_UNIX) + +@@ -26,9 +32,9 @@ #include <linux/fadvise.h> #endif // defined(XP_LINUX) @@ -27,12 +37,12 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.5 2014/11/02 05:40:31 #if defined(XP_WIN) #include <windows.h> -@@ -571,10 +575,10 @@ static const dom::ConstantSpec gLibcProp +@@ -588,10 +594,10 @@ static const dom::ConstantSpec gLibcProp // The size of |fsblkcnt_t|. { "OSFILE_SIZEOF_FSBLKCNT_T", INT_TO_JSVAL(sizeof (fsblkcnt_t)) }, -#if !defined(ANDROID) -+#if !defined(ANDROID) && (defined(__NetBSD_) && (__NetBSD_Version__ < 600000000)) ++#if !defined(ANDROID) && !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000)) // The size of |posix_spawn_file_actions_t|. { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", INT_TO_JSVAL(sizeof (posix_spawn_file_actions_t)) }, -#endif // !defined(ANDROID) @@ -40,7 +50,7 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.5 2014/11/02 05:40:31 // Defining |dirent|. // Size -@@ -634,7 +638,7 @@ static const dom::ConstantSpec gLibcProp +@@ -660,7 +666,7 @@ static const dom::ConstantSpec gLibcProp { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) }, diff --git a/www/seamonkey/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp b/www/seamonkey/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp index aaf8d6db519..494deb7af72 100644 --- a/www/seamonkey/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp +++ b/www/seamonkey/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp @@ -1,18 +1,16 @@ -$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.2 2015/02/15 02:11:03 ryoon Exp $ +$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.3 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-02-05 04:40:01.000000000 +0000 +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-03-09 05:35:11.000000000 +0000 +++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsCOMPtr<nsIFile> hunDir; ++ nsIFile* hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@PREFIX@/share/hunspell"), -+ true, getter_AddRefs(hunDir)); -+ if (hunDir) { -+ LoadDictionariesFromDir(hunDir); -+ } ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); + // find dictionaries from extensions requiring restart nsCOMPtr<nsISimpleEnumerator> dictDirs; diff --git a/www/seamonkey/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp b/www/seamonkey/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp index 68aaaacb9dd..f1dce9b548c 100644 --- a/www/seamonkey/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp +++ b/www/seamonkey/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/image/decoders/nsJPEGDecoder.cpp.orig 2013-05-03 03:07:56.000000000 +0000 +--- mozilla/image/decoders/nsJPEGDecoder.cpp.orig 2015-03-09 05:34:16.000000000 +0000 +++ mozilla/image/decoders/nsJPEGDecoder.cpp -@@ -19,13 +19,28 @@ +@@ -21,13 +21,28 @@ extern "C" { #include "iccjpeg.h" @@ -32,26 +32,26 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:25:3 static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); -@@ -338,6 +353,7 @@ nsJPEGDecoder::WriteInternal(const char - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: +@@ -358,6 +373,7 @@ nsJPEGDecoder::WriteInternal(const char* + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: +#ifdef JCS_EXTENSIONS - // 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 - } else { - mInfo.out_color_space = JCS_RGB; - } + // if we're not color managing we can decode directly to + // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB + if (mCMSMode != eCMSMode_All) { +@@ -366,6 +382,9 @@ nsJPEGDecoder::WriteInternal(const char* + } else { + mInfo.out_color_space = JCS_RGB; + } +#else -+ mInfo.out_color_space = JCS_RGB; ++ mInfo.out_color_space = JCS_RGB; +#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -413,6 +432,15 @@ nsJPEGDecoder::WriteInternal(const char - return; /* I/O suspension */ + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -424,6 +443,15 @@ nsJPEGDecoder::WriteInternal(const char* + return; // I/O suspension } +#ifndef JCS_EXTENSIONS @@ -64,10 +64,10 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:25:3 + } +#endif - /* If this is a progressive JPEG ... */ - mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -558,7 +586,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus - uint32_t *imageRow = ((uint32_t*)mImageData) + + // If this is a progressive JPEG ... + mState = mInfo.buffered_image ? +@@ -596,7 +624,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus + uint32_t* imageRow = ((uint32_t*)mImageData) + (mInfo.output_scanline * mInfo.output_width); +#ifdef JCS_EXTENSIONS @@ -75,10 +75,10 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:25:3 +#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { +#endif - /* Special case: scanline will be directly converted into packed ARGB */ + // 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) + *suspend = true; // suspend +@@ -911,6 +943,282 @@ term_source (j_decompress_ptr jd) } // namespace mozilla @@ -358,6 +358,6 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.1 2013/05/23 13:25:3 +#endif + + - /**************** Inverted CMYK -> RGB conversion **************/ - /* - * Input is (Inverted) CMYK stored as 4 bytes per pixel. + ///*************** Inverted CMYK -> RGB conversion ************************* + /// Input is (Inverted) CMYK stored as 4 bytes per pixel. + /// Output is RGB stored as 3 bytes per pixel. diff --git a/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in b/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in index 3c200feb7be..ee64d0f9375 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in +++ b/www/seamonkey/patches/patch-mozilla_js_src_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_js_src_Makefile.in,v 1.7 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_Makefile.in,v 1.8 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/js/src/Makefile.in.orig 2014-12-03 06:22:47.000000000 +0000 +--- mozilla/js/src/Makefile.in.orig 2015-03-09 05:34:25.000000000 +0000 +++ mozilla/js/src/Makefile.in @@ -16,9 +16,6 @@ TOPLEVEL_BUILD := 1 @@ -12,12 +12,3 @@ $NetBSD: patch-mozilla_js_src_Makefile.in,v 1.7 2015/01/02 04:26:21 ryoon Exp $ ifdef JS_HAS_CTYPES ifdef MOZ_NATIVE_FFI LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) -@@ -295,7 +292,7 @@ endif - - ifdef HAVE_DTRACE - $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d -- dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in -+ dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in - sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ - -e '/const/!s/char \*/const char */g' \ - javascript-trace.h.in > javascript-trace.h diff --git a/www/seamonkey/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp b/www/seamonkey/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp index 78ad6dec989..9ad678ab4e6 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp +++ b/www/seamonkey/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.1 2015/02/15 02:11:03 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-02-05 04:38:37.000000000 +0000 +--- mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-03-09 05:34:25.000000000 +0000 +++ mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp -@@ -524,17 +524,62 @@ AsmJSExceptionHandler(LPEXCEPTION_POINTE +@@ -504,8 +504,38 @@ AsmJSFaultHandler(LPEXCEPTION_POINTERS e #elif defined(XP_MACOSX) # include <mach/exc.h> @@ -40,40 +40,9 @@ $NetBSD: patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.1 2015/02/15 02: -ContextToPC(x86_thread_state_t &state) +ContextToPC(moz_platform_thread_state_t &state) { --# if defined(JS_CODEGEN_X64) -- JS_STATIC_ASSERT(sizeof(state.uts.ts64.__rip) == sizeof(void*)); -- return reinterpret_cast<uint8_t**>(&state.uts.ts64.__rip); --# elif defined(JS_CODEGEN_NONE) -- MOZ_CRASH(); -+#if defined(ARM_THREAD_STATE) -+ JS_STATIC_ASSERT(sizeof(state.REG_FIELD(pc)) == sizeof(void*)); -+ return reinterpret_cast<uint8_t**>(&state.REG_FIELD(pc)); -+ -+#elif defined(PPC_THREAD_STATE) || defined(PPC_THREAD_STATE64) -+ JS_STATIC_ASSERT(sizeof(state.REG_FIELD(srr0)) == sizeof(void*)); -+ return reinterpret_cast<uint8_t**>(&state.REG_FIELD(srr0)); -+ -+#elif defined(x86_THREAD_STATE) -+ switch (state.tsh.flavor) { -+ case x86_THREAD_STATE32: -+ JS_STATIC_ASSERT(sizeof(state.uts.ts32.REG_FIELD(eip)) == sizeof(void*)); -+ return reinterpret_cast<uint8_t**>(&state.uts.ts32.REG_FIELD(eip)); -+ -+ case x86_THREAD_STATE64: -+ JS_STATIC_ASSERT(sizeof(state.uts.ts64.REG_FIELD(rip)) == sizeof(void*)); -+ return reinterpret_cast<uint8_t**>(&state.uts.ts64.REG_FIELD(rip)); -+ -+ default: -+ MOZ_CRASH("Unknown thread state flavor"); -+ } - # else -- JS_STATIC_ASSERT(sizeof(state.uts.ts32.__eip) == sizeof(void*)); -- return reinterpret_cast<uint8_t**>(&state.uts.ts32.__eip); -+# error Instruction address register unknown for this platform - # endif - } - -@@ -637,10 +682,11 @@ HandleMachException(JSRuntime *rt, const + # if defined(JS_CPU_X64) + static_assert(sizeof(state.uts.ts64.__rip) == sizeof(void*), +@@ -617,10 +647,11 @@ HandleMachException(JSRuntime *rt, const mach_port_t rtThread = request.body.thread.name; // Read out the JSRuntime thread's register state. @@ -88,12 +57,3 @@ $NetBSD: patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.1 2015/02/15 02: if (kret != KERN_SUCCESS) return false; -@@ -682,7 +728,7 @@ HandleMachException(JSRuntime *rt, const - module.unprotectCode(rt); - - // Update the thread state with the new pc. -- kret = thread_set_state(rtThread, x86_THREAD_STATE, (thread_state_t)&state, x86_THREAD_STATE_COUNT); -+ kret = thread_set_state(rtThread, flavor, (thread_state_t)&state, count); - return kret == KERN_SUCCESS; - } - diff --git a/www/seamonkey/patches/patch-mozilla_js_src_gc_Statistics.cpp b/www/seamonkey/patches/patch-mozilla_js_src_gc_Statistics.cpp new file mode 100644 index 00000000000..6bb2708dd36 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_gc_Statistics.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-mozilla_js_src_gc_Statistics.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/js/src/gc/Statistics.cpp.orig 2015-03-09 05:34:28.000000000 +0000 ++++ mozilla/js/src/gc/Statistics.cpp +@@ -222,8 +222,8 @@ class gcstats::StatisticsSerializer + while (*c) { + if (*c == ' ' || *c == '\t') + p('_'); +- else if (isupper(*c)) +- p(tolower(*c)); ++ else if (isupper((unsigned char)*c)) ++ p(tolower((unsigned char)*c)); + else if (*c == '+') + p("added_"); + else if (*c == '-') diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h b/www/seamonkey/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h index ab0e0c2411a..305259599a1 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h +++ b/www/seamonkey/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h @@ -1,13 +1,16 @@ -$NetBSD: patch-mozilla_js_src_jit_ExecutableAllocator.h,v 1.1 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jit_ExecutableAllocator.h,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/js/src/jit/ExecutableAllocator.h.orig 2014-12-03 06:22:56.000000000 +0000 +--- mozilla/js/src/jit/ExecutableAllocator.h.orig 2015-03-09 05:34:36.000000000 +0000 +++ mozilla/js/src/jit/ExecutableAllocator.h -@@ -428,7 +428,7 @@ public: +@@ -425,6 +425,11 @@ public: #undef GCC_VERSION } --#elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) -+#elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID) || defined(__NetBSD__)) && defined(__GNUC__) ++#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__)) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast<char*>(code) + size); ++ } + #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) static void cacheFlush(void* code, size_t size) { - asm volatile ( diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jit_LIR.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jit_LIR.cpp new file mode 100644 index 00000000000..390bb01d531 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_jit_LIR.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_js_src_jit_LIR.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/js/src/jit/LIR.cpp.orig 2015-03-09 05:34:37.000000000 +0000 ++++ mozilla/js/src/jit/LIR.cpp +@@ -314,7 +314,7 @@ LNode::printName(FILE *fp, Opcode op) + const char *name = names[op]; + size_t len = strlen(name); + for (size_t i = 0; i < len; i++) +- fprintf(fp, "%c", tolower(name[i])); ++ fprintf(fp, "%c", tolower(((unsigned char)name[i]))); + } + + void diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jit_MIR.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jit_MIR.cpp new file mode 100644 index 00000000000..4419ecfe174 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_jit_MIR.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_js_src_jit_MIR.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/js/src/jit/MIR.cpp.orig 2015-03-09 05:34:37.000000000 +0000 ++++ mozilla/js/src/jit/MIR.cpp +@@ -68,7 +68,7 @@ MDefinition::PrintOpcodeName(FILE *fp, M + const char *name = names[op]; + size_t len = strlen(name); + for (size_t i = 0; i < len; i++) +- fprintf(fp, "%c", tolower(name[i])); ++ fprintf(fp, "%c", tolower(((unsigned char)name[i]))); + } + + static MConstant * diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp index 6011b1e22ea..9fb89beddc6 100644 --- a/www/seamonkey/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp +++ b/www/seamonkey/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-mozilla_js_src_jit_arm_Architecture-arm.cpp,v 1.1 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jit_arm_Architecture-arm.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/js/src/jit/arm/Architecture-arm.cpp.orig 2014-12-03 06:22:56.000000000 +0000 +--- mozilla/js/src/jit/arm/Architecture-arm.cpp.orig 2015-03-09 05:34:37.000000000 +0000 +++ mozilla/js/src/jit/arm/Architecture-arm.cpp @@ -16,7 +16,7 @@ #include "jit/arm/Assembler-arm.h" #include "jit/RegisterSets.h" -#if defined(ANDROID) || defined(JS_ARM_SIMULATOR) -+#if defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__) ++#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__) // The Android NDK and B2G do not include the hwcap.h kernel header, and it is not // defined when building the simulator, so inline the header defines we need. # define HWCAP_VFP (1 << 6) diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsapi.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jsapi.cpp new file mode 100644 index 00000000000..ebc56e01bff --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_jsapi.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-mozilla_js_src_jsapi.cpp,v 1.3 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/js/src/jsapi.cpp.orig 2015-03-09 05:34:38.000000000 +0000 ++++ mozilla/js/src/jsapi.cpp +@@ -233,7 +233,7 @@ JS_ConvertArgumentsVA(JSContext *cx, con + assertSameCompartment(cx, args); + required = true; + while ((c = *format++) != '\0') { +- if (isspace(c)) ++ if (isspace(((unsigned char)c))) + continue; + if (c == '/') { + required = false; +@@ -522,7 +522,7 @@ MessageParameterCount(const char *format + { + unsigned numfmtspecs = 0; + for (const char *fmt = format; *fmt != '\0'; fmt++) { +- if (*fmt == '{' && isdigit(fmt[1])) ++ if (*fmt == '{' && isdigit((unsigned char)fmt[1])) + ++numfmtspecs; + } + return numfmtspecs; diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsdate.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jsdate.cpp new file mode 100644 index 00000000000..7f27148683c --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_jsdate.cpp @@ -0,0 +1,20 @@ +$NetBSD: patch-mozilla_js_src_jsdate.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/js/src/jsdate.cpp.orig 2015-03-09 05:34:38.000000000 +0000 ++++ mozilla/js/src/jsdate.cpp +@@ -2651,11 +2651,11 @@ ToLocaleFormatHelper(JSContext *cx, Hand + if (strcmp(format, "%x") == 0 && result_len >= 6 && + /* Format %x means use OS settings, which may have 2-digit yr, so + hack end of 3/11/22 or 11.03.22 or 11Mar22 to use 4-digit yr...*/ +- !isdigit(buf[result_len - 3]) && +- isdigit(buf[result_len - 2]) && isdigit(buf[result_len - 1]) && ++ !isdigit(((unsigned char)buf[result_len - 3])) && ++ isdigit(((unsigned char)buf[result_len - 2])) && isdigit(((unsigned char)buf[result_len - 1])) && + /* ...but not if starts with 4-digit year, like 2022/3/11. */ +- !(isdigit(buf[0]) && isdigit(buf[1]) && +- isdigit(buf[2]) && isdigit(buf[3]))) { ++ !(isdigit(((unsigned char)buf[0])) && isdigit(((unsigned char)buf[1])) && ++ isdigit(((unsigned char)buf[2])) && isdigit(((unsigned char)buf[3])))) { + double localtime = obj->as<DateObject>().cachedLocalTime(&cx->runtime()->dateTimeInfo); + int year = IsNaN(localtime) ? 0 : (int) YearFromTime(localtime); + JS_snprintf(buf + (result_len - 2), (sizeof buf) - (result_len - 2), diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jskwgen.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jskwgen.cpp new file mode 100644 index 00000000000..f9d74bb8724 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_jskwgen.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_js_src_jskwgen.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/js/src/jskwgen.cpp.orig 2015-03-09 05:34:39.000000000 +0000 ++++ mozilla/js/src/jskwgen.cpp +@@ -181,7 +181,7 @@ qchar(char c, char *quoted_buffer) + *s++ = '\\'; + break; + default: +- if (!isprint(c)) { ++ if (!isprint(((unsigned char)c))) { + *s++ = '\\'; + *s++ = (char)('0' + (0x3 & (((unsigned char)c) >> 6))); + *s++ = (char)('0' + (0x7 & (((unsigned char)c) >> 3))); diff --git a/www/seamonkey/patches/patch-mozilla_js_src_shell_jsoptparse.cpp b/www/seamonkey/patches/patch-mozilla_js_src_shell_jsoptparse.cpp new file mode 100644 index 00000000000..cb1b95dd830 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_js_src_shell_jsoptparse.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-mozilla_js_src_shell_jsoptparse.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/js/src/shell/jsoptparse.cpp.orig 2015-03-09 05:34:41.000000000 +0000 ++++ mozilla/js/src/shell/jsoptparse.cpp +@@ -90,11 +90,11 @@ PrintParagraph(const char *text, unsigne + printf("%*s", startColno, ""); + + while (*it != '\0') { +- MOZ_ASSERT(!isspace(*it)); ++ MOZ_ASSERT(!isspace((unsigned char)*it)); + + /* Delimit the current token. */ + const char *limit = it; +- while (!isspace(*limit) && *limit != '\0') ++ while (!isspace(((unsigned char)*limit)) && *limit != '\0') + ++limit; + + /* diff --git a/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c b/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c index e2dff0be165..6c8c89d3c6a 100644 --- a/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c +++ b/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.4 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/media/libcubeb/src/cubeb_alsa.c.orig 2014-12-03 06:23:08.000000000 +0000 +--- mozilla/media/libcubeb/src/cubeb_alsa.c.orig 2015-03-09 05:34:21.000000000 +0000 +++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -6,11 +6,15 @@ +@@ -6,12 +6,18 @@ */ #undef NDEBUG #define _BSD_SOURCE @@ -16,9 +16,12 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 #include <limits.h> +#include <dlfcn.h> #include <poll.h> ++#include <stdlib.h> ++#include <stdio.h> #include <unistd.h> #include <alsa/asoundlib.h> -@@ -24,6 +28,50 @@ + #include "cubeb/cubeb.h" +@@ -24,6 +30,51 @@ #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" @@ -41,6 +44,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 +MAKE_TYPEDEF(snd_pcm_close); +MAKE_TYPEDEF(snd_pcm_delay); +MAKE_TYPEDEF(snd_pcm_drain); ++MAKE_TYPEDEF(snd_pcm_forward); +MAKE_TYPEDEF(snd_pcm_frames_to_bytes); +MAKE_TYPEDEF(snd_pcm_get_params); +/* snd_pcm_hw_params_alloca is actually a macro */ @@ -69,7 +73,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 /* ALSA is not thread-safe. snd_pcm_t instances are individually protected by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), -@@ -64,6 +112,8 @@ struct cubeb { +@@ -64,6 +115,8 @@ struct cubeb { workaround is not required. */ snd_config_t * local_config; int is_pa; @@ -78,30 +82,62 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 }; enum stream_state { -@@ -262,7 +312,7 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -257,32 +310,35 @@ alsa_refill_stream(cubeb_stream * stm) + long got; + void * p; + int draining; ++ unsigned pipefailures, againfailures; + + draining = 0; pthread_mutex_lock(&stm->mutex); - r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); -+ r = WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); - if (r < 0 || revents != POLLOUT) { - /* This should be a stream error; it makes no sense for poll(2) to wake - for this stream and then have the stream report that it's not ready. -@@ -271,10 +321,10 @@ alsa_refill_stream(cubeb_stream * stm) - return RUNNING; - } - +- if (r < 0 || revents != POLLOUT) { +- /* This should be a stream error; it makes no sense for poll(2) to wake +- for this stream and then have the stream report that it's not ready. +- Unfortunately, this does happen, so just bail out and try again. */ +- pthread_mutex_unlock(&stm->mutex); +- return RUNNING; +- } +- - avail = snd_pcm_avail_update(stm->pcm); -+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); - if (avail == -EPIPE) { +- if (avail == -EPIPE) { - snd_pcm_recover(stm->pcm, avail, 1); - avail = snd_pcm_avail_update(stm->pcm); +- } ++ for (pipefailures = 0;;) { ++ r = WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); ++ if (r < 0 || revents != POLLOUT || ++ (avail = WRAP(snd_pcm_avail_update)(stm->pcm)) == 0) { ++ /* This should be a stream error; it makes no sense for poll(2) to wake ++ for this stream and then have the stream report that it's not ready. ++ Unfortunately, this does happen, so just bail out and try again. */ ++ pthread_mutex_unlock(&stm->mutex); ++ return RUNNING; ++ } + +- /* Failed to recover from an xrun, this stream must be broken. */ +- if (avail < 0) { +- pthread_mutex_unlock(&stm->mutex); +- stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); +- return ERROR; ++ if (avail > 0) ++ break; ++ if (pipefailures++ > 11) { ++ fprintf(stderr, "%s: repeated failures from snd_pcm_avail_update, " ++ "giving up\n", __func__); ++ pthread_mutex_unlock(&stm->mutex); ++ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); ++ return ERROR; ++ } + WRAP(snd_pcm_recover)(stm->pcm, avail, 1); -+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); } ++ pipefailures = againfailures = 0; - /* Failed to recover from an xrun, this stream must be broken. */ -@@ -293,8 +343,8 @@ alsa_refill_stream(cubeb_stream * stm) + /* This should never happen. */ + if ((unsigned int) avail > stm->buffer_size) { +@@ -293,8 +349,8 @@ alsa_refill_stream(cubeb_stream * stm) available to write. If avail is still zero here, the stream must be in a funky state, so recover and try again. */ if (avail == 0) { @@ -112,7 +148,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (avail <= 0) { pthread_mutex_unlock(&stm->mutex); stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); -@@ -302,7 +352,7 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -302,7 +358,7 @@ alsa_refill_stream(cubeb_stream * stm) } } @@ -121,21 +157,91 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 assert(p); pthread_mutex_unlock(&stm->mutex); -@@ -327,10 +377,10 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -311,10 +367,11 @@ alsa_refill_stream(cubeb_stream * stm) + if (got < 0) { + pthread_mutex_unlock(&stm->mutex); + stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); ++ free(p); + return ERROR; + } + if (got > 0) { +- snd_pcm_sframes_t wrote; ++ snd_pcm_sframes_t wrote, towrite = got; + + if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) { + float * b = (float *) p; +@@ -327,14 +384,62 @@ alsa_refill_stream(cubeb_stream * stm) b[i] *= stm->volume; } } - wrote = snd_pcm_writei(stm->pcm, p, got); -+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); - if (wrote == -EPIPE) { +- if (wrote == -EPIPE) { - snd_pcm_recover(stm->pcm, wrote, 1); - wrote = snd_pcm_writei(stm->pcm, p, got); -+ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1); -+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); - } - assert(wrote >= 0 && wrote == got); - stm->write_position += wrote; -@@ -342,7 +392,7 @@ alsa_refill_stream(cubeb_stream * stm) +- } +- assert(wrote >= 0 && wrote == got); +- stm->write_position += wrote; +- gettimeofday(&stm->last_activity, NULL); ++ for (;;) { ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, ++ towrite > avail ? avail : towrite); ++ switch(wrote) { ++ case -EPIPE: ++ if (pipefailures++ > 3) { ++ fprintf(stderr, "%s: Too many underflows, giving up\n", __func__); ++ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); ++ pthread_mutex_unlock(&stm->mutex); ++ free(p); ++ return ERROR; ++ } ++ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1); ++ continue; ++ case -EAGAIN: ++ if (againfailures++ > 3) { ++ fprintf(stderr, "%s: Too many -EAGAIN errors from snd_pcm_writei, " ++ "giving up\n", __func__); ++ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); ++ pthread_mutex_unlock(&stm->mutex); ++ free(p); ++ return ERROR; ++ } ++ continue; ++ case -EBADFD: ++ fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n", ++ __func__, "EBADFD"); ++ free(p); ++ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); ++ pthread_mutex_unlock(&stm->mutex); ++ return ERROR; ++ } ++ if (wrote < 0) { ++ fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, " ++ "giving up\n", __func__, (long long)wrote); ++ free(p); ++ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); ++ pthread_mutex_unlock(&stm->mutex); ++ return ERROR; ++ } ++ pipefailures = againfailures = 0; ++ stm->write_position += wrote; ++ gettimeofday(&stm->last_activity, NULL); ++ if (wrote > towrite) { ++ fprintf(stderr, "%s: snc_pcm_writei wrote %lld frames, which was more " ++ "than we requested (%lld). This should not happen, giving up\n", ++ __func__, (long long)wrote, (long long)towrite); ++ free(p); ++ stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); ++ pthread_mutex_unlock(&stm->mutex); ++ return ERROR; ++ } ++ if (towrite == wrote) ++ break; ++ towrite -= wrote; ++ } + } + if (got != avail) { + long buffer_fill = stm->buffer_size - (avail - got); +@@ -342,7 +447,7 @@ alsa_refill_stream(cubeb_stream * stm) /* Fill the remaining buffer with silence to guarantee one full period has been written. */ @@ -144,7 +250,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 set_timeout(&stm->drain_timeout, buffer_time * 1000); -@@ -453,26 +503,26 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -453,26 +558,26 @@ get_slave_pcm_node(snd_config_t * lconf, slave_def = NULL; @@ -176,7 +282,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (r < 0) { break; } -@@ -481,7 +531,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -481,7 +586,7 @@ get_slave_pcm_node(snd_config_t * lconf, if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -185,7 +291,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (r < 0) { break; } -@@ -490,7 +540,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -490,7 +595,7 @@ get_slave_pcm_node(snd_config_t * lconf, } while (0); if (slave_def) { @@ -194,7 +300,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 } return NULL; -@@ -513,22 +563,22 @@ init_local_config_with_workaround(char c +@@ -513,22 +618,22 @@ init_local_config_with_workaround(char c lconf = NULL; @@ -221,7 +327,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (r < 0) { break; } -@@ -537,7 +587,7 @@ init_local_config_with_workaround(char c +@@ -537,7 +642,7 @@ init_local_config_with_workaround(char c if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -230,7 +336,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (r < 0) { break; } -@@ -548,12 +598,12 @@ init_local_config_with_workaround(char c +@@ -548,12 +653,12 @@ init_local_config_with_workaround(char c } /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ @@ -245,7 +351,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (r < 0) { break; } -@@ -564,18 +614,18 @@ init_local_config_with_workaround(char c +@@ -564,18 +669,18 @@ init_local_config_with_workaround(char c /* Don't clobber an explicit existing handle_underrun value, set it only if it doesn't already exist. */ @@ -267,7 +373,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (r < 0) { break; } -@@ -583,7 +633,7 @@ init_local_config_with_workaround(char c +@@ -583,7 +688,7 @@ init_local_config_with_workaround(char c return lconf; } while (0); @@ -276,7 +382,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 return NULL; } -@@ -595,9 +645,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s +@@ -595,9 +700,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s pthread_mutex_lock(&cubeb_alsa_mutex); if (local_config) { @@ -288,7 +394,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -610,7 +660,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) +@@ -610,7 +715,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) int r; pthread_mutex_lock(&cubeb_alsa_mutex); @@ -297,7 +403,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 pthread_mutex_unlock(&cubeb_alsa_mutex); return r; -@@ -667,12 +717,65 @@ alsa_init(cubeb ** context, char const * +@@ -667,12 +772,65 @@ alsa_init(cubeb ** context, char const * pthread_attr_t attr; snd_pcm_t * dummy; @@ -364,7 +470,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 cubeb_alsa_error_handler_set = 1; } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -680,6 +783,8 @@ alsa_init(cubeb ** context, char const * +@@ -680,6 +838,8 @@ alsa_init(cubeb ** context, char const * ctx = calloc(1, sizeof(*ctx)); assert(ctx); @@ -373,7 +479,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 ctx->ops = &alsa_ops; r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -729,7 +834,7 @@ alsa_init(cubeb ** context, char const * +@@ -729,7 +889,7 @@ alsa_init(cubeb ** context, char const * config fails with EINVAL, the PA PCM is too old for this workaround. */ if (r == -EINVAL) { pthread_mutex_lock(&cubeb_alsa_mutex); @@ -382,7 +488,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 pthread_mutex_unlock(&cubeb_alsa_mutex); ctx->local_config = NULL; } else if (r >= 0) { -@@ -768,9 +873,13 @@ alsa_destroy(cubeb * ctx) +@@ -768,9 +928,13 @@ alsa_destroy(cubeb * ctx) pthread_mutex_destroy(&ctx->mutex); free(ctx->fds); @@ -397,7 +503,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 pthread_mutex_unlock(&cubeb_alsa_mutex); } -@@ -838,7 +947,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre +@@ -838,7 +1002,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre return CUBEB_ERROR; } @@ -406,7 +512,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 assert(r == 0); /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't -@@ -848,23 +957,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre +@@ -848,23 +1012,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre latency = latency < 500 ? 500 : latency; } @@ -436,7 +542,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 assert((nfds_t) r == stm->nfds); r = pthread_cond_init(&stm->cond, NULL); -@@ -895,7 +1004,7 @@ alsa_stream_destroy(cubeb_stream * stm) +@@ -895,7 +1059,7 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); if (stm->pcm) { if (stm->state == DRAINING) { @@ -445,7 +551,19 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 } alsa_locked_pcm_close(stm->pcm); stm->pcm = NULL; -@@ -937,12 +1046,12 @@ alsa_get_max_channel_count(cubeb * ctx, +@@ -905,7 +1069,10 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_destroy(&stm->mutex); + + r = pthread_cond_destroy(&stm->cond); +- assert(r == 0); ++ if (r != 0) { /* XXX stopgap until someone figures out the real reason */ ++ fprintf(stderr,"alsa_stream_destroy: pthread_cond_destroy failed: %s", ++ strerror(r)); ++ } + + alsa_unregister_stream(stm); + +@@ -937,12 +1104,12 @@ alsa_get_max_channel_count(cubeb * ctx, return CUBEB_ERROR; } @@ -460,7 +578,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 if (rv < 0) { return CUBEB_ERROR; } -@@ -962,34 +1071,34 @@ alsa_get_preferred_sample_rate(cubeb * c +@@ -962,34 +1129,34 @@ alsa_get_preferred_sample_rate(cubeb * c /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ @@ -503,7 +621,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 return CUBEB_OK; } -@@ -1013,7 +1122,7 @@ alsa_stream_start(cubeb_stream * stm) +@@ -1013,7 +1180,7 @@ alsa_stream_start(cubeb_stream * stm) ctx = stm->context; pthread_mutex_lock(&stm->mutex); @@ -512,7 +630,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 gettimeofday(&stm->last_activity, NULL); pthread_mutex_unlock(&stm->mutex); -@@ -1047,7 +1156,7 @@ alsa_stream_stop(cubeb_stream * stm) +@@ -1047,7 +1214,7 @@ alsa_stream_stop(cubeb_stream * stm) pthread_mutex_unlock(&ctx->mutex); pthread_mutex_lock(&stm->mutex); @@ -521,7 +639,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1063,8 +1172,8 @@ alsa_stream_get_position(cubeb_stream * +@@ -1063,14 +1230,17 @@ alsa_stream_get_position(cubeb_stream * pthread_mutex_lock(&stm->mutex); delay = -1; @@ -532,7 +650,17 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2015/01/02 04:26:2 *position = stm->last_position; pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1089,7 +1198,7 @@ alsa_stream_get_latency(cubeb_stream * s + } + +- assert(delay >= 0); ++ if (delay < 0) { ++ WRAP(snd_pcm_forward)(stm->pcm, -delay); ++ delay = 0; ++ } + + *position = 0; + if (stm->write_position >= (snd_pcm_uframes_t) delay) { +@@ -1089,7 +1259,7 @@ alsa_stream_get_latency(cubeb_stream * s snd_pcm_sframes_t delay; /* This function returns the delay in frames until a frame written using snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ diff --git a/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c b/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c index a46d16cc753..775c8369665 100644 --- a/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c +++ b/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__oss.c,v 1.2 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__oss.c,v 1.3 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/media/libcubeb/src/cubeb_oss.c.orig 2015-01-01 17:44:53.000000000 +0000 +--- mozilla/media/libcubeb/src/cubeb_oss.c.orig 2015-03-16 18:51:31.000000000 +0000 +++ mozilla/media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,404 @@ +@@ -0,0 +1,402 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -11,8 +11,6 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__oss.c,v 1.2 2015/01/02 04:26:21 + */ +#if defined(HAVE_SYS_SOUNDCARD_H) +#include <sys/soundcard.h> -+#elif defined(HAVE_LINUX_SOUNDCARD_H) -+#include <linux/soundcard.h> +#else +#include <soundcard.h> +#endif diff --git a/www/seamonkey/patches/patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h b/www/seamonkey/patches/patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h deleted file mode 100644 index 0b653235f95..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h,v 1.1 2014/11/02 05:40:31 ryoon Exp $ - ---- mozilla/media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h.orig 2014-10-14 06:36:30.000000000 +0000 -+++ mozilla/media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h -@@ -75,6 +75,9 @@ struct AString { - bool startsWith(const char *prefix) const; - bool endsWith(const char *suffix) const; - -+#if defined(__NetBSD__) && defined(tolower) -+#undef tolower -+#endif - void tolower(); - - private: diff --git a/www/seamonkey/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp b/www/seamonkey/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp index 308c72d1327..781de5a4413 100644 --- a/www/seamonkey/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp +++ b/www/seamonkey/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.1 2014/11/02 05:40:31 ryoon Exp $ +$NetBSD: patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2014-10-14 06:36:30.000000000 +0000 +--- mozilla/media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2015-03-09 05:34:24.000000000 +0000 +++ mozilla/media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp -@@ -23,6 +23,13 @@ +@@ -23,6 +23,17 @@ #include "ADebug.h" #include "AString.h" @@ -13,6 +13,10 @@ $NetBSD: patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_f +# endif +#endif + ++#if defined(__NetBSD__) && defined(tolower) ++#undef tolower ++#endif ++ namespace stagefright { // static diff --git a/www/seamonkey/patches/patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c b/www/seamonkey/patches/patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c new file mode 100644 index 00000000000..dad9b88311e --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c @@ -0,0 +1,27 @@ +$NetBSD: patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/media/libstagefright/system/core/liblog/fake_log_device.c.orig 2015-03-09 05:34:24.000000000 +0000 ++++ mozilla/media/libstagefright/system/core/liblog/fake_log_device.c +@@ -229,11 +229,11 @@ static void configureInitialState(const + char tagName[kMaxTagLen]; + int i, minPrio; + +- while (isspace(*tags)) ++ while (isspace((unsigned char)*tags)) + tags++; + + i = 0; +- while (*tags != '\0' && !isspace(*tags) && *tags != ':' && ++ while (*tags != '\0' && !isspace((unsigned char)*tags) && *tags != ':' && + i < kMaxTagLen) + { + tagName[i++] = *tags++; +@@ -272,7 +272,7 @@ static void configureInitialState(const + } + + tags++; +- if (*tags != '\0' && !isspace(*tags)) { ++ if (*tags != '\0' && !isspace((unsigned char)*tags)) { + TRACE("ERROR: garbage in tag env; expected whitespace\n"); + TRACE(" env='%s'\n", tags); + return; diff --git a/www/seamonkey/patches/patch-mozilla_media_libstagefright_system_core_liblog_logprint.c b/www/seamonkey/patches/patch-mozilla_media_libstagefright_system_core_liblog_logprint.c new file mode 100644 index 00000000000..79b27018530 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_libstagefright_system_core_liblog_logprint.c @@ -0,0 +1,22 @@ +$NetBSD: patch-mozilla_media_libstagefright_system_core_liblog_logprint.c,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/media/libstagefright/system/core/liblog/logprint.c.orig 2015-03-09 05:34:24.000000000 +0000 ++++ mozilla/media/libstagefright/system/core/liblog/logprint.c +@@ -101,7 +101,7 @@ static android_LogPriority filterCharToP + { + android_LogPriority pri; + +- c = tolower(c); ++ c = tolower((unsigned char)c); + + if (c >= '0' && c <= '9') { + if (c >= ('0'+ANDROID_LOG_SILENT)) { +@@ -370,7 +370,7 @@ static inline char * strip_end(char *str + { + char *end = str + strlen(str) - 1; + +- while (end >= str && isspace(*end)) ++ while (end >= str && isspace((unsigned char)*end)) + *end-- = '\0'; + return str; + } diff --git a/www/seamonkey/patches/patch-mozilla_media_libtheora_Makefile.in b/www/seamonkey/patches/patch-mozilla_media_libtheora_Makefile.in deleted file mode 100644 index 247e9b24c8d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_media_libtheora_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_media_libtheora_Makefile.in,v 1.1 2014/03/30 04:13:17 ryoon Exp $ - ---- mozilla/media/libtheora/Makefile.in.orig 2014-03-29 04:22:17.000000000 +0000 -+++ mozilla/media/libtheora/Makefile.in -@@ -0,0 +1,9 @@ -+# This Source Code Form is subject to the terms of the Mozilla Public -+# License, v. 2.0. If a copy of the MPL was not distributed with this -+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ -+include $(topsrcdir)/config/rules.mk -+ -+ifdef MOZ_NATIVE_OGG -+CFLAGS += $(MOZ_OGG_CFLAGS) -+endif diff --git a/www/seamonkey/patches/patch-mozilla_media_libtheora_lib_info.c b/www/seamonkey/patches/patch-mozilla_media_libtheora_lib_info.c new file mode 100644 index 00000000000..f1d57a37a4d --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_libtheora_lib_info.c @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_media_libtheora_lib_info.c,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/media/libtheora/lib/info.c.orig 2015-03-09 05:34:24.000000000 +0000 ++++ mozilla/media/libtheora/lib/info.c +@@ -29,7 +29,7 @@ + static int oc_tagcompare(const char *_s1,const char *_s2,int _n){ + int c; + for(c=0;c<_n;c++){ +- if(toupper(_s1[c])!=toupper(_s2[c]))return !0; ++ if(toupper((unsigned char)_s1[c])!=toupper((unsigned char)_s2[c]))return !0; + } + return _s1[c]!='='; + } diff --git a/www/seamonkey/patches/patch-mozilla_media_libtheora_moz.build b/www/seamonkey/patches/patch-mozilla_media_libtheora_moz.build index ed29f9c8917..800ff7d8337 100644 --- a/www/seamonkey/patches/patch-mozilla_media_libtheora_moz.build +++ b/www/seamonkey/patches/patch-mozilla_media_libtheora_moz.build @@ -1,10 +1,10 @@ -$NetBSD: patch-mozilla_media_libtheora_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_media_libtheora_moz.build,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/media/libtheora/moz.build.orig 2014-12-03 06:23:09.000000000 +0000 +--- mozilla/media/libtheora/moz.build.orig 2015-03-09 05:34:24.000000000 +0000 +++ mozilla/media/libtheora/moz.build -@@ -6,3 +6,5 @@ - - DIRS += ['include', 'lib'] +@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']: + if CONFIG['OS_TARGET'] == 'Android': + DEFINES['__linux__'] = True +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] diff --git a/www/seamonkey/patches/patch-mozilla_media_libvorbis_lib_vorbis__info.c b/www/seamonkey/patches/patch-mozilla_media_libvorbis_lib_vorbis__info.c new file mode 100644 index 00000000000..e0dfa289973 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_libvorbis_lib_vorbis__info.c @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_media_libvorbis_lib_vorbis__info.c,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/media/libvorbis/lib/vorbis_info.c.orig 2015-03-09 05:34:24.000000000 +0000 ++++ mozilla/media/libvorbis/lib/vorbis_info.c +@@ -87,7 +87,7 @@ void vorbis_comment_add_tag(vorbis_comme + static int tagcompare(const char *s1, const char *s2, int n){ + int c=0; + while(c < n){ +- if(toupper(s1[c]) != toupper(s2[c])) ++ if(toupper((unsigned char)s1[c]) != toupper((unsigned char)s2[c])) + return !0; + c++; + } diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_signaling_test_moz.build b/www/seamonkey/patches/patch-mozilla_media_webrtc_signaling_test_moz.build index 91bcf6933c7..0ac6b81fbf6 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_signaling_test_moz.build +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_signaling_test_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_webrtc_signaling_test_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_signaling_test_moz.build,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/media/webrtc/signaling/test/moz.build.orig 2014-12-03 06:23:09.000000000 +0000 +--- mozilla/media/webrtc/signaling/test/moz.build.orig 2015-03-09 05:34:28.000000000 +0000 +++ mozilla/media/webrtc/signaling/test/moz.build -@@ -118,6 +118,7 @@ if CONFIG['JS_SHARED_LIBRARY']: +@@ -112,15 +112,19 @@ if CONFIG['JS_SHARED_LIBRARY']: 'js', ] @@ -10,7 +10,11 @@ $NetBSD: patch-mozilla_media_webrtc_signaling_test_moz.build,v 1.1 2015/01/02 04 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] OS_LIBS += CONFIG['REALTIME_LIBS'] -@@ -127,6 +128,9 @@ if CONFIG['MOZ_ALSA']: +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] ++if CONFIG['MOZ_OSS']: ++ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] + if CONFIG['MOZ_NATIVE_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc new file mode 100644 index 00000000000..686890a8c31 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc @@ -0,0 +1,20 @@ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc.orig 2015-03-09 05:34:40.000000000 +0000 ++++ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc +@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDe + // Assume that render timing errors are due to changes in the video stream. + if (next_render_time_ms < 0) { + timing_error = true; +- } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) { ++ } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) > ++ max_video_delay_ms_) { + WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding, + VCMId(vcm_id_, receiver_id_), + "This frame is out of our delay bounds, resetting jitter " + "buffer: %d > %d", +- static_cast<int>(std::abs(next_render_time_ms - now_ms)), ++ std::abs(static_cast<int>(next_render_time_ms - now_ms)), + max_video_delay_ms_); + timing_error = true; + } else if (static_cast<int>(timing_->TargetVideoDelay()) > diff --git a/www/seamonkey/patches/patch-mozilla_memory_build_mozjemalloc__compat.c b/www/seamonkey/patches/patch-mozilla_memory_build_mozjemalloc__compat.c index 1680860575d..d67bc2c16b7 100644 --- a/www/seamonkey/patches/patch-mozilla_memory_build_mozjemalloc__compat.c +++ b/www/seamonkey/patches/patch-mozilla_memory_build_mozjemalloc__compat.c @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.1 2015/01/02 04:26:21 ryoon Exp $ +$NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/memory/build/mozjemalloc_compat.c.orig 2014-12-03 06:23:14.000000000 +0000 +--- mozilla/memory/build/mozjemalloc_compat.c.orig 2015-03-09 05:34:43.000000000 +0000 +++ mozilla/memory/build/mozjemalloc_compat.c @@ -12,6 +12,8 @@ #include "jemalloc_types.h" @@ -77,20 +77,7 @@ $NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.1 2015/01/02 04:26 MOZ_JEMALLOC_API void jemalloc_stats_impl(jemalloc_stats_t *stats) { -@@ -68,6 +122,12 @@ jemalloc_stats_impl(jemalloc_stats_t *st - size_t active, allocated, mapped, page, pdirty; - size_t lg_chunk; - -+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in -+ // src/ctl.c -+ uint64_t epoch = 0; -+ size_t esz = sizeof(epoch); -+ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); -+ - CTL_GET("arenas.narenas", narenas); - CTL_GET("arenas.page", page); - CTL_GET("stats.active", active); -@@ -87,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *st +@@ -93,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *st // We could get this value out of base.c::base_pages, but that really should // be an upstream change, so don't worry about it for now. stats->bookkeeping = 0; diff --git a/www/seamonkey/patches/patch-mozilla_mobile_android_installer_Makefile.in b/www/seamonkey/patches/patch-mozilla_mobile_android_installer_Makefile.in new file mode 100644 index 00000000000..7d16ce60324 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_mobile_android_installer_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-mozilla_mobile_android_installer_Makefile.in,v 1.3 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/mobile/android/installer/Makefile.in.orig 2015-03-09 05:34:48.000000000 +0000 ++++ mozilla/mobile/android/installer/Makefile.in +@@ -55,6 +55,10 @@ BINPATH = bin + endif + DEFINES += -DBINPATH=$(BINPATH) + ++ifdef MOZ_DEBUG ++DEFINES += -DMOZ_DEBUG=1 ++endif ++ + ifdef ENABLE_MARIONETTE + DEFINES += -DENABLE_MARIONETTE=1 + endif diff --git a/www/seamonkey/patches/patch-mozilla_mobile_android_installer_package-manifest.in b/www/seamonkey/patches/patch-mozilla_mobile_android_installer_package-manifest.in new file mode 100644 index 00000000000..c2be3e19c77 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_mobile_android_installer_package-manifest.in @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_mobile_android_installer_package-manifest.in,v 1.3 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/mobile/android/installer/package-manifest.in.orig 2015-03-09 05:34:48.000000000 +0000 ++++ mozilla/mobile/android/installer/package-manifest.in +@@ -440,7 +440,7 @@ + @BINPATH@/components/dom_webspeechsynth.xpt + #endif + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @BINPATH@/components/TestInterfaceJS.js + @BINPATH@/components/TestInterfaceJS.manifest + #endif diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_base_public_nsNetUtil.h b/www/seamonkey/patches/patch-mozilla_netwerk_base_public_nsNetUtil.h new file mode 100644 index 00000000000..35963c5b524 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_netwerk_base_public_nsNetUtil.h @@ -0,0 +1,39 @@ +$NetBSD: patch-mozilla_netwerk_base_public_nsNetUtil.h,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/netwerk/base/public/nsNetUtil.h.orig 2015-03-09 05:34:54.000000000 +0000 ++++ mozilla/netwerk/base/public/nsNetUtil.h +@@ -13,6 +13,7 @@ + #include "nsMemory.h" + #include "nsCOMPtr.h" + #include "prio.h" // for read/write flags, permissions, etc. ++#include "prnetdb.h" + #include "nsHashKeys.h" + + #include "plstr.h" +@@ -2869,6 +2870,26 @@ NS_IsSrcdocChannel(nsIChannel *aChannel) + bool NS_IsReasonableHTTPHeaderValue(const nsACString& aValue); + + /** ++ * Return a host endian value decoded from network byte order, ++ * accessed in an alignement safe way. ++ */ ++inline uint16_t NS_decodeN16(const void *bytes) ++{ ++ uint16_t tmp; ++ ++ memcpy(&tmp, bytes, sizeof tmp); ++ return PR_ntohs(tmp); ++} ++ ++inline uint32_t NS_decodeN32(const void *bytes) ++{ ++ uint32_t tmp; ++ ++ memcpy(&tmp, bytes, sizeof tmp); ++ return PR_ntohl(tmp); ++} ++ ++/** + * Return true if the given string is a valid HTTP token per RFC 2616 section + * 2.2. + */ diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_Http2Session.cpp b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_Http2Session.cpp new file mode 100644 index 00000000000..fba36147b65 --- /dev/null +++ b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_Http2Session.cpp @@ -0,0 +1,91 @@ +$NetBSD: patch-mozilla_netwerk_protocol_http_Http2Session.cpp,v 1.1 2015/03/17 19:50:42 ryoon Exp $ + +--- mozilla/netwerk/protocol/http/Http2Session.cpp.orig 2015-03-09 05:34:55.000000000 +0000 ++++ mozilla/netwerk/protocol/http/Http2Session.cpp +@@ -32,7 +32,6 @@ + #include "nsStandardURL.h" + #include "nsURLHelper.h" + #include "prprf.h" +-#include "prnetdb.h" + #include "sslt.h" + + #ifdef DEBUG +@@ -1295,7 +1294,7 @@ Http2Session::RecvPriority(Http2Session + return rv; + + uint32_t newPriorityDependency = +- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); ++ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); + bool exclusive = !!(newPriorityDependency & 0x80000000); + newPriorityDependency &= 0x7fffffff; + uint8_t newPriorityWeight = *(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4); +@@ -1326,7 +1325,7 @@ Http2Session::RecvRstStream(Http2Session + } + + self->mDownstreamRstReason = +- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); ++ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); + + LOG3(("Http2Session::RecvRstStream %p RST_STREAM Reason Code %u ID %x\n", + self, self->mDownstreamRstReason, self->mInputFrameID)); +@@ -1387,8 +1386,8 @@ Http2Session::RecvSettings(Http2Session + uint8_t *setting = reinterpret_cast<uint8_t *> + (self->mInputFrameBuffer.get()) + kFrameHeaderBytes + index * 6; + +- uint16_t id = PR_ntohs(*reinterpret_cast<uint16_t *>(setting)); +- uint32_t value = PR_ntohl(*reinterpret_cast<uint32_t *>(setting + 2)); ++ uint16_t id = NS_decodeN16(setting); ++ uint32_t value = NS_decodeN32(setting + 2); + LOG3(("Settings ID %u, Value %u", id, value)); + + switch (id) +@@ -1473,7 +1472,7 @@ Http2Session::RecvPushPromise(Http2Sessi + } + promiseLen = 4; + promisedID = +- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes)); ++ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes); + promisedID &= 0x7fffffff; + } + +@@ -1733,11 +1732,11 @@ Http2Session::RecvGoAway(Http2Session *s + + self->mShouldGoAway = true; + self->mGoAwayID = +- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); ++ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); + self->mGoAwayID &= 0x7fffffff; + self->mCleanShutdown = true; + uint32_t statusCode = +- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4)); ++ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4); + + // Find streams greater than the last-good ID and mark them for deletion + // in the mGoAwayStreamsToRestart queue with the GoAwayEnumerator. The +@@ -1809,7 +1808,7 @@ Http2Session::RecvWindowUpdate(Http2Sess + } + + uint32_t delta = +- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); ++ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); + delta &= 0x7fffffff; + + LOG3(("Http2Session::RecvWindowUpdate %p len=%d Stream 0x%X.\n", +@@ -2453,7 +2452,7 @@ Http2Session::WriteSegments(nsAHttpSegme + + // 3 bytes of length, 1 type byte, 1 flag byte, 1 unused bit, 31 bits of ID + uint8_t totallyWastedByte = mInputFrameBuffer.get()[0]; +- mInputFrameDataSize = PR_ntohs(*reinterpret_cast<uint16_t *>(mInputFrameBuffer.get() + 1)); ++ mInputFrameDataSize = NS_decodeN16(mInputFrameBuffer.get() + 1); + if (totallyWastedByte || (mInputFrameDataSize > kMaxFrameData)) { + LOG3(("Got frame too large 0x%02X%04X", totallyWastedByte, mInputFrameDataSize)); + RETURN_SESSION_ERROR(this, PROTOCOL_ERROR); +@@ -2461,7 +2460,7 @@ Http2Session::WriteSegments(nsAHttpSegme + mInputFrameType = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes); + mInputFrameFlags = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes); + mInputFrameID = +- PR_ntohl(*reinterpret_cast<uint32_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes)); ++ NS_decodeN32(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes); + mInputFrameID &= 0x7fffffff; + mInputFrameDataRead = 0; + diff --git a/www/seamonkey/patches/patch-mozilla_probes_Makefile.in b/www/seamonkey/patches/patch-mozilla_probes_Makefile.in deleted file mode 100644 index b928518f2bf..00000000000 --- a/www/seamonkey/patches/patch-mozilla_probes_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_probes_Makefile.in,v 1.1 2014/11/02 05:40:31 ryoon Exp $ - ---- mozilla/probes/Makefile.in.orig 2014-10-14 06:36:36.000000000 +0000 -+++ mozilla/probes/Makefile.in -@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h - - # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE - $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile -- dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp -+ dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp - sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ - mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h - rm mozilla-trace.h.tmp diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_components_alerts_nsAlertsService.cpp b/www/seamonkey/patches/patch-mozilla_toolkit_components_alerts_nsAlertsService.cpp deleted file mode 100644 index 052e507f6e5..00000000000 --- a/www/seamonkey/patches/patch-mozilla_toolkit_components_alerts_nsAlertsService.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_components_alerts_nsAlertsService.cpp,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/toolkit/components/alerts/nsAlertsService.cpp.orig 2014-12-03 06:23:24.000000000 +0000 -+++ mozilla/toolkit/components/alerts/nsAlertsService.cpp -@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlert - nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); - nsresult rv; - if (sysAlerts) { -- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -- aAlertCookie, aAlertListener, aAlertName, -- aBidi, aLang, aData, -- IPC::Principal(aPrincipal)); -+ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener, aAlertName, -+ aBidi, aLang, aData, -+ IPC::Principal(aPrincipal)); -+ if (NS_SUCCEEDED(rv)) -+ return NS_OK; - } - - if (!ShouldShowAlert()) { diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_library_moz.build b/www/seamonkey/patches/patch-mozilla_toolkit_library_moz.build index b76bde98241..782814814c0 100644 --- a/www/seamonkey/patches/patch-mozilla_toolkit_library_moz.build +++ b/www/seamonkey/patches/patch-mozilla_toolkit_library_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.2 2015/02/15 02:11:03 ryoon Exp $ +$NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.3 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/toolkit/library/moz.build.orig 2015-02-05 04:38:42.000000000 +0000 +--- mozilla/toolkit/library/moz.build.orig 2015-03-09 05:34:27.000000000 +0000 +++ mozilla/toolkit/library/moz.build -@@ -219,6 +219,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF +@@ -214,6 +214,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF ] OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] @@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.2 2015/02/15 02:11:03 ryoon OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] if CONFIG['MOZ_NATIVE_JPEG']: -@@ -230,6 +231,27 @@ if CONFIG['MOZ_NATIVE_PNG']: +@@ -225,6 +226,27 @@ if CONFIG['MOZ_NATIVE_PNG']: if CONFIG['MOZ_NATIVE_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] @@ -38,23 +38,24 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.2 2015/02/15 02:11:03 ryoon if CONFIG['MOZ_NATIVE_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] -@@ -239,6 +261,15 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: +@@ -234,8 +256,14 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] -+if CONFIG['MOZ_OSS']: -+ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -+ +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +if CONFIG['MOZ_NATIVE_GRAPHITE2']: + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] + +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_ALSA']: - OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] ++if CONFIG['MOZ_OSS']: ++ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -@@ -369,7 +400,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': + if CONFIG['HAVE_CLOCK_MONOTONIC']: + OS_LIBS += CONFIG['REALTIME_LIBS'] +@@ -364,7 +392,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': if CONFIG['MOZ_ENABLE_QT']: OS_LIBS += CONFIG['XEXT_LIBS'] diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_moz.build b/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_moz.build deleted file mode 100644 index 40d9b3d9175..00000000000 --- a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_moz.build +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_system_gnome_moz.build,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/toolkit/system/gnome/moz.build.orig 2014-12-03 06:23:26.000000000 +0000 -+++ mozilla/toolkit/system/gnome/moz.build -@@ -5,7 +5,9 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - SOURCES += [ -+ 'nsAlertsIconListener.cpp', - 'nsGnomeModule.cpp', -+ 'nsSystemAlertsService.cpp', - ] - - if CONFIG['MOZ_ENABLE_GCONF']: diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.cpp b/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.cpp deleted file mode 100644 index a30b2ba2b90..00000000000 --- a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.cpp +++ /dev/null @@ -1,119 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.cpp,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.orig 2014-12-03 06:23:26.000000000 +0000 -+++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp -@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosu - NS_RELEASE(alert); - } - -+static GdkPixbuf* -+GetPixbufFromImgRequest(imgIRequest* aRequest) -+{ -+ nsCOMPtr<imgIContainer> image; -+ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -+ if (NS_FAILED(rv)) { -+ return nullptr; -+ } -+ -+ nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -+ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -+ -+ return imgToPixbuf->ConvertImageToPixbuf(image); -+} -+ - NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, - nsIObserver, nsISupportsWeakReference) - -@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest - nsresult - nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) - { -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); -+ - uint32_t imgStatus = imgIRequest::STATUS_ERROR; - nsresult rv = aRequest->GetImageStatus(&imgStatus); - NS_ENSURE_SUCCESS(rv, rv); - if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { - // We have an error getting the image. Display the notification with no icon. - ShowAlert(nullptr); -- } - -- if (mIconRequest) { -+ // Cancel any pending request - mIconRequest->Cancel(NS_BINDING_ABORTED); - mIconRequest = nullptr; - } -+ - return NS_OK; - } - - nsresult - nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) - { -- if (aRequest != mIconRequest) -- return NS_ERROR_FAILURE; -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); - - if (mLoadedFrame) - return NS_OK; // only use one frame - -- nsCOMPtr<imgIContainer> image; -- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -- if (NS_FAILED(rv)) -- return rv; -- -- nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -- -- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); -- if (!imagePixbuf) -- return NS_ERROR_FAILURE; -+ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); -+ if (!imagePixbuf) { -+ ShowAlert(nullptr); -+ } else { -+ ShowAlert(imagePixbuf); -+ g_object_unref(imagePixbuf); -+ } - -- ShowAlert(imagePixbuf); -+ mLoadedFrame = true; - -- g_object_unref(imagePixbuf); -+ // Cancel any pending request (multipart image loading/decoding for instance) -+ mIconRequest->Cancel(NS_BINDING_ABORTED); -+ mIconRequest = nullptr; - -- mLoadedFrame = true; - return NS_OK; - } - -@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbu - mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); - gboolean result = notify_notification_show(mNotification, nullptr); - -+ if (result && mAlertListener) -+ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); -+ - return result ? NS_OK : NS_ERROR_FAILURE; - } - -@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const - if (!il) - return ShowAlert(nullptr); - -- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -- nullptr, getter_AddRefs(mIconRequest)); -+ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -+ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -+ 0 /* use default */, getter_AddRefs(mIconRequest)); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ mIconRequest->StartDecoding(); -+ -+ return NS_OK; - } - - void diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.h b/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.h deleted file mode 100644 index 2700249b28b..00000000000 --- a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.h +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_system_gnome_nsAlertsIconListener.h,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/toolkit/system/gnome/nsAlertsIconListener.h.orig 2015-01-01 17:45:06.000000000 +0000 -+++ mozilla/toolkit/system/gnome/nsAlertsIconListener.h -@@ -0,0 +1,89 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsAlertsIconListener_h__ -+#define nsAlertsIconListener_h__ -+ -+#include "nsCOMPtr.h" -+#include "imgINotificationObserver.h" -+#include "nsStringAPI.h" -+#include "nsIObserver.h" -+#include "nsWeakReference.h" -+ -+#include <gdk-pixbuf/gdk-pixbuf.h> -+ -+class imgIRequest; -+ -+struct NotifyNotification; -+ -+class nsAlertsIconListener : public imgINotificationObserver, -+ public nsIObserver, -+ public nsSupportsWeakReference -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_IMGINOTIFICATIONOBSERVER -+ NS_DECL_NSIOBSERVER -+ -+ nsAlertsIconListener(); -+ -+ nsresult InitAlertAsync(const nsAString & aImageUrl, -+ const nsAString & aAlertTitle, -+ const nsAString & aAlertText, -+ bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener); -+ -+ void SendCallback(); -+ void SendClosed(); -+ -+protected: -+ virtual ~nsAlertsIconListener(); -+ -+ nsresult OnStopRequest(imgIRequest* aRequest); -+ nsresult OnStopFrame(imgIRequest* aRequest); -+ -+ /** -+ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols -+ * is that notify_notification_new takes three arguments in libnotify.so.4 and -+ * four in libnotify.so.1. -+ * Passing the fourth argument as NULL is binary compatible. -+ */ -+ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); -+ typedef bool (*notify_is_initted_t)(void); -+ typedef bool (*notify_init_t)(const char*); -+ typedef GList* (*notify_get_server_caps_t)(void); -+ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); -+ typedef bool (*notify_notification_show_t)(void*, char*); -+ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); -+ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); -+ -+ nsCOMPtr<imgIRequest> mIconRequest; -+ nsCString mAlertTitle; -+ nsCString mAlertText; -+ -+ nsCOMPtr<nsIObserver> mAlertListener; -+ nsString mAlertCookie; -+ -+ bool mLoadedFrame; -+ bool mAlertHasAction; -+ -+ static void* libNotifyHandle; -+ static bool libNotifyNotAvail; -+ static notify_is_initted_t notify_is_initted; -+ static notify_init_t notify_init; -+ static notify_get_server_caps_t notify_get_server_caps; -+ static notify_notification_new_t notify_notification_new; -+ static notify_notification_show_t notify_notification_show; -+ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; -+ static notify_notification_add_action_t notify_notification_add_action; -+ NotifyNotification* mNotification; -+ gulong mClosureHandler; -+ -+ nsresult StartRequest(const nsAString & aImageUrl); -+ nsresult ShowAlert(GdkPixbuf* aPixbuf); -+}; -+ -+#endif diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsGnomeModule.cpp b/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsGnomeModule.cpp deleted file mode 100644 index 5903905fede..00000000000 --- a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsGnomeModule.cpp +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_system_gnome_nsGnomeModule.cpp,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/toolkit/system/gnome/nsGnomeModule.cpp.orig 2014-12-03 06:23:26.000000000 +0000 -+++ mozilla/toolkit/system/gnome/nsGnomeModule.cpp -@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGn - NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) - #endif -+#include "nsSystemAlertsService.h" -+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) - - #ifdef MOZ_ENABLE_GCONF - NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); -@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_C - NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); - #endif -+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); - - static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - #ifdef MOZ_ENABLE_GCONF -@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry k - { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, - { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, - #endif -+ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, - { nullptr } - }; - -@@ -59,6 +63,7 @@ static const mozilla::Module::ContractID - { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, - { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, - #endif -+ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, - { nullptr } - }; - diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.cpp b/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.cpp deleted file mode 100644 index 3e25838085d..00000000000 --- a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.cpp +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.cpp,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp.orig 2015-01-01 17:45:06.000000000 +0000 -+++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp -@@ -0,0 +1,54 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "nsXULAppAPI.h" -+#include "nsSystemAlertsService.h" -+#include "nsAlertsIconListener.h" -+#include "nsAutoPtr.h" -+ -+NS_IMPL_ADDREF(nsSystemAlertsService) -+NS_IMPL_RELEASE(nsSystemAlertsService) -+ -+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) -+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) -+ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) -+NS_INTERFACE_MAP_END_THREADSAFE -+ -+nsSystemAlertsService::nsSystemAlertsService() -+{ -+} -+ -+nsSystemAlertsService::~nsSystemAlertsService() -+{} -+ -+nsresult -+nsSystemAlertsService::Init() -+{ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, -+ const nsAString & aAlertText, bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener, -+ const nsAString & aAlertName, -+ const nsAString & aBidi, -+ const nsAString & aLang, -+ const nsAString & aData, -+ nsIPrincipal * aPrincipal) -+{ -+ nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener(); -+ if (!alertListener) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener); -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, -+ nsIPrincipal* aPrincipal) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} diff --git a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.h b/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.h deleted file mode 100644 index 7efa5c1692f..00000000000 --- a/www/seamonkey/patches/patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.h +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_system_gnome_nsSystemAlertsService.h,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/toolkit/system/gnome/nsSystemAlertsService.h.orig 2015-01-01 17:45:06.000000000 +0000 -+++ mozilla/toolkit/system/gnome/nsSystemAlertsService.h -@@ -0,0 +1,27 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsSystemAlertsService_h__ -+#define nsSystemAlertsService_h__ -+ -+#include "nsIAlertsService.h" -+#include "nsCOMPtr.h" -+ -+class nsSystemAlertsService : public nsIAlertsService -+{ -+public: -+ NS_DECL_NSIALERTSSERVICE -+ NS_DECL_ISUPPORTS -+ -+ nsSystemAlertsService(); -+ -+ nsresult Init(); -+ -+protected: -+ virtual ~nsSystemAlertsService(); -+ -+}; -+ -+#endif /* nsSystemAlertsService_h__ */ diff --git a/www/seamonkey/patches/patch-mozilla_widget_gtk_mozgtk_mozgtk.c b/www/seamonkey/patches/patch-mozilla_widget_gtk_mozgtk_mozgtk.c deleted file mode 100644 index 64f8b3b3684..00000000000 --- a/www/seamonkey/patches/patch-mozilla_widget_gtk_mozgtk_mozgtk.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_widget_gtk_mozgtk_mozgtk.c,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/widget/gtk/mozgtk/mozgtk.c.orig 2014-12-03 06:23:27.000000000 +0000 -+++ mozilla/widget/gtk/mozgtk/mozgtk.c -@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay) - STUB(gdk_x11_screen_get_xscreen) - STUB(gdk_x11_visual_get_xvisual) - STUB(gdk_x11_window_lookup_for_display) -+STUB(gdk_x11_window_set_user_time) - STUB(gdk_x11_xatom_to_atom) - STUB(gtk_accel_label_new) - STUB(gtk_alignment_get_type) diff --git a/www/seamonkey/patches/patch-mozilla_widget_gtk_nsWindow.cpp b/www/seamonkey/patches/patch-mozilla_widget_gtk_nsWindow.cpp deleted file mode 100644 index 50891c6ef64..00000000000 --- a/www/seamonkey/patches/patch-mozilla_widget_gtk_nsWindow.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-mozilla_widget_gtk_nsWindow.cpp,v 1.1 2015/01/02 04:26:21 ryoon Exp $ - ---- mozilla/widget/gtk/nsWindow.cpp.orig 2014-12-03 06:23:27.000000000 +0000 -+++ mozilla/widget/gtk/nsWindow.cpp -@@ -1294,13 +1294,7 @@ SetUserTimeAndStartupIDForActivatedWindo - } - - if (sn_launchee_context_get_id_has_timestamp(ctx)) { -- PRLibrary* gtkLibrary; -- SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc) -- PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", >kLibrary); -- if (setUserTimeFunc) { -- setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx)); -- PR_UnloadLibrary(gtkLibrary); -- } -+ gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx)); - } - - sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow)); diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build b/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build index 081f6b69dba..0daad5fd5d2 100644 --- a/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build +++ b/www/seamonkey/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2014/11/02 05:40:31 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.2 2015/03/17 19:50:42 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/moz.build.orig 2014-10-14 06:36:46.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-03-09 05:34:28.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/moz.build @@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin': 'xptcinvoke_darwin.cpp', @@ -15,7 +15,7 @@ $NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2014/11/02 if '86' in CONFIG['OS_TEST'] and CONFIG['OS_TEST'] != 'x86_64': DEFINES['MOZ_NEED_LEADING_UNDERSCORE'] = True --if CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD', 'GNU'): +-if CONFIG['OS_ARCH'] in ('NetBSD', 'GNU'): +if CONFIG['OS_ARCH'] in ('OpenBSD', 'GNU'): if CONFIG['CPU_ARCH'] == 'x86': SOURCES += [ @@ -23,7 +23,7 @@ $NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2014/11/02 'xptcstubs_gcc_x86_unix.cpp' ] --if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD') or \ +-if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'OpenBSD') or \ +if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'DragonFly') or \ CONFIG['OS_ARCH'].startswith('GNU_'): if CONFIG['OS_TEST'] == 'x86_64': |