diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-02-28 04:30:55 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-02-28 04:30:55 +0000 |
| commit | 566958890e9807463eb63f4f9b5510193584562d (patch) | |
| tree | bfcb78f0b989eebebbbbd4508008e92c7dbfe2c5 /www | |
| parent | 8cd880458266bdab48e60032de361513b2d6d2b0 (diff) | |
| download | pkgsrc-566958890e9807463eb63f4f9b5510193584562d.tar.gz | |
Update to 36.0
Changelog:
New Pinned tiles on the new tab page can be synced
New Support for the full HTTP/2 protocol. HTTP/2 enables a faster, more scalable, and more responsive web.
New Locale added: Uzbek (uz)
Changed -remote option removed
Changed No longer accept insecure RC4 ciphers whenever possible
Changed Phasing out Certificates with 1024-bit RSA Keys
Changed Shut down hangs will now show the crash reporter before exiting the program
Changed Add-on Compatibility
HTML5 Support for the ECMAScript 6 Symbol data type added
HTML5 unicode-range CSS descriptor implemented
HTML5 CSSOM-View scroll behavior implemented allowing smooth scrolling of content without custom libraries
HTML5 object-fit and object-position implemented.
Defines how and where the content of a replaced element is displayed
HTML5 isolation CSS property implemented.
Create a new stacking context to isolate groups of boxes to control which blend together
HTML5 CSS3 will-change property implemented.
Hints the browser of elements that will be modified. The browser will perform some performance optimization for these
HTML5 Changed JavaScript 'const' semantics to conform better to the ES6 specification.
The const declaration is now block-scoped and requires an initializer. It also can not be redeclared anymore.
HTML5 Improved ES6 generators for better performance
Developer Eval sources now appear in the Debugger
Debug JavaScript code that is evaluated dynamically, either as a string passed to eval() or as a string passed to the Function constructor
Developer DOM Promises inspection
Developer Inspector: More paste options in markup view
Fixed CSS gradients work on premultiplied colors
Fixed Fix some unexpected logout from Facebook or Google after restart
Fixed Various security fixes
Fixed in Firefox 36
2015-27 Caja Compiler JavaScript sandbox bypass
2015-26 UI Tour whitelisted sites in background tab can spoof foreground tabs
2015-25 Local files or privileged URLs in pages can be opened into new tabs
2015-24 Reading of local files through manipulation of form autocomplete
2015-23 Use-after-free in Developer Console date with OpenType Sanitiser
2015-22 Crash using DrawTarget in Cairo graphics library
2015-21 Buffer underflow during MP3 playback
2015-20 Buffer overflow during CSS restyling
2015-19 Out-of-bounds read and write while rendering SVG content
2015-18 Double-free when using non-default memory allocators with a zero-length XHR
2015-17 Buffer overflow in libstagefright during MP4 video playback
2015-16 Use-after-free in IndexedDB
2015-15 TLS TURN and STUN connections silently fail to simple TCP connections
2015-14 Malicious WebGL content crash when writing strings
2015-13 Appended period to hostnames can bypass HPKP and HSTS protections
2015-12 Invoking Mozilla updater will load locally stored DLL files
2015-11 Miscellaneous memory safety hazards (rv:36.0 / rv:31.5)
Diffstat (limited to 'www')
49 files changed, 552 insertions, 852 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 91dafa662f8..67541f039fa 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.195 2015/02/21 23:35:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.196 2015/02/28 04:30:55 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -MOZ_BRANCH= 35.0 -MOZ_BRANCH_MINOR= .1 +MOZ_BRANCH= 36.0 +MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} -PKGREVISION= 6 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 044956f4af1..73d8423174c 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.92 2015/01/30 07:32:24 pho Exp $ +@comment $NetBSD: PLIST,v 1.93 2015/02/28 04:30:55 ryoon Exp $ bin/firefox lib/firefox/application.ini lib/firefox/browser/blocklist.xml @@ -21,6 +21,7 @@ lib/firefox/browser/chrome/browser/content/browser/aboutDialog.js lib/firefox/browser/chrome/browser/content/browser/aboutDialog.xul lib/firefox/browser/chrome/browser/content/browser/aboutNetError.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.css +lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.js lib/firefox/browser/chrome/browser/content/browser/aboutPrivateBrowsing.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutProviderDirectory.xhtml lib/firefox/browser/chrome/browser/content/browser/aboutRobots-icon.png @@ -82,6 +83,7 @@ lib/firefox/browser/chrome/browser/content/browser/browser.xul lib/firefox/browser/chrome/browser/content/browser/certerror/aboutCertError.css lib/firefox/browser/chrome/browser/content/browser/certerror/aboutCertError.xhtml lib/firefox/browser/chrome/browser/content/browser/chatWindow.xul +lib/firefox/browser/chrome/browser/content/browser/content-UITour.js lib/firefox/browser/chrome/browser/content/browser/content-sessionStore.js lib/firefox/browser/chrome/browser/content/browser/content.js lib/firefox/browser/chrome/browser/content/browser/customizableui/aboutCustomizing.xul @@ -609,6 +611,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-pause. lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-pause@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-play.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-play@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-prettyprint.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-prettyprint@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-in.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-in@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-step-out.png @@ -654,6 +658,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/newtab-inverted lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/newtab.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/newtab@2x.png lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/noise.png +lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/performance.css lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch-checked.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler-stopwatch.svg lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/profiler.css @@ -797,6 +802,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.pn lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/check.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/check@2x.png +lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.png lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons@2x.png @@ -811,6 +817,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/sanitizeDialog.css lib/firefox/browser/chrome/browser/skin/classic/browser/search-engine-placeholder.png lib/firefox/browser/chrome/browser/skin/classic/browser/search-history-icon.svg lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-add-engine.png +lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add.png lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator.png lib/firefox/browser/chrome/browser/skin/classic/browser/search-pref.png lib/firefox/browser/chrome/browser/skin/classic/browser/searchbar.css @@ -843,6 +850,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs-inver lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.png +lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/pendingpaint.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left.png @@ -893,6 +901,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/aboutDialog.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutHealthReport.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutHome.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutPrivateBrowsing.dtd +lib/firefox/browser/chrome/en-US/locale/browser/aboutPrivateBrowsing.properties lib/firefox/browser/chrome/en-US/locale/browser/aboutRobots.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutSessionRestore.dtd lib/firefox/browser/chrome/en-US/locale/browser/aboutSyncTabs.dtd @@ -1288,6 +1297,8 @@ lib/firefox/browser/chrome/webide/content/addons.js lib/firefox/browser/chrome/webide/content/addons.xhtml lib/firefox/browser/chrome/webide/content/details.js lib/firefox/browser/chrome/webide/content/details.xhtml +lib/firefox/browser/chrome/webide/content/devicepreferences.js +lib/firefox/browser/chrome/webide/content/devicepreferences.xhtml lib/firefox/browser/chrome/webide/content/monitor.js lib/firefox/browser/chrome/webide/content/monitor.xhtml lib/firefox/browser/chrome/webide/content/newapp.js @@ -1303,6 +1314,7 @@ lib/firefox/browser/chrome/webide/content/webide.xul lib/firefox/browser/chrome/webide/skin/addons.css lib/firefox/browser/chrome/webide/skin/deck.css lib/firefox/browser/chrome/webide/skin/details.css +lib/firefox/browser/chrome/webide/skin/devicepreferences.css lib/firefox/browser/chrome/webide/skin/icons.png lib/firefox/browser/chrome/webide/skin/monitor.css lib/firefox/browser/chrome/webide/skin/newapp.css @@ -1350,8 +1362,8 @@ lib/firefox/browser/icons/mozicon128.png lib/firefox/browser/modules/AboutHome.jsm lib/firefox/browser/modules/BrowserNewTabPreloader.jsm lib/firefox/browser/modules/BrowserUITelemetry.jsm +lib/firefox/browser/modules/CastingApps.jsm lib/firefox/browser/modules/Chat.jsm -lib/firefox/browser/modules/ContentClick.jsm lib/firefox/browser/modules/ContentLinkHandler.jsm lib/firefox/browser/modules/ContentSearch.jsm lib/firefox/browser/modules/ContentWebRTC.jsm @@ -1415,6 +1427,7 @@ lib/firefox/browser/modules/devtools/commandline/commands-index.js lib/firefox/browser/modules/devtools/debugger/debugger-commands.js lib/firefox/browser/modules/devtools/debugger/panel.js lib/firefox/browser/modules/devtools/eyedropper/commands.js +lib/firefox/browser/modules/devtools/eyedropper/eyedropper-child.js lib/firefox/browser/modules/devtools/eyedropper/eyedropper.js lib/firefox/browser/modules/devtools/framework/selection.js lib/firefox/browser/modules/devtools/framework/sidebar.js @@ -1422,7 +1435,6 @@ lib/firefox/browser/modules/devtools/framework/target.js lib/firefox/browser/modules/devtools/framework/toolbox-highlighter-utils.js lib/firefox/browser/modules/devtools/framework/toolbox-hosts.js lib/firefox/browser/modules/devtools/framework/toolbox-options.js -lib/firefox/browser/modules/devtools/framework/toolbox-process-window.js lib/firefox/browser/modules/devtools/framework/toolbox.js lib/firefox/browser/modules/devtools/gDevTools.jsm lib/firefox/browser/modules/devtools/inspector/breadcrumbs.js @@ -1509,7 +1521,9 @@ lib/firefox/browser/modules/devtools/tilt/tilt-visualizer-style.js lib/firefox/browser/modules/devtools/tilt/tilt-visualizer.js lib/firefox/browser/modules/devtools/tilt/tilt.js lib/firefox/browser/modules/devtools/timeline/global.js -lib/firefox/browser/modules/devtools/timeline/overview.js +lib/firefox/browser/modules/devtools/timeline/marker-details.js +lib/firefox/browser/modules/devtools/timeline/markers-overview.js +lib/firefox/browser/modules/devtools/timeline/memory-overview.js lib/firefox/browser/modules/devtools/timeline/panel.js lib/firefox/browser/modules/devtools/timeline/waterfall.js lib/firefox/browser/modules/devtools/webaudioeditor/panel.js @@ -1810,6 +1824,8 @@ lib/firefox/chrome/toolkit/content/global/aboutAbout.js lib/firefox/chrome/toolkit/content/global/aboutAbout.xhtml lib/firefox/chrome/toolkit/content/global/aboutCache.js lib/firefox/chrome/toolkit/content/global/aboutCompartments.xhtml +lib/firefox/chrome/toolkit/content/global/aboutMedia.js +lib/firefox/chrome/toolkit/content/global/aboutMedia.xhtml lib/firefox/chrome/toolkit/content/global/aboutMemory.css lib/firefox/chrome/toolkit/content/global/aboutMemory.js lib/firefox/chrome/toolkit/content/global/aboutMemory.xhtml @@ -1822,7 +1838,9 @@ lib/firefox/chrome/toolkit/content/global/aboutSupport.xhtml lib/firefox/chrome/toolkit/content/global/aboutTelemetry.css lib/firefox/chrome/toolkit/content/global/aboutTelemetry.js lib/firefox/chrome/toolkit/content/global/aboutTelemetry.xhtml -lib/firefox/chrome/toolkit/content/global/aboutWebrtc.xhtml +lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.css +lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.js +lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.xhtml lib/firefox/chrome/toolkit/content/global/accessibility/AccessFu.css lib/firefox/chrome/toolkit/content/global/accessibility/clicked.ogg lib/firefox/chrome/toolkit/content/global/accessibility/content-script.js @@ -2163,12 +2181,8 @@ lib/firefox/chrome/toolkit/skin/classic/global/icons/wrap.png lib/firefox/chrome/toolkit/skin/classic/global/in-content/check.png lib/firefox/chrome/toolkit/skin/classic/global/in-content/check@2x.png lib/firefox/chrome/toolkit/skin/classic/global/in-content/common.css -lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown-disabled.png -lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown-disabled@2x.png -lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown.png -lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown@2x.png -lib/firefox/chrome/toolkit/skin/classic/global/in-content/help-glyph.png -lib/firefox/chrome/toolkit/skin/classic/global/in-content/help-glyph@2x.png +lib/firefox/chrome/toolkit/skin/classic/global/in-content/dropdown.svg +lib/firefox/chrome/toolkit/skin/classic/global/in-content/help-glyph.svg lib/firefox/chrome/toolkit/skin/classic/global/in-content/sorter.png lib/firefox/chrome/toolkit/skin/classic/global/in-content/sorter@2x.png lib/firefox/chrome/toolkit/skin/classic/global/inContentUI.css @@ -2275,7 +2289,6 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.png lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensions.css -lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensions.svg lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/heart.png lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/navigation.png @@ -2406,6 +2419,7 @@ lib/firefox/components/nsPrompter.js lib/firefox/components/nsSearchService.js lib/firefox/components/nsSearchSuggestions.js lib/firefox/components/nsTaggingService.js +lib/firefox/components/nsTerminatorTelemetry.js lib/firefox/components/nsURLFormatter.js lib/firefox/components/nsUpdateTimerManager.js lib/firefox/components/nsUrlClassifierHashCompleter.js @@ -2413,6 +2427,7 @@ lib/firefox/components/nsUrlClassifierLib.js lib/firefox/components/nsUrlClassifierListManager.js lib/firefox/components/nsWebHandlerApp.js lib/firefox/components/recording-cmdline.js +lib/firefox/components/remoteTagService.js lib/firefox/components/storage-json.js lib/firefox/components/txEXSLTRegExFunctions.js lib/firefox/defaults/autoconfig/platform.js @@ -2424,6 +2439,8 @@ lib/firefox/dictionaries/en-US.aff lib/firefox/dictionaries/en-US.dic lib/firefox/firefox lib/firefox/firefox-bin +lib/firefox/gmp-clearkey/0.1/clearkey.info +lib/firefox/gmp-clearkey/0.1/libclearkey.so lib/firefox/greprefs.js lib/firefox/hyphenation/hyph_af.dic lib/firefox/hyphenation/hyph_bg.dic @@ -2482,7 +2499,6 @@ lib/firefox/modules/BinarySearch.jsm lib/firefox/modules/BookmarkHTMLUtils.jsm lib/firefox/modules/BookmarkJSONUtils.jsm lib/firefox/modules/Bookmarks.jsm -lib/firefox/modules/BrowserElementParent.jsm lib/firefox/modules/BrowserElementPromptService.jsm lib/firefox/modules/BrowserUtils.jsm lib/firefox/modules/CertUtils.jsm @@ -2551,6 +2567,7 @@ lib/firefox/modules/HealthReport.jsm lib/firefox/modules/History.jsm lib/firefox/modules/Http.jsm lib/firefox/modules/ISO8601DateUtils.jsm +lib/firefox/modules/ImportExport.jsm lib/firefox/modules/IndexedDBHelper.jsm lib/firefox/modules/InlineSpellChecker.jsm lib/firefox/modules/InlineSpellCheckerContent.jsm @@ -2566,6 +2583,7 @@ lib/firefox/modules/LoginImport.jsm lib/firefox/modules/LoginManagerContent.jsm lib/firefox/modules/LoginManagerParent.jsm lib/firefox/modules/LoginStore.jsm +lib/firefox/modules/ManifestProcessor.jsm lib/firefox/modules/MessagePortBase.jsm lib/firefox/modules/MessagePortWorker.js lib/firefox/modules/Metrics.jsm @@ -2578,6 +2596,7 @@ lib/firefox/modules/NotificationDB.jsm lib/firefox/modules/OfflineCacheInstaller.jsm lib/firefox/modules/OperatorApps.jsm lib/firefox/modules/PageMenu.jsm +lib/firefox/modules/PageThumbUtils.jsm lib/firefox/modules/PageThumbs.jsm lib/firefox/modules/PageThumbsWorker.js lib/firefox/modules/Payment.jsm @@ -2601,6 +2620,7 @@ lib/firefox/modules/Preferences.jsm lib/firefox/modules/PrivateBrowsingUtils.jsm lib/firefox/modules/Promise-backend.js lib/firefox/modules/Promise.jsm +lib/firefox/modules/PromiseUtils.jsm lib/firefox/modules/PromiseWorker.jsm lib/firefox/modules/PropertyListUtils.jsm lib/firefox/modules/PushService.jsm @@ -2697,6 +2717,8 @@ lib/firefox/modules/commonjs/diffpatcher/test/index.js lib/firefox/modules/commonjs/diffpatcher/test/patch.js lib/firefox/modules/commonjs/diffpatcher/test/tap.js lib/firefox/modules/commonjs/framescript/FrameScriptManager.jsm +lib/firefox/modules/commonjs/framescript/LoaderHelper.jsm +lib/firefox/modules/commonjs/framescript/contextmenu-events.js lib/firefox/modules/commonjs/framescript/tab-events.js lib/firefox/modules/commonjs/method/core.js lib/firefox/modules/commonjs/method/test/browser.js @@ -2715,12 +2737,15 @@ lib/firefox/modules/commonjs/sdk/console/plain-text.js lib/firefox/modules/commonjs/sdk/console/traceback.js lib/firefox/modules/commonjs/sdk/content/content-worker.js lib/firefox/modules/commonjs/sdk/content/content.js +lib/firefox/modules/commonjs/sdk/content/context-menu.js lib/firefox/modules/commonjs/sdk/content/events.js lib/firefox/modules/commonjs/sdk/content/loader.js lib/firefox/modules/commonjs/sdk/content/mod.js lib/firefox/modules/commonjs/sdk/content/sandbox.js lib/firefox/modules/commonjs/sdk/content/thumbnail.js lib/firefox/modules/commonjs/sdk/content/utils.js +lib/firefox/modules/commonjs/sdk/content/worker-child.js +lib/firefox/modules/commonjs/sdk/content/worker-parent.js lib/firefox/modules/commonjs/sdk/content/worker.js lib/firefox/modules/commonjs/sdk/context-menu.js lib/firefox/modules/commonjs/sdk/core/disposable.js @@ -2892,7 +2917,6 @@ lib/firefox/modules/commonjs/sdk/util/collection.js lib/firefox/modules/commonjs/sdk/util/contract.js lib/firefox/modules/commonjs/sdk/util/deprecate.js lib/firefox/modules/commonjs/sdk/util/dispatcher.js -lib/firefox/modules/commonjs/sdk/util/iteration.js lib/firefox/modules/commonjs/sdk/util/list.js lib/firefox/modules/commonjs/sdk/util/match-pattern.js lib/firefox/modules/commonjs/sdk/util/object.js @@ -2919,6 +2943,7 @@ lib/firefox/modules/commonjs/sdk/worker/utils.js lib/firefox/modules/commonjs/sdk/zip/utils.js lib/firefox/modules/commonjs/test.js lib/firefox/modules/commonjs/toolkit/loader.js +lib/firefox/modules/commonjs/toolkit/require.js lib/firefox/modules/ctypes.jsm lib/firefox/modules/debug.js lib/firefox/modules/devtools/Console.jsm @@ -2938,6 +2963,7 @@ lib/firefox/modules/devtools/app-actor-front.js lib/firefox/modules/devtools/async-utils.js lib/firefox/modules/devtools/client/connection-manager.js lib/firefox/modules/devtools/content-observer.js +lib/firefox/modules/devtools/content-server.jsm lib/firefox/modules/devtools/css-color.js lib/firefox/modules/devtools/dbg-client.jsm lib/firefox/modules/devtools/dbg-server.jsm @@ -3043,12 +3069,15 @@ lib/firefox/modules/devtools/jsbeautify/beautify.js lib/firefox/modules/devtools/jsbeautify/sanitytest.js lib/firefox/modules/devtools/jsbeautify/urlencode_unpacker.js lib/firefox/modules/devtools/output-parser.js +lib/firefox/modules/devtools/path.js lib/firefox/modules/devtools/pretty-fast.js lib/firefox/modules/devtools/qrcode/decoder/index.js lib/firefox/modules/devtools/qrcode/encoder/index.js lib/firefox/modules/devtools/qrcode/index.js +lib/firefox/modules/devtools/server/actors/actor-registry.js lib/firefox/modules/devtools/server/actors/call-watcher.js lib/firefox/modules/devtools/server/actors/canvas.js +lib/firefox/modules/devtools/server/actors/child-process.js lib/firefox/modules/devtools/server/actors/childtab.js lib/firefox/modules/devtools/server/actors/common.js lib/firefox/modules/devtools/server/actors/csscoverage.js @@ -3056,6 +3085,7 @@ lib/firefox/modules/devtools/server/actors/device.js lib/firefox/modules/devtools/server/actors/eventlooplag.js lib/firefox/modules/devtools/server/actors/framerate.js lib/firefox/modules/devtools/server/actors/gcli.js +lib/firefox/modules/devtools/server/actors/highlighter.css lib/firefox/modules/devtools/server/actors/highlighter.js lib/firefox/modules/devtools/server/actors/inspector.js lib/firefox/modules/devtools/server/actors/layout.js @@ -3194,7 +3224,6 @@ lib/firefox/modules/workers/PromiseWorker.js lib/firefox/modules/workers/lz4.js lib/firefox/modules/workers/lz4_internal.js lib/firefox/modules/workers/require.js -lib/firefox/mozilla-xremote-client lib/firefox/platform.ini lib/firefox/plugin-container lib/firefox/removed-files diff --git a/www/firefox/distinfo b/www/firefox/distinfo index f0238c0c017..7e2162e0451 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,17 +1,19 @@ -$NetBSD: distinfo,v 1.189 2015/02/19 21:33:22 ryoon Exp $ +$NetBSD: distinfo,v 1.190 2015/02/28 04:30:55 ryoon Exp $ -SHA1 (firefox-35.0.1.source.tar.bz2) = cf256ee1491ee502eb4432ade5a879104ebceede -RMD160 (firefox-35.0.1.source.tar.bz2) = ca4dc6f6c5de1e6e69133de3b8b502991d519fa7 -Size (firefox-35.0.1.source.tar.bz2) = 176276361 bytes -SHA1 (patch-aa) = 3bdbeb9a11e79ab35ea0f37aeb0a1c55bfd21340 +SHA1 (firefox-36.0.source.tar.bz2) = 0939dd0258b042c7b7d4d3a3bff8e476c380885b +RMD160 (firefox-36.0.source.tar.bz2) = 50f846e2566da83698c646608cb552bd67cb0625 +Size (firefox-36.0.source.tar.bz2) = 400388435 bytes +SHA1 (patch-aa) = 4af7ee0e63ca4b1a7584199561e9ecf0528d03aa SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a +SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0 +SHA1 (patch-b2g_installer_package-manifest.in) = cdb43eece164b43b49a9c0f1a47de4e7db56ed76 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 SHA1 (patch-browser_app_nsBrowserApp.cpp) = 18f29d7a41ba088e332915e7f81b8fcccd95f673 -SHA1 (patch-browser_installer_package-manifest.in) = 83a0073525c607e05414688aa07035cc3f08e50a +SHA1 (patch-browser_installer_package-manifest.in) = aee56636fc83ea6441c5303ef0297971b41516d1 SHA1 (patch-build_autoconf_compiler-opts.m4) = ccdc06a2b07b7664f9cb91bcc4fb29052dda8b07 SHA1 (patch-build_autoconf_nss.m4) = bf65db126705a3a1ba294418b9380683ea401fc7 SHA1 (patch-build_gyp.mozbuild) = 201715e30e20090e9a9ef54cb981d283c9aabf8f @@ -19,22 +21,22 @@ SHA1 (patch-build_pgo_profileserver.py) = 8666187258e47c037f2065a19a5b38946fdc0f SHA1 (patch-config_Makefile.in) = 296bd3bc33346cfcfa658fe641c2ee2ac67549f1 SHA1 (patch-config_baseconfig.mk) = 07c295fbfbaeb969b336def32d8924729e332075 SHA1 (patch-config_external_moz.build) = f5503242184fe0936c044b3c57c217ef5d3c7255 -SHA1 (patch-config_rules.mk) = e076a6572db9579a05ee9093d34bf3353c50de58 +SHA1 (patch-config_rules.mk) = d7f7060b246092eae3d7a792e43b14e462a37abd SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b SHA1 (patch-config_system-headers) = 923e9f6e4adbb8af4686e5c07cb4520e6f981f93 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491 -SHA1 (patch-content_base_src_moz.build) = 91a7ab80fd1d28882bd1b0ee50f6cc5e55148f46 -SHA1 (patch-content_media_AudioStream.h) = 189ca0059d35dfbe12ea1b71105a242abb005403 -SHA1 (patch-content_media_gmp_GMPChild.cpp) = 2fac08e3f01c8ae36cfb26a7f59960ecf6e6bc55 -SHA1 (patch-content_media_gmp_GMPParent.cpp) = 765adc26af771aea3e7db094b21c793780465672 -SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb -SHA1 (patch-content_media_moz.build) = d7c41801b9325d7d7eb756e5b0de8c6d78460a4f -SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1 +SHA1 (patch-dom_base_moz.build) = 8b59c33958b7037c4c051742c64f1455096ced46 +SHA1 (patch-dom_media_AudioStream.h) = 96b5a1a2b1c930cfcfa77a125d47b6eb93fac1c6 +SHA1 (patch-dom_media_gmp_GMPChild.cpp) = 534a2c921a2d4d5b71d5ab75b8484ee792329460 +SHA1 (patch-dom_media_gmp_GMPParent.cpp) = 8129d70855cd7d04dc9d909c689db3cdbafb5914 +SHA1 (patch-dom_media_gstreamer_GStreamerAllocator.cpp) = 4685a646a76282619d7c42fac43500e0065f067d +SHA1 (patch-dom_media_moz.build) = dffb6c009b6bcc70340535283a8ce5929c4c5713 +SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 8d3d6bc0e7bfae55dce75ca1995f8c688e290f57 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e -SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 5ab28cc0398b72cb5e1b0586406845495b9f87e4 +SHA1 (patch-dom_plugins_ipc_PluginProcessChild.cpp) = 0d10aa4c913d431fb8fa5f995f6e40cb364f069e SHA1 (patch-dom_system_OSFileConstants.cpp) = 4fe5d4ecf6116c7163ee6d2322db8b1b783fe5ec -SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = a00f1ec785a47d90367dbdc8bc984e1771f0140e +SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 11f6e6f64e1d2515854a5704b896e402daaec0b9 SHA1 (patch-gfx_graphite2_moz-gr-update.sh) = b987dad1bd4513b8a04fb280bd1c5280a03af746 SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce SHA1 (patch-gfx_moz.build) = a98bda4727538f4a0f09a20b84f9dd883edaf7d9 @@ -43,7 +45,7 @@ SHA1 (patch-gfx_skia_moz.build) = ce83717ec6e386d52af75a0f5592fa866b83b3bc SHA1 (patch-gfx_thebes_moz.build) = f64917350eaf693866b0e7196cb7f1cc9e9470fc SHA1 (patch-gfx_ycbcr_moz.build) = 121386ef62ff7425e6f93bc624555199f2ac3485 SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = f9909ded72762b2c3547dd002707db43745f2b9d -SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574 +SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ca9598104c54d9ea64652d6f3cdc872d2226f5fa SHA1 (patch-intl_hyphenation_hnjalloc.h) = 5b5ac622ed2dd8711f00be0af59c95ebc86a8a78 SHA1 (patch-intl_unicharutil_util_moz.build) = d8e4f9c0b013e4b0c9fdb41eaf65336963c2d633 SHA1 (patch-ipc_chromium_Makefile.in) = edd85b79cd3879f7595b932442bb0e93505d5506 @@ -70,37 +72,35 @@ SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8 SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105 SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475 -SHA1 (patch-js_src_Makefile.in) = 4f90e74c19b379bf756210a0cebda265876a2fa1 -SHA1 (patch-js_src_asmjs_AsmJSSignalHandlers.cpp) = 4d994e1f6b9a2bfc01204eb96f002cdf2a8d1bd9 +SHA1 (patch-js_src_Makefile.in) = 77d2e7cb651b9f30ebf6458fd07678416cdecbcc +SHA1 (patch-js_src_asmjs_AsmJSSignalHandlers.cpp) = 367ad8cba3053867e3c7403845fff756f07a69bd SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc SHA1 (patch-js_src_gc_Memory.cpp) = f2ee54f0a05d870651a3235b95bbb346586f3c3c SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c SHA1 (patch-js_src_jit-LIR.cpp) = 4231ab9271b12ca712492e2cdbd4e1e82e108b68 -SHA1 (patch-js_src_jit_ExecutableAllocator.h) = 24bb91e5be41cc4a7658d633c9f4f7c0dc64fd8a +SHA1 (patch-js_src_jit_ExecutableAllocator.h) = cfcf810b25adeeb13eaed8c1405ed286565941cd SHA1 (patch-js_src_jit_MIR.cpp) = 64071494d1aac905e95d25046f0cf1f9f96b74e9 -SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = c1ff7591bd9b8b4a7aea254f674d25b89345f099 +SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = 7352da6b9850bbfef68893d9a120c9e513492518 SHA1 (patch-js_src_jsapi.cpp) = 16269342723fe9420909ea17e19d02b23ad1a70b -SHA1 (patch-js_src_jsdate.cpp) = b09c240f3108d4e95a899405d3d301bd4d6879ba +SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 SHA1 (patch-js_src_shell_jsoptparse.cpp) = f3a306fe3cf629370a671267ef0e102c1a7a226c SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926 SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db -SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 6dd07463c28dfa8b015e384a12a964c48c67394b -SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 2e178fb158c39660fcb29c1e5818751d7e557a66 +SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 6c393966b3778f9a8d80ca1f56509096e50e0105 +SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62 SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696 -SHA1 (patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h) = 1325f23c87d2bb3fc0071b4cf0054e854dfea689 -SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = fdadd8b7e28290aabae4bab78597b4968f63eaf1 +SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = b7c21a68f09176100794148aa75eb19829417fed SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b59809a7292d41bdb352bc425dc46273f1c0c270 SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de -SHA1 (patch-media_libtheora_Makefile.in) = 80ac9cb20760fe4d94047f7cb1c6a16bbdd6b505 SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718 SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933 -SHA1 (patch-media_libtheora_moz.build) = 2763d7df258bd41ca776aa7461b0c5be646fa61c +SHA1 (patch-media_libtheora_moz.build) = 69476f02c0d79929b1d92719706ac68ffd102826 SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af SHA1 (patch-media_libtremor_moz.build) = 994b04e4c344a91c4b474a752ddc4ca0e2732910 SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53 @@ -110,7 +110,7 @@ SHA1 (patch-media_libyuv_include_libyuv_scale__row.h) = 503b6f2065e9d548a1f01f71 SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 087e8788c72b96d2059ca82ce4282d78aed546da SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e SHA1 (patch-media_webrtc_signaling_signaling.gyp) = 91d5fcc2409b1398c84dedc9697107f815de48fc -SHA1 (patch-media_webrtc_signaling_test_moz.build) = 3546ba6548cc8d39800cc7c55688436455d52d3d +SHA1 (patch-media_webrtc_signaling_test_moz.build) = 2de45866c1c41f8a186586264fad3be90e30ba3b SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 4ff5796e15d9aa6adb8495d6f2e5a7f0445a0fac SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = ae0fcc32f7d146d2a494b42a58a9fcbb73c2a74c SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc) = 53481a80b410afe962146f08eafe8ff38ac6a241 @@ -118,8 +118,9 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer. SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ffc1d956e826a0005b76285596ba24a2f4a3806c SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = d310cf4ebf4701d25a1865c7e651829be6d63b8c +SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc) = fba725b4cf0108bda503c33dbafa57c3ab1f4145 SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 5b48bc7d172ef8b6601628cf097153c6c47c50c5 -SHA1 (patch-memory_build_mozjemalloc__compat.c) = ce6cd2865fd7ee6dd6a5926c9f85a2d6aa086517 +SHA1 (patch-memory_build_mozjemalloc__compat.c) = ed02cd5d24ce4087de6ffe6fdb6eaa874195d2a9 SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543 SHA1 (patch-memory_jemalloc_src_configure) = 563834e1a0dc0eba17b4f263de26787672ff9200 SHA1 (patch-memory_mozalloc_VolatileBufferOSX.cpp) = 3ee53fd4213b6dab8bdce02b4c2f14cef7caaca8 @@ -127,45 +128,37 @@ SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 44cb29dac1e8032c3f58149227bfe SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749 SHA1 (patch-mfbt_Attributes.h) = 0cf62084c0220a3fa46226714cea5c30b1b155e9 SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503 +SHA1 (patch-mobile_android_installer_Makefile.in) = 3d6b7ea3fc6249f2f8ebc88f15f34495a0ef41d6 +SHA1 (patch-mobile_android_installer_package-manifest.in) = 5826a6585e76eecad46e8c8bf3a9c4ded61b5748 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a SHA1 (patch-netwerk_base_public_nsNetUtil.h) = 764c6b776f7f9b38d260fb866eddf15f38bd5050 SHA1 (patch-netwerk_dns_Makefile.in) = b6bd9814d909dd6f7cff10dbeac3bedd79c2508e SHA1 (patch-netwerk_dns_moz.build) = 01dd7d9094ddaeffbcd6cfa296e28fb56681b0e6 -SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 3e8904ef4c7ac3ab8a821ed82e5ca55484ecfb55 +SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 40f4a64657ea2dd0ddc6434cafcd181763ac31b6 SHA1 (patch-netwerk_wifi_moz.build) = 7c84003d442f698b030f3fef91fea2f5537b404c SHA1 (patch-netwerk_wifi_nsWifiScannerFreeBSD.cpp) = d43961a396bccc6bbe1dba2b4c1f97d5017c6d6d SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4 SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a -SHA1 (patch-probes_Makefile.in) = 9a8d48556daaaa17996133a6183b1d27f0510361 SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac -SHA1 (patch-toolkit_components_alerts_nsAlertsService.cpp) = e84436c5d5bde7ef23bf60b5f33c63924730e1da SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890 -SHA1 (patch-toolkit_library_moz.build) = f703ede3c619bdb38f6b90bcc468991803e55e44 +SHA1 (patch-toolkit_library_moz.build) = 4a87e3a7eef8286a46b971fbc783c89ee4f769fa SHA1 (patch-toolkit_modules_GMPInstallManager.jsm) = 7e410806f44e7f20109260bef96cd13101c27664 SHA1 (patch-toolkit_mozapps_extensions_internal_OpenH264Provider.jsm) = 75647c1b705bcac8b64064e1eea26cb15b435613 -SHA1 (patch-toolkit_system_gnome_moz.build) = 75a35ca36fb760adf5b49134cb843608e6aa9eb5 -SHA1 (patch-toolkit_system_gnome_nsAlertsIconListener.cpp) = 1592d74ee04ea5577a19a5164c184fae56880556 -SHA1 (patch-toolkit_system_gnome_nsAlertsIconListener.h) = c7f6394134a8876ae5637d1444b64d85d95f7072 -SHA1 (patch-toolkit_system_gnome_nsGnomeModule.cpp) = 8e28490cfffaf868f27643044aeb0178c1929215 -SHA1 (patch-toolkit_system_gnome_nsSystemAlertsService.cpp) = 1024f24a8d65a27f87056deb587fc967f016d020 -SHA1 (patch-toolkit_system_gnome_nsSystemAlertsService.h) = ba4b9507f0e3e598788cd44c503a5735e682da87 SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c SHA1 (patch-widget_gtk_gtk3drawing.c) = 35f849793b8051b88921987bc07062a2b1619092 -SHA1 (patch-widget_gtk_mozgtk_mozgtk.c) = c6ffe6d2662ca6ec82958ab3f3c31bccf4aaf1ab SHA1 (patch-widget_gtk_nsLookAndFeel.cpp) = 34e87c51284cec254344993bfddbd6699bbc6117 SHA1 (patch-widget_gtk_nsLookAndFeel.h) = a639562ca57e1353160b306c8b5805349b130a8a -SHA1 (patch-widget_gtk_nsWindow.cpp) = b9f4cb3c46c34438b136246396de571ccf23d9b6 SHA1 (patch-xpcom_base_nsStackWalk.cpp) = b1a4587c193ac84a3159add1de1e6aa9c13f2f53 SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438 SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = b0a53ec580bf5c2277d19618c1240a447575ae68 SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 9c0d4c7f937ccc127974a80c826316bfae9920f9 SHA1 (patch-xpcom_glue_standalone_nsXPCOMGlue.cpp) = a6ef7f490d52037d2a72d3d52d834a182a29eccb SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511 -SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = a0445488bbcabe7a67a83df3d75f2d956e172a1f +SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = f213960ea7c0a55565a02d8b5c8215cb72f97714 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp) = 493d1433ae72bbd0c65ab3f51de43fb864a6f58d SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index 91ae74fbbdc..df487907e98 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ +$NetBSD: patch-aa,v 1.35 2015/02/28 04:30:55 ryoon Exp $ * The profiler does not support Darwin/PPC so don't try to enable it on that platform. @@ -13,9 +13,9 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ heavy patching. Ideally they should be fixed individually but that will be an extremely hard work, so don't define XP_MACOSX for now. ---- configure.in.orig 2015-01-23 05:59:59.000000000 +0000 -+++ configure.in 2015-02-16 12:58:08.000000000 +0000 -@@ -1717,7 +1717,13 @@ +--- configure.in.orig 2015-02-17 21:40:40.000000000 +0000 ++++ configure.in +@@ -1766,7 +1766,13 @@ Linux) MOZ_ENABLE_PROFILER_SPS= esac ;; @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ *) MOZ_ENABLE_PROFILER_SPS= ;; -@@ -1821,7 +1827,7 @@ +@@ -1870,7 +1876,7 @@ case "$host" in ;; *-darwin*) @@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; -@@ -1953,7 +1959,6 @@ +@@ -2002,7 +2008,6 @@ case "$target" in AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit' else @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' # The ExceptionHandling framework is needed for Objective-C exception -@@ -2569,8 +2574,7 @@ +@@ -2622,8 +2627,7 @@ MOZ_CXX11 AC_LANG_C @@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3614,6 +3618,14 @@ +@@ -3645,6 +3649,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3641,11 +3653,7 @@ +@@ -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)." @@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -4348,6 +4356,10 @@ +@@ -4391,6 +4399,10 @@ cairo-gonk) esac @@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad 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 @@ +@@ -5131,6 +5143,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VPX=1 MOZ_VPX_ERROR_CONCEALMENT=1 @@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5191,6 +5206,57 @@ +@@ -5234,6 +5249,57 @@ if test "${ac_cv_c_attribute_aligned}" ! fi dnl ======================================================== @@ -164,7 +164,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ dnl = Disable Opus audio codec support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(opus, -@@ -5199,6 +5265,89 @@ +@@ -5242,6 +5308,89 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -254,7 +254,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -@@ -5557,6 +5706,60 @@ +@@ -5600,6 +5749,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -268,33 +268,40 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad 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 @@ -302,7 +309,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad 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 @@ -315,7 +322,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -5570,12 +5773,23 @@ +@@ -5613,12 +5823,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, MOZ_ALSA=1, MOZ_ALSA=) @@ -339,7 +346,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ AC_SUBST(MOZ_ALSA) dnl ======================================================== -@@ -5999,7 +6213,9 @@ +@@ -6046,7 +6267,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, if test "$MOZ_GAMEPAD"; then case "$OS_TARGET" in Darwin) @@ -350,7 +357,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ ;; WINNT) case "$MOZ_WINSDK_MAXVER" in -@@ -8123,6 +8339,49 @@ +@@ -8089,6 +8312,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== @@ -400,7 +407,7 @@ $NetBSD: patch-aa,v 1.34 2015/02/16 16:16:17 bad Exp $ dnl Check for pixman and cairo dnl ======================================================== -@@ -8378,7 +8637,7 @@ +@@ -8344,7 +8610,7 @@ case "$OS_TARGET" in NECKO_WIFI=1 fi ;; diff --git a/www/firefox/patches/patch-b2g_installer_Makefile.in b/www/firefox/patches/patch-b2g_installer_Makefile.in new file mode 100644 index 00000000000..633df287efe --- /dev/null +++ b/www/firefox/patches/patch-b2g_installer_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-b2g_installer_Makefile.in,v 1.5 2015/02/28 04:30:55 ryoon Exp $ + +--- b2g/installer/Makefile.in.orig 2015-02-17 21:40:34.000000000 +0000 ++++ b2g/installer/Makefile.in +@@ -79,6 +79,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS) + DEFINES += -DMOZ_RTSP + endif + ++ifdef MOZ_DEBUG ++DEFINES += -DMOZ_DEBUG=1 ++endif ++ + ifdef GKMEDIAS_SHARED_LIBRARY + DEFINES += -DGKMEDIAS_SHARED_LIBRARY + endif diff --git a/www/firefox/patches/patch-b2g_installer_package-manifest.in b/www/firefox/patches/patch-b2g_installer_package-manifest.in new file mode 100644 index 00000000000..ede4681aa9d --- /dev/null +++ b/www/firefox/patches/patch-b2g_installer_package-manifest.in @@ -0,0 +1,13 @@ +$NetBSD: patch-b2g_installer_package-manifest.in,v 1.4 2015/02/28 04:30:55 ryoon Exp $ + +--- b2g/installer/package-manifest.in.orig 2015-02-17 21:40:34.000000000 +0000 ++++ 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/firefox/patches/patch-browser_installer_package-manifest.in b/www/firefox/patches/patch-browser_installer_package-manifest.in index b8b9a9236a6..cee214bf10e 100644 --- a/www/firefox/patches/patch-browser_installer_package-manifest.in +++ b/www/firefox/patches/patch-browser_installer_package-manifest.in @@ -1,19 +1,19 @@ -$NetBSD: patch-browser_installer_package-manifest.in,v 1.5 2014/07/24 14:57:12 ryoon Exp $ +$NetBSD: patch-browser_installer_package-manifest.in,v 1.6 2015/02/28 04:30:55 ryoon Exp $ Limit SPARC bits to just SPARC (untested, but fixes x86). ---- browser/installer/package-manifest.in.orig 2014-07-17 01:45:07.000000000 +0000 +--- browser/installer/package-manifest.in.orig 2015-02-17 21:40:38.000000000 +0000 +++ browser/installer/package-manifest.in -@@ -575,7 +575,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 -@@ -737,7 +737,7 @@ +@@ -788,7 +788,7 @@ #endif ; for Solaris SPARC diff --git a/www/firefox/patches/patch-config_rules.mk b/www/firefox/patches/patch-config_rules.mk index 61070804d3a..d7d00290a0e 100644 --- a/www/firefox/patches/patch-config_rules.mk +++ b/www/firefox/patches/patch-config_rules.mk @@ -1,8 +1,8 @@ -$NetBSD: patch-config_rules.mk,v 1.2 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-config_rules.mk,v 1.3 2015/02/28 04:30:55 ryoon Exp $ ---- config/rules.mk.orig 2014-11-21 03:37:23.000000000 +0000 +--- config/rules.mk.orig 2015-02-17 21:40:40.000000000 +0000 +++ 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-config_rules.mk,v 1.2 2014/12/01 18:11:14 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/firefox/patches/patch-content_base_src_moz.build b/www/firefox/patches/patch-content_base_src_moz.build deleted file mode 100644 index bf24432883e..00000000000 --- a/www/firefox/patches/patch-content_base_src_moz.build +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-content_base_src_moz.build,v 1.2 2014/12/01 18:11:14 ryoon Exp $ - ---- content/base/src/moz.build.orig 2014-11-21 03:37:23.000000000 +0000 -+++ 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/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h deleted file mode 100644 index eed068db2ad..00000000000 --- a/www/firefox/patches/patch-content_media_AudioStream.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-content_media_AudioStream.h,v 1.10 2014/12/01 18:11:14 ryoon Exp $ - ---- content/media/AudioStream.h.orig 2014-11-21 03:37:24.000000000 +0000 -+++ 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/firefox/patches/patch-dom_base_moz.build b/www/firefox/patches/patch-dom_base_moz.build new file mode 100644 index 00000000000..40ba2a3cde1 --- /dev/null +++ b/www/firefox/patches/patch-dom_base_moz.build @@ -0,0 +1,14 @@ +$NetBSD: patch-dom_base_moz.build,v 1.1 2015/02/28 04:30:55 ryoon Exp $ + +--- dom/base/moz.build.orig 2015-02-17 21:40:41.000000000 +0000 ++++ 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/firefox/patches/patch-dom_media_AudioStream.h b/www/firefox/patches/patch-dom_media_AudioStream.h new file mode 100644 index 00000000000..43593cdb248 --- /dev/null +++ b/www/firefox/patches/patch-dom_media_AudioStream.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dom_media_AudioStream.h,v 1.1 2015/02/28 04:30:55 ryoon Exp $ + +--- dom/media/AudioStream.h.orig 2015-02-17 21:40:44.000000000 +0000 ++++ 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/firefox/patches/patch-content_media_gmp_GMPChild.cpp b/www/firefox/patches/patch-dom_media_gmp_GMPChild.cpp index 2391ee0d598..4507449729e 100644 --- a/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp +++ b/www/firefox/patches/patch-dom_media_gmp_GMPChild.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-content_media_gmp_GMPChild.cpp,v 1.2 2015/01/16 22:42:09 ryoon Exp $ +$NetBSD: patch-dom_media_gmp_GMPChild.cpp,v 1.1 2015/02/28 04:30:55 ryoon Exp $ ---- content/media/gmp/GMPChild.cpp.orig 2015-01-09 04:38:19.000000000 +0000 -+++ content/media/gmp/GMPChild.cpp -@@ -91,21 +91,14 @@ GetFileBase(const std::string& aPluginPa +--- dom/media/gmp/GMPChild.cpp.orig 2015-02-17 21:40:44.000000000 +0000 ++++ dom/media/gmp/GMPChild.cpp +@@ -82,21 +82,14 @@ GetFileBase(const std::string& aPluginPa } #endif diff --git a/www/firefox/patches/patch-content_media_gmp_GMPParent.cpp b/www/firefox/patches/patch-dom_media_gmp_GMPParent.cpp index 4937f9987ae..92144de3370 100644 --- a/www/firefox/patches/patch-content_media_gmp_GMPParent.cpp +++ b/www/firefox/patches/patch-dom_media_gmp_GMPParent.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-content_media_gmp_GMPParent.cpp,v 1.2 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-dom_media_gmp_GMPParent.cpp,v 1.1 2015/02/28 04:30:55 ryoon Exp $ ---- content/media/gmp/GMPParent.cpp.orig 2014-11-21 03:37:24.000000000 +0000 -+++ content/media/gmp/GMPParent.cpp -@@ -90,23 +90,16 @@ GMPParent::Init(GeckoMediaPluginService +--- dom/media/gmp/GMPParent.cpp.orig 2015-02-17 21:40:44.000000000 +0000 ++++ dom/media/gmp/GMPParent.cpp +@@ -96,23 +96,16 @@ GMPParent::Init(GeckoMediaPluginService mService = aService; mDirectory = aPluginDir; diff --git a/www/firefox/patches/patch-content_media_gstreamer_GStreamerAllocator.cpp b/www/firefox/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp index 06be23b6e12..f7dfa38accc 100644 --- a/www/firefox/patches/patch-content_media_gstreamer_GStreamerAllocator.cpp +++ b/www/firefox/patches/patch-dom_media_gstreamer_GStreamerAllocator.cpp @@ -1,7 +1,7 @@ -$NetBSD: patch-content_media_gstreamer_GStreamerAllocator.cpp,v 1.3 2014/06/11 00:40:59 ryoon Exp $ +$NetBSD: patch-dom_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2015/02/28 04:30:55 ryoon Exp $ ---- content/media/gstreamer/GStreamerAllocator.cpp.orig 2014-05-29 23:30:33.000000000 +0000 -+++ content/media/gstreamer/GStreamerAllocator.cpp +--- dom/media/gstreamer/GStreamerAllocator.cpp.orig 2015-02-17 21:40:44.000000000 +0000 ++++ 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/firefox/patches/patch-content_media_moz.build b/www/firefox/patches/patch-dom_media_moz.build index 326a366b0c2..efc6e78fa99 100644 --- a/www/firefox/patches/patch-content_media_moz.build +++ b/www/firefox/patches/patch-dom_media_moz.build @@ -1,12 +1,11 @@ -$NetBSD: patch-content_media_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-dom_media_moz.build,v 1.1 2015/02/28 04:30:55 ryoon Exp $ ---- content/media/moz.build.orig 2014-11-21 03:37:24.000000000 +0000 -+++ content/media/moz.build -@@ -213,3 +213,24 @@ if CONFIG['ANDROID_VERSION'] > '15': - +--- dom/media/moz.build.orig 2015-02-17 21:40:44.000000000 +0000 ++++ 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-content_media_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ + +if CONFIG['MOZ_NATIVE_SOUNDTOUCH']: + CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] ++ + include('/ipc/chromium/chromium-config.mozbuild') + + FINAL_LIBRARY = 'xul' diff --git a/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp index 5dc657357f1..3c2fa7a73b0 100644 --- a/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp +++ b/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.5 2014/05/30 10:22:05 pho Exp $ +$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/02/28 04:30:55 ryoon Exp $ ---- dom/plugins/ipc/PluginModuleChild.cpp.orig 2013-05-11 19:19:27.000000000 +0000 +--- dom/plugins/ipc/PluginModuleChild.cpp.orig 2015-02-17 21:40:45.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -201,7 +201,7 @@ PluginModuleChild::Init(const std::strin +@@ -307,7 +307,7 @@ PluginModuleChild::InitForChrome(const s // TODO: use PluginPRLibrary here @@ -11,16 +11,16 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.5 2014/05/30 10:22:05 p mShutdownFunc = (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); -@@ -1836,7 +1836,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); -@@ -1865,7 +1865,7 @@ PluginModuleChild::AnswerNP_Initialize(c +@@ -1899,7 +1899,7 @@ PluginModuleChild::AnswerNP_Initialize(c SendBackUpXResources(FileDescriptor(xSocketFd)); #endif diff --git a/www/firefox/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp b/www/firefox/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp index bce0ea7d01c..d0f6648b252 100644 --- a/www/firefox/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp +++ b/www/firefox/patches/patch-dom_plugins_ipc_PluginProcessChild.cpp @@ -1,14 +1,14 @@ -$NetBSD: patch-dom_plugins_ipc_PluginProcessChild.cpp,v 1.1 2014/05/30 03:03:36 pho Exp $ +$NetBSD: patch-dom_plugins_ipc_PluginProcessChild.cpp,v 1.2 2015/02/28 04:30:55 ryoon Exp $ Just because OS_ARCH is Darwin does not mean libplugin_child_interpose.dylib is used. ---- dom/plugins/ipc/PluginProcessChild.cpp.orig 2014-05-06 22:55:25.000000000 +0000 +--- dom/plugins/ipc/PluginProcessChild.cpp.orig 2015-02-17 21:40:45.000000000 +0000 +++ 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/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp b/www/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp index b09b6fb8862..022dec7330c 100644 --- a/www/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp +++ b/www/firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp @@ -1,20 +1,18 @@ -$NetBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.7 2015/01/30 15:19:59 ryoon Exp $ +$NetBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.8 2015/02/28 04:30:55 ryoon Exp $ Load system hunspell dictionaries. ---- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-01-23 06:00:09.000000000 +0000 +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-02-17 21:40:49.000000000 +0000 +++ 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/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp b/www/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp index 178855a5a42..cb34f4eede5 100644 --- a/www/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp +++ b/www/firefox/patches/patch-image_decoders_nsJPEGDecoder.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $ +$NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.4 2015/02/28 04:30:55 ryoon Exp $ ---- image/decoders/nsJPEGDecoder.cpp.orig 2013-05-11 19:19:31.000000000 +0000 +--- image/decoders/nsJPEGDecoder.cpp.orig 2015-02-17 21:40:35.000000000 +0000 +++ image/decoders/nsJPEGDecoder.cpp -@@ -19,13 +19,28 @@ +@@ -21,13 +21,28 @@ extern "C" { #include "iccjpeg.h" @@ -32,26 +32,26 @@ $NetBSD: patch-image_decoders_nsJPEGDecoder.cpp,v 1.3 2014/02/20 13:19:03 ryoon 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-image_decoders_nsJPEGDecoder.cpp,v 1.3 2014/02/20 13:19:03 ryoon + } +#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-image_decoders_nsJPEGDecoder.cpp,v 1.3 2014/02/20 13:19:03 ryoon +#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-image_decoders_nsJPEGDecoder.cpp,v 1.3 2014/02/20 13:19:03 ryoon +#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/firefox/patches/patch-js_src_Makefile.in b/www/firefox/patches/patch-js_src_Makefile.in index 6fce0a50b04..8b525ad3e1c 100644 --- a/www/firefox/patches/patch-js_src_Makefile.in +++ b/www/firefox/patches/patch-js_src_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-js_src_Makefile.in,v 1.10 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-js_src_Makefile.in,v 1.11 2015/02/28 04:30:55 ryoon Exp $ ---- js/src/Makefile.in.orig 2014-11-21 03:37:33.000000000 +0000 +--- js/src/Makefile.in.orig 2015-02-17 21:40:38.000000000 +0000 +++ js/src/Makefile.in @@ -16,9 +16,6 @@ TOPLEVEL_BUILD := 1 @@ -12,12 +12,3 @@ $NetBSD: patch-js_src_Makefile.in,v 1.10 2014/12/01 18:11:14 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/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp b/www/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp index 8c95065ee39..c3644ca1d41 100644 --- a/www/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp +++ b/www/firefox/patches/patch-js_src_asmjs_AsmJSSignalHandlers.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.1 2015/01/30 07:32:24 pho Exp $ +$NetBSD: patch-js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.2 2015/02/28 04:30:55 ryoon Exp $ Increase portability for non-x86 Darwin by not hardwiring x86_THREAD_STATE. ---- js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-01-29 00:54:07.000000000 +0000 +--- js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-02-17 21:40:38.000000000 +0000 +++ 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> @@ -43,40 +43,9 @@ x86_THREAD_STATE. -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. @@ -91,12 +60,3 @@ x86_THREAD_STATE. 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/firefox/patches/patch-js_src_jit_ExecutableAllocator.h b/www/firefox/patches/patch-js_src_jit_ExecutableAllocator.h index 0795549fcb7..cea23875430 100644 --- a/www/firefox/patches/patch-js_src_jit_ExecutableAllocator.h +++ b/www/firefox/patches/patch-js_src_jit_ExecutableAllocator.h @@ -1,13 +1,16 @@ -$NetBSD: patch-js_src_jit_ExecutableAllocator.h,v 1.1 2014/12/02 21:27:18 ryoon Exp $ +$NetBSD: patch-js_src_jit_ExecutableAllocator.h,v 1.2 2015/02/28 04:30:55 ryoon Exp $ ---- js/src/jit/ExecutableAllocator.h.orig 2014-11-26 12:30:07.000000000 +0000 +--- js/src/jit/ExecutableAllocator.h.orig 2015-02-17 21:40:41.000000000 +0000 +++ 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/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp index 00bfe5a55c3..142f50ad9df 100644 --- a/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp +++ b/www/firefox/patches/patch-js_src_jit_arm_Architecture-arm.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.3 2014/12/02 21:27:18 ryoon Exp $ +$NetBSD: patch-js_src_jit_arm_Architecture-arm.cpp,v 1.4 2015/02/28 04:30:55 ryoon Exp $ ---- js/src/jit/arm/Architecture-arm.cpp.orig 2014-11-26 12:30:07.000000000 +0000 +--- js/src/jit/arm/Architecture-arm.cpp.orig 2015-02-17 21:40:41.000000000 +0000 +++ 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/firefox/patches/patch-js_src_jsdate.cpp b/www/firefox/patches/patch-js_src_jsdate.cpp index 63ec2589569..3f56a8c4b51 100644 --- a/www/firefox/patches/patch-js_src_jsdate.cpp +++ b/www/firefox/patches/patch-js_src_jsdate.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-js_src_jsdate.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $ +$NetBSD: patch-js_src_jsdate.cpp,v 1.2 2015/02/28 04:30:55 ryoon Exp $ ---- js/src/jsdate.cpp.orig 2015-01-23 06:00:01.000000000 +0000 -+++ js/src/jsdate.cpp 2015-02-05 12:54:32.000000000 +0000 -@@ -2651,11 +2651,11 @@ +--- js/src/jsdate.cpp.orig 2015-02-17 21:40:42.000000000 +0000 ++++ 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...*/ @@ -15,6 +15,6 @@ $NetBSD: patch-js_src_jsdate.cpp,v 1.1 2015/02/16 16:16:17 bad Exp $ - 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), - "%d", js_DateGetYear(cx, obj)); - } diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c index 33f4bfc6751..06f42ff1992 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c @@ -1,7 +1,7 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.8 2015/02/28 04:30:55 ryoon Exp $ ---- media/libcubeb/src/cubeb_alsa.c.orig 2015-01-23 05:59:59.000000000 +0000 -+++ media/libcubeb/src/cubeb_alsa.c 2015-02-16 23:58:18.000000000 +0000 +--- media/libcubeb/src/cubeb_alsa.c.orig 2015-02-17 21:40:41.000000000 +0000 ++++ media/libcubeb/src/cubeb_alsa.c @@ -6,12 +6,18 @@ */ #undef NDEBUG @@ -16,12 +16,12 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex #include <limits.h> +#include <dlfcn.h> #include <poll.h> ++#include <stdlib.h> +#include <stdio.h> -+#include <string.h> #include <unistd.h> #include <alsa/asoundlib.h> #include "cubeb/cubeb.h" -@@ -24,6 +30,50 @@ +@@ -24,6 +30,51 @@ #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" @@ -44,6 +44,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex +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 */ @@ -72,7 +73,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex /* 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 +114,8 @@ +@@ -64,6 +115,8 @@ struct cubeb { workaround is not required. */ snd_config_t * local_config; int is_pa; @@ -81,30 +82,62 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex }; enum stream_state { -@@ -262,7 +314,7 @@ +@@ -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 +323,10 @@ - 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 +345,8 @@ + /* 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) { @@ -115,7 +148,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (avail <= 0) { pthread_mutex_unlock(&stm->mutex); stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); -@@ -302,7 +354,7 @@ +@@ -302,7 +358,7 @@ alsa_refill_stream(cubeb_stream * stm) } } @@ -124,21 +157,91 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex assert(p); pthread_mutex_unlock(&stm->mutex); -@@ -327,10 +379,10 @@ +@@ -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 +394,7 @@ +- } +- 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. */ @@ -147,7 +250,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex set_timeout(&stm->drain_timeout, buffer_time * 1000); -@@ -453,26 +505,26 @@ +@@ -453,26 +558,26 @@ get_slave_pcm_node(snd_config_t * lconf, slave_def = NULL; @@ -179,7 +282,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (r < 0) { break; } -@@ -481,7 +533,7 @@ +@@ -481,7 +586,7 @@ get_slave_pcm_node(snd_config_t * lconf, if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -188,7 +291,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (r < 0) { break; } -@@ -490,7 +542,7 @@ +@@ -490,7 +595,7 @@ get_slave_pcm_node(snd_config_t * lconf, } while (0); if (slave_def) { @@ -197,7 +300,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex } return NULL; -@@ -513,22 +565,22 @@ +@@ -513,22 +618,22 @@ init_local_config_with_workaround(char c lconf = NULL; @@ -224,7 +327,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (r < 0) { break; } -@@ -537,7 +589,7 @@ +@@ -537,7 +642,7 @@ init_local_config_with_workaround(char c if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -233,7 +336,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (r < 0) { break; } -@@ -548,12 +600,12 @@ +@@ -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. */ @@ -248,7 +351,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (r < 0) { break; } -@@ -564,18 +616,18 @@ +@@ -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. */ @@ -270,7 +373,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (r < 0) { break; } -@@ -583,7 +635,7 @@ +@@ -583,7 +688,7 @@ init_local_config_with_workaround(char c return lconf; } while (0); @@ -279,7 +382,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex return NULL; } -@@ -595,9 +647,9 @@ +@@ -595,9 +700,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s pthread_mutex_lock(&cubeb_alsa_mutex); if (local_config) { @@ -291,7 +394,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -610,7 +662,7 @@ +@@ -610,7 +715,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) int r; pthread_mutex_lock(&cubeb_alsa_mutex); @@ -300,7 +403,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex pthread_mutex_unlock(&cubeb_alsa_mutex); return r; -@@ -667,12 +719,65 @@ +@@ -667,12 +772,65 @@ alsa_init(cubeb ** context, char const * pthread_attr_t attr; snd_pcm_t * dummy; @@ -367,7 +470,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex cubeb_alsa_error_handler_set = 1; } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -680,6 +785,8 @@ +@@ -680,6 +838,8 @@ alsa_init(cubeb ** context, char const * ctx = calloc(1, sizeof(*ctx)); assert(ctx); @@ -376,7 +479,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex ctx->ops = &alsa_ops; r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -729,7 +836,7 @@ +@@ -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); @@ -385,7 +488,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex pthread_mutex_unlock(&cubeb_alsa_mutex); ctx->local_config = NULL; } else if (r >= 0) { -@@ -768,9 +875,13 @@ +@@ -768,9 +928,13 @@ alsa_destroy(cubeb * ctx) pthread_mutex_destroy(&ctx->mutex); free(ctx->fds); @@ -400,7 +503,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex pthread_mutex_unlock(&cubeb_alsa_mutex); } -@@ -838,7 +949,7 @@ +@@ -838,7 +1002,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre return CUBEB_ERROR; } @@ -409,7 +512,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex assert(r == 0); /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't -@@ -848,23 +959,23 @@ +@@ -848,23 +1012,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre latency = latency < 500 ? 500 : latency; } @@ -439,7 +542,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex assert((nfds_t) r == stm->nfds); r = pthread_cond_init(&stm->cond, NULL); -@@ -895,7 +1006,7 @@ +@@ -895,7 +1059,7 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); if (stm->pcm) { if (stm->state == DRAINING) { @@ -448,7 +551,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex } alsa_locked_pcm_close(stm->pcm); stm->pcm = NULL; -@@ -905,7 +1016,10 @@ +@@ -905,7 +1069,10 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_destroy(&stm->mutex); r = pthread_cond_destroy(&stm->cond); @@ -460,7 +563,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex alsa_unregister_stream(stm); -@@ -937,12 +1051,12 @@ +@@ -937,12 +1104,12 @@ alsa_get_max_channel_count(cubeb * ctx, return CUBEB_ERROR; } @@ -475,7 +578,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex if (rv < 0) { return CUBEB_ERROR; } -@@ -962,34 +1076,34 @@ +@@ -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. */ @@ -518,7 +621,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex return CUBEB_OK; } -@@ -1013,7 +1127,7 @@ +@@ -1013,7 +1180,7 @@ alsa_stream_start(cubeb_stream * stm) ctx = stm->context; pthread_mutex_lock(&stm->mutex); @@ -527,7 +630,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex gettimeofday(&stm->last_activity, NULL); pthread_mutex_unlock(&stm->mutex); -@@ -1047,7 +1161,7 @@ +@@ -1047,7 +1214,7 @@ alsa_stream_stop(cubeb_stream * stm) pthread_mutex_unlock(&ctx->mutex); pthread_mutex_lock(&stm->mutex); @@ -536,7 +639,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1063,8 +1177,8 @@ +@@ -1063,14 +1230,17 @@ alsa_stream_get_position(cubeb_stream * pthread_mutex_lock(&stm->mutex); delay = -1; @@ -547,7 +650,17 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.7 2015/02/17 14:59:01 bad Ex *position = stm->last_position; pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1089,7 +1203,7 @@ + } + +- 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/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c index 493f167a070..4d9406460da 100644 --- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c +++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c @@ -1,8 +1,8 @@ -$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.2 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.3 2015/02/28 04:30:55 ryoon Exp $ ---- media/libcubeb/src/cubeb_oss.c.orig 2014-11-30 06:26:27.000000000 +0000 +--- media/libcubeb/src/cubeb_oss.c.orig 2015-02-20 05:47:26.000000000 +0000 +++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,404 @@ +@@ -0,0 +1,402 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -11,8 +11,6 @@ $NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.2 2014/12/01 18:11:14 ryoon E + */ +#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/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h b/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h deleted file mode 100644 index 974287a1d57..00000000000 --- a/www/firefox/patches/patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h,v 1.1 2014/10/18 17:56:35 ryoon Exp $ - ---- media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h.orig 2014-10-11 09:06:39.000000000 +0000 -+++ 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/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp b/www/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp index b5f4f19370a..2a0ce0c3d17 100644 --- a/www/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp +++ b/www/firefox/patches/patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.1 2014/10/15 13:43:32 ryoon Exp $ +$NetBSD: patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.2 2015/02/28 04:30:55 ryoon Exp $ ---- media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2014-10-11 09:06:39.000000000 +0000 +--- media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2015-02-23 07:39:35.000000000 +0000 +++ 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-media_libstagefright_frameworks_av_media_libstagefright_foundatio +# endif +#endif + ++#if defined(__NetBSD__) && defined(tolower) ++#undef tolower ++#endif ++ namespace stagefright { // static diff --git a/www/firefox/patches/patch-media_libtheora_Makefile.in b/www/firefox/patches/patch-media_libtheora_Makefile.in deleted file mode 100644 index b1d74312fc3..00000000000 --- a/www/firefox/patches/patch-media_libtheora_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-media_libtheora_Makefile.in,v 1.1 2014/03/20 21:02:00 ryoon Exp $ - ---- media/libtheora/Makefile.in.orig 2014-03-20 11:09:40.000000000 +0000 -+++ 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/firefox/patches/patch-media_libtheora_moz.build b/www/firefox/patches/patch-media_libtheora_moz.build index d3fbd721bd7..84e8295906a 100644 --- a/www/firefox/patches/patch-media_libtheora_moz.build +++ b/www/firefox/patches/patch-media_libtheora_moz.build @@ -1,10 +1,10 @@ -$NetBSD: patch-media_libtheora_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-media_libtheora_moz.build,v 1.2 2015/02/28 04:30:55 ryoon Exp $ ---- media/libtheora/moz.build.orig 2014-11-21 03:37:42.000000000 +0000 +--- media/libtheora/moz.build.orig 2015-02-17 21:40:41.000000000 +0000 +++ 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/firefox/patches/patch-media_webrtc_signaling_test_moz.build b/www/firefox/patches/patch-media_webrtc_signaling_test_moz.build index 6416c59a666..dc919ea2ec9 100644 --- a/www/firefox/patches/patch-media_webrtc_signaling_test_moz.build +++ b/www/firefox/patches/patch-media_webrtc_signaling_test_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-media_webrtc_signaling_test_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-media_webrtc_signaling_test_moz.build,v 1.2 2015/02/28 04:30:55 ryoon Exp $ ---- media/webrtc/signaling/test/moz.build.orig 2014-11-21 03:37:43.000000000 +0000 +--- media/webrtc/signaling/test/moz.build.orig 2015-02-17 21:40:43.000000000 +0000 +++ 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-media_webrtc_signaling_test_moz.build,v 1.1 2014/12/01 18:11:14 r 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/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc new file mode 100644 index 00000000000..a416a5dcf66 --- /dev/null +++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc @@ -0,0 +1,20 @@ +$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__coding_main_source_receiver.cc,v 1.1 2015/02/28 04:30:55 ryoon Exp $ + +--- media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc.orig 2015-02-17 21:40:45.000000000 +0000 ++++ 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/firefox/patches/patch-memory_build_mozjemalloc__compat.c b/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c index 91f2a34568d..0fb4c02e0d4 100644 --- a/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c +++ b/www/firefox/patches/patch-memory_build_mozjemalloc__compat.c @@ -1,6 +1,6 @@ -$NetBSD: patch-memory_build_mozjemalloc__compat.c,v 1.1 2014/12/01 18:11:14 ryoon Exp $ +$NetBSD: patch-memory_build_mozjemalloc__compat.c,v 1.2 2015/02/28 04:30:55 ryoon Exp $ ---- memory/build/mozjemalloc_compat.c.orig 2014-11-21 03:37:44.000000000 +0000 +--- memory/build/mozjemalloc_compat.c.orig 2015-02-17 21:40:46.000000000 +0000 +++ memory/build/mozjemalloc_compat.c @@ -12,6 +12,8 @@ #include "jemalloc_types.h" @@ -77,20 +77,7 @@ $NetBSD: patch-memory_build_mozjemalloc__compat.c,v 1.1 2014/12/01 18:11:14 ryoo 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/firefox/patches/patch-mobile_android_installer_Makefile.in b/www/firefox/patches/patch-mobile_android_installer_Makefile.in new file mode 100644 index 00000000000..e153380badc --- /dev/null +++ b/www/firefox/patches/patch-mobile_android_installer_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-mobile_android_installer_Makefile.in,v 1.3 2015/02/28 04:30:55 ryoon Exp $ + +--- mobile/android/installer/Makefile.in.orig 2015-02-17 21:40:48.000000000 +0000 ++++ 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/firefox/patches/patch-mobile_android_installer_package-manifest.in b/www/firefox/patches/patch-mobile_android_installer_package-manifest.in new file mode 100644 index 00000000000..589493edfab --- /dev/null +++ b/www/firefox/patches/patch-mobile_android_installer_package-manifest.in @@ -0,0 +1,13 @@ +$NetBSD: patch-mobile_android_installer_package-manifest.in,v 1.3 2015/02/28 04:30:55 ryoon Exp $ + +--- mobile/android/installer/package-manifest.in.orig 2015-02-17 21:40:48.000000000 +0000 ++++ 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/firefox/patches/patch-netwerk_protocol_http_Http2Session.cpp b/www/firefox/patches/patch-netwerk_protocol_http_Http2Session.cpp index b65ecc4aad9..3f10b355fde 100644 --- a/www/firefox/patches/patch-netwerk_protocol_http_Http2Session.cpp +++ b/www/firefox/patches/patch-netwerk_protocol_http_Http2Session.cpp @@ -1,19 +1,19 @@ -$NetBSD: patch-netwerk_protocol_http_Http2Session.cpp,v 1.3 2015/02/14 07:59:24 martin Exp $ +$NetBSD: patch-netwerk_protocol_http_Http2Session.cpp,v 1.4 2015/02/28 04:30:55 ryoon Exp $ https://bugzilla.mozilla.org/show_bug.cgi?id=1130822 Fix obivous alignment issues (causing crashes on some architectures). ---- netwerk/protocol/http/Http2Session.cpp.orig 2015-01-23 07:00:06.000000000 +0100 -+++ netwerk/protocol/http/Http2Session.cpp 2015-02-13 08:50:19.000000000 +0100 -@@ -30,7 +30,6 @@ - #include "nsISSLStatusProvider.h" - #include "nsISupportsPriority.h" +--- netwerk/protocol/http/Http2Session.cpp.orig 2015-02-17 21:40:50.000000000 +0000 ++++ 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 -@@ -1289,7 +1288,7 @@ +@@ -1295,7 +1294,7 @@ Http2Session::RecvPriority(Http2Session return rv; uint32_t newPriorityDependency = @@ -22,7 +22,7 @@ Fix obivous alignment issues (causing crashes on some architectures). bool exclusive = !!(newPriorityDependency & 0x80000000); newPriorityDependency &= 0x7fffffff; uint8_t newPriorityWeight = *(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4); -@@ -1320,7 +1319,7 @@ +@@ -1326,7 +1325,7 @@ Http2Session::RecvRstStream(Http2Session } self->mDownstreamRstReason = @@ -31,7 +31,7 @@ Fix obivous alignment issues (causing crashes on some architectures). LOG3(("Http2Session::RecvRstStream %p RST_STREAM Reason Code %u ID %x\n", self, self->mDownstreamRstReason, self->mInputFrameID)); -@@ -1381,8 +1380,8 @@ +@@ -1387,8 +1386,8 @@ Http2Session::RecvSettings(Http2Session uint8_t *setting = reinterpret_cast<uint8_t *> (self->mInputFrameBuffer.get()) + kFrameHeaderBytes + index * 6; @@ -42,7 +42,7 @@ Fix obivous alignment issues (causing crashes on some architectures). LOG3(("Settings ID %u, Value %u", id, value)); switch (id) -@@ -1467,7 +1466,7 @@ +@@ -1473,7 +1472,7 @@ Http2Session::RecvPushPromise(Http2Sessi } promiseLen = 4; promisedID = @@ -51,7 +51,7 @@ Fix obivous alignment issues (causing crashes on some architectures). promisedID &= 0x7fffffff; } -@@ -1702,11 +1701,11 @@ +@@ -1733,11 +1732,11 @@ Http2Session::RecvGoAway(Http2Session *s self->mShouldGoAway = true; self->mGoAwayID = @@ -65,7 +65,7 @@ Fix obivous alignment issues (causing crashes on some architectures). // Find streams greater than the last-good ID and mark them for deletion // in the mGoAwayStreamsToRestart queue with the GoAwayEnumerator. The -@@ -1772,7 +1771,7 @@ +@@ -1809,7 +1808,7 @@ Http2Session::RecvWindowUpdate(Http2Sess } uint32_t delta = @@ -74,7 +74,7 @@ Fix obivous alignment issues (causing crashes on some architectures). delta &= 0x7fffffff; LOG3(("Http2Session::RecvWindowUpdate %p len=%d Stream 0x%X.\n", -@@ -2416,7 +2415,7 @@ +@@ -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]; @@ -83,7 +83,7 @@ Fix obivous alignment issues (causing crashes on some architectures). if (totallyWastedByte || (mInputFrameDataSize > kMaxFrameData)) { LOG3(("Got frame too large 0x%02X%04X", totallyWastedByte, mInputFrameDataSize)); RETURN_SESSION_ERROR(this, PROTOCOL_ERROR); -@@ -2424,7 +2423,7 @@ +@@ -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 = diff --git a/www/firefox/patches/patch-probes_Makefile.in b/www/firefox/patches/patch-probes_Makefile.in deleted file mode 100644 index dc2effa3588..00000000000 --- a/www/firefox/patches/patch-probes_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-probes_Makefile.in,v 1.1 2014/07/24 14:57:12 ryoon Exp $ - ---- probes/Makefile.in.orig 2014-07-17 01:45:36.000000000 +0000 -+++ 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/firefox/patches/patch-toolkit_components_alerts_nsAlertsService.cpp b/www/firefox/patches/patch-toolkit_components_alerts_nsAlertsService.cpp deleted file mode 100644 index 344cc4cd05d..00000000000 --- a/www/firefox/patches/patch-toolkit_components_alerts_nsAlertsService.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-toolkit_components_alerts_nsAlertsService.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- toolkit/components/alerts/nsAlertsService.cpp.orig 2014-11-21 03:37:50.000000000 +0000 -+++ toolkit/components/alerts/nsAlertsService.cpp -@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlert - nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); - nsresult rv; - if (sysAlerts) { -- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -- aAlertCookie, aAlertListener, aAlertName, -- aBidi, aLang, aData, -- IPC::Principal(aPrincipal)); -+ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener, aAlertName, -+ aBidi, aLang, aData, -+ IPC::Principal(aPrincipal)); -+ if (NS_SUCCEEDED(rv)) -+ return NS_OK; - } - - if (!ShouldShowAlert()) { diff --git a/www/firefox/patches/patch-toolkit_library_moz.build b/www/firefox/patches/patch-toolkit_library_moz.build index e11ac6f4fb8..4c20f2bf014 100644 --- a/www/firefox/patches/patch-toolkit_library_moz.build +++ b/www/firefox/patches/patch-toolkit_library_moz.build @@ -1,4 +1,4 @@ -$NetBSD: patch-toolkit_library_moz.build,v 1.2 2015/01/30 07:32:24 pho Exp $ +$NetBSD: patch-toolkit_library_moz.build,v 1.3 2015/02/28 04:30:55 ryoon Exp $ MOZ_GSTREAMER: GSTREAMER_LIBS are linked to libxul on Darwin, while they are @@ -6,9 +6,9 @@ MOZ_GSTREAMER: toolkit being cocoa isn't relevant at all. It's Darwin that needs the special handling, not Cocoa. ---- toolkit/library/moz.build.orig 2015-01-23 06:00:07.000000000 +0000 +--- toolkit/library/moz.build.orig 2015-02-17 21:40:48.000000000 +0000 +++ 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'] @@ -16,7 +16,7 @@ MOZ_GSTREAMER: 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'] @@ -44,23 +44,24 @@ MOZ_GSTREAMER: 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/firefox/patches/patch-toolkit_system_gnome_moz.build b/www/firefox/patches/patch-toolkit_system_gnome_moz.build deleted file mode 100644 index 71fde79e524..00000000000 --- a/www/firefox/patches/patch-toolkit_system_gnome_moz.build +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-toolkit_system_gnome_moz.build,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- toolkit/system/gnome/moz.build.orig 2014-11-21 03:37:52.000000000 +0000 -+++ toolkit/system/gnome/moz.build -@@ -5,7 +5,9 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - SOURCES += [ -+ 'nsAlertsIconListener.cpp', - 'nsGnomeModule.cpp', -+ 'nsSystemAlertsService.cpp', - ] - - if CONFIG['MOZ_ENABLE_GCONF']: diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.cpp b/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.cpp deleted file mode 100644 index 6ac59025841..00000000000 --- a/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.cpp +++ /dev/null @@ -1,119 +0,0 @@ -$NetBSD: patch-toolkit_system_gnome_nsAlertsIconListener.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- toolkit/system/gnome/nsAlertsIconListener.cpp.orig 2014-11-21 03:37:52.000000000 +0000 -+++ toolkit/system/gnome/nsAlertsIconListener.cpp -@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosu - NS_RELEASE(alert); - } - -+static GdkPixbuf* -+GetPixbufFromImgRequest(imgIRequest* aRequest) -+{ -+ nsCOMPtr<imgIContainer> image; -+ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -+ if (NS_FAILED(rv)) { -+ return nullptr; -+ } -+ -+ nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -+ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -+ -+ return imgToPixbuf->ConvertImageToPixbuf(image); -+} -+ - NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, - nsIObserver, nsISupportsWeakReference) - -@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest - nsresult - nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) - { -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); -+ - uint32_t imgStatus = imgIRequest::STATUS_ERROR; - nsresult rv = aRequest->GetImageStatus(&imgStatus); - NS_ENSURE_SUCCESS(rv, rv); - if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { - // We have an error getting the image. Display the notification with no icon. - ShowAlert(nullptr); -- } - -- if (mIconRequest) { -+ // Cancel any pending request - mIconRequest->Cancel(NS_BINDING_ABORTED); - mIconRequest = nullptr; - } -+ - return NS_OK; - } - - nsresult - nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) - { -- if (aRequest != mIconRequest) -- return NS_ERROR_FAILURE; -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); - - if (mLoadedFrame) - return NS_OK; // only use one frame - -- nsCOMPtr<imgIContainer> image; -- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -- if (NS_FAILED(rv)) -- return rv; -- -- nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -- -- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); -- if (!imagePixbuf) -- return NS_ERROR_FAILURE; -+ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); -+ if (!imagePixbuf) { -+ ShowAlert(nullptr); -+ } else { -+ ShowAlert(imagePixbuf); -+ g_object_unref(imagePixbuf); -+ } - -- ShowAlert(imagePixbuf); -+ mLoadedFrame = true; - -- g_object_unref(imagePixbuf); -+ // Cancel any pending request (multipart image loading/decoding for instance) -+ mIconRequest->Cancel(NS_BINDING_ABORTED); -+ mIconRequest = nullptr; - -- mLoadedFrame = true; - return NS_OK; - } - -@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbu - mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); - gboolean result = notify_notification_show(mNotification, nullptr); - -+ if (result && mAlertListener) -+ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); -+ - return result ? NS_OK : NS_ERROR_FAILURE; - } - -@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const - if (!il) - return ShowAlert(nullptr); - -- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -- nullptr, getter_AddRefs(mIconRequest)); -+ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -+ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -+ 0 /* use default */, getter_AddRefs(mIconRequest)); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ mIconRequest->StartDecoding(); -+ -+ return NS_OK; - } - - void diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.h b/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.h deleted file mode 100644 index d7094a7110e..00000000000 --- a/www/firefox/patches/patch-toolkit_system_gnome_nsAlertsIconListener.h +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-toolkit_system_gnome_nsAlertsIconListener.h,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- toolkit/system/gnome/nsAlertsIconListener.h.orig 2014-11-30 06:26:27.000000000 +0000 -+++ toolkit/system/gnome/nsAlertsIconListener.h -@@ -0,0 +1,89 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsAlertsIconListener_h__ -+#define nsAlertsIconListener_h__ -+ -+#include "nsCOMPtr.h" -+#include "imgINotificationObserver.h" -+#include "nsStringAPI.h" -+#include "nsIObserver.h" -+#include "nsWeakReference.h" -+ -+#include <gdk-pixbuf/gdk-pixbuf.h> -+ -+class imgIRequest; -+ -+struct NotifyNotification; -+ -+class nsAlertsIconListener : public imgINotificationObserver, -+ public nsIObserver, -+ public nsSupportsWeakReference -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_IMGINOTIFICATIONOBSERVER -+ NS_DECL_NSIOBSERVER -+ -+ nsAlertsIconListener(); -+ -+ nsresult InitAlertAsync(const nsAString & aImageUrl, -+ const nsAString & aAlertTitle, -+ const nsAString & aAlertText, -+ bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener); -+ -+ void SendCallback(); -+ void SendClosed(); -+ -+protected: -+ virtual ~nsAlertsIconListener(); -+ -+ nsresult OnStopRequest(imgIRequest* aRequest); -+ nsresult OnStopFrame(imgIRequest* aRequest); -+ -+ /** -+ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols -+ * is that notify_notification_new takes three arguments in libnotify.so.4 and -+ * four in libnotify.so.1. -+ * Passing the fourth argument as NULL is binary compatible. -+ */ -+ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); -+ typedef bool (*notify_is_initted_t)(void); -+ typedef bool (*notify_init_t)(const char*); -+ typedef GList* (*notify_get_server_caps_t)(void); -+ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); -+ typedef bool (*notify_notification_show_t)(void*, char*); -+ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); -+ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); -+ -+ nsCOMPtr<imgIRequest> mIconRequest; -+ nsCString mAlertTitle; -+ nsCString mAlertText; -+ -+ nsCOMPtr<nsIObserver> mAlertListener; -+ nsString mAlertCookie; -+ -+ bool mLoadedFrame; -+ bool mAlertHasAction; -+ -+ static void* libNotifyHandle; -+ static bool libNotifyNotAvail; -+ static notify_is_initted_t notify_is_initted; -+ static notify_init_t notify_init; -+ static notify_get_server_caps_t notify_get_server_caps; -+ static notify_notification_new_t notify_notification_new; -+ static notify_notification_show_t notify_notification_show; -+ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; -+ static notify_notification_add_action_t notify_notification_add_action; -+ NotifyNotification* mNotification; -+ gulong mClosureHandler; -+ -+ nsresult StartRequest(const nsAString & aImageUrl); -+ nsresult ShowAlert(GdkPixbuf* aPixbuf); -+}; -+ -+#endif diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsGnomeModule.cpp b/www/firefox/patches/patch-toolkit_system_gnome_nsGnomeModule.cpp deleted file mode 100644 index 465b33b5987..00000000000 --- a/www/firefox/patches/patch-toolkit_system_gnome_nsGnomeModule.cpp +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-toolkit_system_gnome_nsGnomeModule.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- toolkit/system/gnome/nsGnomeModule.cpp.orig 2014-11-21 03:37:52.000000000 +0000 -+++ toolkit/system/gnome/nsGnomeModule.cpp -@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGn - NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) - #endif -+#include "nsSystemAlertsService.h" -+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) - - #ifdef MOZ_ENABLE_GCONF - NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); -@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_C - NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); - #endif -+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); - - static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - #ifdef MOZ_ENABLE_GCONF -@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry k - { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, - { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, - #endif -+ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, - { nullptr } - }; - -@@ -59,6 +63,7 @@ static const mozilla::Module::ContractID - { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, - { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, - #endif -+ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, - { nullptr } - }; - diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.cpp b/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.cpp deleted file mode 100644 index 6dfa0032ec0..00000000000 --- a/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.cpp +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-toolkit_system_gnome_nsSystemAlertsService.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- toolkit/system/gnome/nsSystemAlertsService.cpp.orig 2014-11-30 06:26:27.000000000 +0000 -+++ toolkit/system/gnome/nsSystemAlertsService.cpp -@@ -0,0 +1,54 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "nsXULAppAPI.h" -+#include "nsSystemAlertsService.h" -+#include "nsAlertsIconListener.h" -+#include "nsAutoPtr.h" -+ -+NS_IMPL_ADDREF(nsSystemAlertsService) -+NS_IMPL_RELEASE(nsSystemAlertsService) -+ -+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) -+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) -+ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) -+NS_INTERFACE_MAP_END_THREADSAFE -+ -+nsSystemAlertsService::nsSystemAlertsService() -+{ -+} -+ -+nsSystemAlertsService::~nsSystemAlertsService() -+{} -+ -+nsresult -+nsSystemAlertsService::Init() -+{ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, -+ const nsAString & aAlertText, bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener, -+ const nsAString & aAlertName, -+ const nsAString & aBidi, -+ const nsAString & aLang, -+ const nsAString & aData, -+ nsIPrincipal * aPrincipal) -+{ -+ nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener(); -+ if (!alertListener) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener); -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, -+ nsIPrincipal* aPrincipal) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} diff --git a/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.h b/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.h deleted file mode 100644 index 13ee637cb1b..00000000000 --- a/www/firefox/patches/patch-toolkit_system_gnome_nsSystemAlertsService.h +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-toolkit_system_gnome_nsSystemAlertsService.h,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- toolkit/system/gnome/nsSystemAlertsService.h.orig 2014-11-30 06:26:27.000000000 +0000 -+++ toolkit/system/gnome/nsSystemAlertsService.h -@@ -0,0 +1,27 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsSystemAlertsService_h__ -+#define nsSystemAlertsService_h__ -+ -+#include "nsIAlertsService.h" -+#include "nsCOMPtr.h" -+ -+class nsSystemAlertsService : public nsIAlertsService -+{ -+public: -+ NS_DECL_NSIALERTSSERVICE -+ NS_DECL_ISUPPORTS -+ -+ nsSystemAlertsService(); -+ -+ nsresult Init(); -+ -+protected: -+ virtual ~nsSystemAlertsService(); -+ -+}; -+ -+#endif /* nsSystemAlertsService_h__ */ diff --git a/www/firefox/patches/patch-widget_gtk_mozgtk_mozgtk.c b/www/firefox/patches/patch-widget_gtk_mozgtk_mozgtk.c deleted file mode 100644 index 32c45e64a4c..00000000000 --- a/www/firefox/patches/patch-widget_gtk_mozgtk_mozgtk.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-widget_gtk_mozgtk_mozgtk.c,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- widget/gtk/mozgtk/mozgtk.c.orig 2014-11-21 03:37:52.000000000 +0000 -+++ widget/gtk/mozgtk/mozgtk.c -@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay) - STUB(gdk_x11_screen_get_xscreen) - STUB(gdk_x11_visual_get_xvisual) - STUB(gdk_x11_window_lookup_for_display) -+STUB(gdk_x11_window_set_user_time) - STUB(gdk_x11_xatom_to_atom) - STUB(gtk_accel_label_new) - STUB(gtk_alignment_get_type) diff --git a/www/firefox/patches/patch-widget_gtk_nsWindow.cpp b/www/firefox/patches/patch-widget_gtk_nsWindow.cpp deleted file mode 100644 index 0c653db0f0f..00000000000 --- a/www/firefox/patches/patch-widget_gtk_nsWindow.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-widget_gtk_nsWindow.cpp,v 1.1 2014/12/01 18:11:14 ryoon Exp $ - ---- widget/gtk/nsWindow.cpp.orig 2014-11-21 03:37:52.000000000 +0000 -+++ widget/gtk/nsWindow.cpp -@@ -1294,13 +1294,7 @@ SetUserTimeAndStartupIDForActivatedWindo - } - - if (sn_launchee_context_get_id_has_timestamp(ctx)) { -- PRLibrary* gtkLibrary; -- SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc) -- PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", >kLibrary); -- if (setUserTimeFunc) { -- setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx)); -- PR_UnloadLibrary(gtkLibrary); -- } -+ gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx)); - } - - sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow)); diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build index 85a73fbdbed..4216743d535 100644 --- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build +++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_moz.build @@ -1,6 +1,6 @@ -$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2014/10/15 13:43:32 ryoon Exp $ +$NetBSD: patch-xpcom_reflect_xptcall_md_unix_moz.build,v 1.2 2015/02/28 04:30:55 ryoon Exp $ ---- xpcom/reflect/xptcall/md/unix/moz.build.orig 2014-10-11 09:06:50.000000000 +0000 +--- xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-02-17 21:40:51.000000000 +0000 +++ 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-xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2014/10/15 13:43:32 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-xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2014/10/15 13:43:32 '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': |