kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 22.0

Browse source 
* On NetBSD WebRTC support is disabled, because libxul.so has some errors
  in link stage. WebRTC support should be tested on non-NetBSD platforms.
* It seems that OSS sound support is not working properly on NetBSD.

Changelog:
    NEW
    WebRTC is now enabled by default!
    NEW
    Windows: Firefox now follows display scaling options to render text larger on high-res displays
    NEW
    Mac OS X: Download progress in Dock application icon
    NEW
    HTML5 audio/video playback rate can now be changed
    NEW
    Social services management implemented in Add-ons Manager
    NEW
    asm.js optimizations (OdinMonkey) enabled for major performance improvements
    CHANGED
    Improved WebGL rendering performance through asynchronous canvas updates
    CHANGED
    Plain text files displayed within Firefox will now word-wrap
    CHANGED
    For user security, the |Components| object is no longer accessible from web content
    CHANGED
    Pointer Lock API can now be used outside of fullscreen
    DEVELOPER
    CSS3 Flexbox implemented and enabled by default
    DEVELOPER
    New Web Notifications API implemented
    DEVELOPER
    Added clipboardData API for JavaScript access to a user's clipboard
    DEVELOPER
    New built-in font inspector
    HTML5
    New HTML5 <data> and <time> elements
    FIXED
    Various security fixes
    FIXED
    Scrolling using some high-resolution-scroll aware touchpads feels slow (829952)

Fixed in Firefox 22
MFSA 2013-62 Inaccessible updater can lead to local privilege escalation
MFSA 2013-61 Homograph domain spoofing in .com, .net and .name
MFSA 2013-60 getUserMedia permission dialog incorrectly displays location
MFSA 2013-59 XrayWrappers can be bypassed to run user defined methods in a privileged context
MFSA 2013-58 X-Frame-Options ignored when using server push with multi-part responses
MFSA 2013-57 Sandbox restrictions not applied to nested frame elements
MFSA 2013-56 PreserveWrapper has inconsistent behavior
MFSA 2013-55 SVG filters can lead to information disclosure
MFSA 2013-54 Data in the body of XHR HEAD requests leads to CSRF attacks
MFSA 2013-53 Execution of unmapped memory through onreadystatechange event
MFSA 2013-52 Arbitrary code execution within Profiler
MFSA 2013-51 Privileged content access and execution via XBL
MFSA 2013-50 Memory corruption found using Address Sanitizer
MFSA 2013-49 Miscellaneous memory safety hazards (rv:22.0 / rv:17.0.7)
This commit is contained in:
ryoon 2013-06-26 11:32:12 +00:00
parent f49c572b30
commit 04889d6418
47 changed files with 811 additions and 666 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
www/firefox/Makefile
View file

@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.131 2013/06/21 23:11:42 ryoon Exp $
# $NetBSD: Makefile,v 1.132 2013/06/26 11:32:12 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 21.0
MOZ_BRANCH= 22.0
MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
PKGREVISION= 7
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} \
${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
@ -38,6 +37,11 @@ LDFLAGS.Linux= -lnspr4
.include "../../www/firefox/mozilla-common.mk"
.include "options.mk"
CHECK_INTERPRETER_SKIP+=lib/firefox/sdk/bin/header.py
CHECK_INTERPRETER_SKIP+=lib/firefox/sdk/bin/typelib.py
CHECK_INTERPRETER_SKIP+=lib/firefox/sdk/bin/xpidl.py
CHECK_INTERPRETER_SKIP+=lib/firefox/sdk/bin/xpt.py
MOZILLA=firefox
MOZILLA_ICON= ${WRKSRC}/dist/firefox/browser/chrome/icons/default/default48.png
.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)

433
www/firefox/PLIST
View file

File diff suppressed because it is too large Load diff

71
www/firefox/distinfo
View file

@ -1,16 +1,14 @@
$NetBSD: distinfo,v 1.102 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: distinfo,v 1.103 2013/06/26 11:32:12 ryoon Exp $
SHA1 (firefox-21.0.source.tar.bz2) = e63b5488eaec1956947f59609d5839332ba7ffe1
RMD160 (firefox-21.0.source.tar.bz2) = 3a62e242a7829f98978436464ab3306c96e58cdd
Size (firefox-21.0.source.tar.bz2) = 105558931 bytes
SHA1 (patch-aa) = a96dd1a2dad5cbd56da83265ad1a0cd8f7dc0316
SHA1 (firefox-22.0.source.tar.bz2) = db2d5b028b6ea95b5f006b46e153f50f7a52bf80
RMD160 (firefox-22.0.source.tar.bz2) = 9f206a786fcc366cb0ea03c4a5140809d1402272
Size (firefox-22.0.source.tar.bz2) = 111109062 bytes
SHA1 (patch-aa) = 3bc63d981823f92d39821a2ddf691c696d0d35b1
SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2
SHA1 (patch-am) = c5aa36638b666d99d4510f345802de259579e884
SHA1 (patch-an) = 4c8ca17d259f56863d6066f1e3de0d81fefdcd6c
SHA1 (patch-ao) = ebf95a9abf76439cdd890ea34f75f0d8d1114fe0
SHA1 (patch-as) = 076082d8b2c6f7ef91c152497a4cd7d60545e70b
SHA1 (patch-au) = 09ebe8f5cb73f7746e1f640ff78a5ea966369d02
SHA1 (patch-az) = 2012a7fef2eac59f48ff21fea0e205e89b313e46
SHA1 (patch-ba) = 1692053c1b0e65dd38bcf37cc1a80390cce081eb
SHA1 (patch-bd) = 1a24cb9e4dc312725d0a6ffdf202b6f3e98d17fb
@ -19,11 +17,7 @@ SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d
SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f
SHA1 (patch-config_baseconfig.mk) = 4f8e966e5e9684c165929d02f82099fb4befcc75
SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
SHA1 (patch-config_system-headers) = 5957acc2b4d14a1a9e71791bca3eb76c448a02b2
SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
SHA1 (patch-content_media_AudioStream.cpp) = 28533c67c744ed8c721c81b90250acad8251fd14
SHA1 (patch-extensions_auth_nsAuthGSSAPI.cpp) = 548886fc4a86a988f3f91650061ddc04f37653a8
SHA1 (patch-gfx__2d__Blur.cpp) = 7dc3825acc303f5a67a46249da7656ec653e2721
SHA1 (patch-gfx__skia__include__core__SkPreConfig.h) = 447b3a311bfb25a0519b60b105ac360d3fe74370
@ -37,32 +31,35 @@ SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 12f3e063cf3fef23
SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = a6175d1e97966944f14cb96ed3527e879412534b
SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = faed34d94646453cd01acbdec1da2d9ec0f3d05f
SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905
SHA1 (patch-js__public__HeapAPI.h) = bb0d0080cf4d24ddd6e445cd2bfe2279e583de1e
SHA1 (patch-js__src__gc__Marking.cpp) = 21a03607db1f92def4f0cfff2b32fda3ab650515
SHA1 (patch-js__public__HeapAPI.h) = 2bbe618881a006db47b3a1731519ce65965560f1
SHA1 (patch-js__src__gc__Marking.cpp) = f2ee6320b2c7c9a4374c0cbb844ae6368ad03a13
SHA1 (patch-js__src__gc__Memory.cpp) = 905b99349d6c40b402b52cac53b4d9afa732b13a
SHA1 (patch-js__src__gc__Memory.h) = 0baa0a5ba45d2150cf53a3325b03f3d1d3ec6f4c
SHA1 (patch-js__src__jsapi.cpp) = bfd7b0b79d78466841dfed7fb8b776ac76bdc874
SHA1 (patch-js__src__jscntxt.h) = 70bba103b256285e9a8979eea3790cb468585aea
SHA1 (patch-js__src__jsgc.cpp) = 37e3c38e6e4fb2a5df2b8c8f69d47ab784675fd6
SHA1 (patch-js__src__gc__Memory.h) = 4496889c2aa7417fa4e02236dfe0ef39069d436a
SHA1 (patch-js__src__jsapi.cpp) = b70149c82d6c9708cc4952a527a0a2cbced24dae
SHA1 (patch-js__src__jscntxt.h) = eaf0b2da673bdd05f4f7cbb0f8c04e80702d5fd0
SHA1 (patch-js__src__jsgc.cpp) = 7d8070f75e4336dee2af8d34f343d5668ec6b212
SHA1 (patch-js__src__jsscript.cpp) = a64e8b1211dac3021d6816879c648d7cfc65e6c0
SHA1 (patch-js__src__vm__SPSProfiler.cpp) = bccdd60262f9f652351053b6dd2045821a993b32
SHA1 (patch-js__src__yarr__YarrInterpreter.cpp) = a9bd5bd9f55f97cb9623e35e09b7bfaf8e4499b3
SHA1 (patch-js_src_Makefile.in) = 98734e93974965419da3d3706f94e1be515799e1
SHA1 (patch-js_src_config_system-headers) = ea170db4562cd69913e91d186b238ecbea9a3f83
SHA1 (patch-js_src_jscompartment.h) = a29ec049ce085ec2a70fffd34647fc78062b7a2e
SHA1 (patch-js_src_jspropertycacheinlines.h) = a34a82193212e945dcba6f0310973117a6c22941
SHA1 (patch-js_src_ion_AsmJS.cpp) = 07fb48b921ec4b68593fe3685e369bc3ad439331
SHA1 (patch-js_src_ion_AsmJS.h) = a1888a2e116179c5f6b1767805e5a7146ecb5af5
SHA1 (patch-js_src_ion_AsmJSSignalHandlers.cpp) = be7963f06b716aeaa93636cc5fd12233b716e9df
SHA1 (patch-js_src_jscompartment.h) = 33708bc67f1c05f776dbb9c048ddf91f0eea25ca
SHA1 (patch-js_src_jstypedarray.cpp) = 520d085871dfd640bbd693f59424612d3f0f539e
SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = 77685fc735bde4e592a3ddc29fa05b13a694fa8a
SHA1 (patch-js_src_vm_ObjectImpl-inl.h) = 7b9f7c87980e13a7b801de473737489c5f57921d
SHA1 (patch-js_src_vm_ObjectImpl-inl.h) = e6dda53d189c1e2e24735ea17d6b779d933342d7
SHA1 (patch-mb) = 4e268868b6a526a0911d677875bda7ef975afc1c
SHA1 (patch-md) = 7fd607a3edd2ea5f7a5671fc6d06fba69c46c36f
SHA1 (patch-me) = 2ff755782bd35caded8934000d039976dad44103
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = e4472576ec9e8c46fb0a2d5622986503cf2767aa
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = 061b46d1ee33c055a5b39e6b20f47b80bcde0c86
SHA1 (patch-media_mtransport_objs.mk) = 1877b73706451bc9ff5254ab32d5e2edb9f36883
SHA1 (patch-media_mtransport_test_Makefile.in) = 9d2364f2bfd0f5fbafb6d0204f98ae0df4e5664c
SHA1 (patch-media_mtransport_third__party_nICEr_nicer.gyp) = 3ed56a7c9ea61f5910a7d608a1bd404b9ce58344
SHA1 (patch-media_mtransport_third__party_nICEr_src_stun_addrs.c) = 9a501cdf1fe50a35849f280718462c003f0fded4
SHA1 (patch-media_mtransport_third__party_nICEr_src_stun_addrs.c) = f63122ed6ad7e5aea52b18c8379148e0c5f23cdd
SHA1 (patch-media_mtransport_third__party_nICEr_src_stun_stun.h) = 90eb67c93dabf4d84bf3df521f1d53aa874d3050
SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = e166ce56f20b026f81e3de208db292e8332d6de0
SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 52f57c4a5ba2708072a83fdfbe1ba27390dd5353
SHA1 (patch-media_mtransport_third__party_nrappkit_nrappkit.gyp) = 68b7c5a15ff6027baccf18130673670d51d6a724
SHA1 (patch-media_mtransport_third__party_nrappkit_src_log_r__log.c) = cf0e6c0d9278578f27ec19c4a3af211bec273ba8
SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = edbd94c944cfd0f6581acd4e5ed18bed7e3e142d
@ -70,11 +67,9 @@ SHA1 (patch-media_mtransport_third__party_nrappkit_src_util_util.c) = 8406228a49
SHA1 (patch-media_webrtc_signaling_signaling.gyp) = 3541d06aeb691032d9e63f9d5a17af555f2ee8dc
SHA1 (patch-media_webrtc_signaling_src_sipcc_cpr_darwin_cpr__darwin__ipc.c) = c6e604c731e1adecfff5706299b7999e479273e2
SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = cdc7d5b87a465ba57d2f0523bb26a5cbfdaa03df
SHA1 (patch-media_webrtc_trunk_build_common.gypi) = 10fbead1d12fa95bccbefc0d0c6b3fe4c4a288e8
SHA1 (patch-media_webrtc_trunk_testing_gtest_include_gtest_internal_gtest-port.h) = 09b8003606ee5a1cdcbba7caaf1de1895e24b3ac
SHA1 (patch-media_webrtc_trunk_third__party_libyuv_libyuv.gyp) = 74aafdb3a83f44576f1d821083d963ff8c78df9c
SHA1 (patch-media_webrtc_trunk_third__party_libyuv_libyuv.gyp) = 82ff018ec35fb25135c03913ffe071effcf3a57d
SHA1 (patch-media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake.py) = f465afb37d74988764e4dd362911063b3697cfbd
SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 7c696b7e27542634ead8bfe16667a39d23c85dc8
SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = d37c47058dedc587b0f1b5b711b5e1e39875d4ed
SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi) = 590f92eec70f5e3ab663489050e5449f08515121
SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__device_audio__device__utility.cc) = 9767c35fa45b54fb28d67479efa86cdc769aa447
SHA1 (patch-media_webrtc_trunk_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc) = e407e7714b9eb7cc79a8976ec62fc2092d8aeac1
@ -85,6 +80,7 @@ SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_device__info__impl.
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 6dfa87bc5a36fb9eb2555b1081455526948966f4
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ec735e09515434f504fd1c16584b99fa61aff2ad
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 7377ddf7a57d84c270a5387e0d2eaa51b6ee804b
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture__factory.cc) = e83b21a561649f7ae262a1c5b04c5d0a560a67c9
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_interface_asm__defines.h) = 8a061afbaae0948f46152a45b14160b3885c08b0
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_interface_tick__util.h) = c96ef7e729868da5d897a71de214958d2f5b7c67
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_atomic32__posix.cc) = 8178fdc13f5961a7d70fa75eb33968f55a76e24e
@ -93,19 +89,21 @@ SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_condition__variabl
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_cpu.cc) = 1875fc230d3c02e05f9d848b9af9f60afe9474f4
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_cpu__info.cc) = b92bb51b6640eaa16a18ed2b6bf186fed6cb7125
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 853b178ca1b95c6907ca2fc2de9865807661a8f5
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc) = 8bd3a5791027aa788fac9da4170339e2a42750e5
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc) = 5ccd5d54da07c64c59f04b9337cc4234e576f9e0
SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_trace__posix.cc) = 7cb19fb82210887a6c6c17a5e60cb069f06466cc
SHA1 (patch-media_webrtc_trunk_webrtc_typedefs.h) = 9a62eb31eb5acb8ff240244273de42d8c66c45a7
SHA1 (patch-media_webrtc_trunk_webrtc_video__engine_vie__defines.h) = 33323114b03a4231c810e56964e354cb06e90f09
SHA1 (patch-media_webrtc_trunk_webrtc_voice__engine_voe__network__impl.cc) = 42af9d8fb83ff2c3ea1f7353a15555c07ceca2b8
SHA1 (patch-media_webrtc_trunk_webrtc_voice__engine_voice__engine__defines.h) = 8606dfda5b8a3090789e5599b12d0668632fd945
SHA1 (patch-media_webrtc_webrtc__config.gypi) = be2e3128d84b2acdbf7754c71752453f42482c6b
SHA1 (patch-mp) = bc64a6d75df5cf9482d96895f0270b729ff57997
SHA1 (patch-netwerk__protocol__websocket__WebSocketChannel.cpp) = 0d5929e80f58ac0474b11fcf1f1b1b22f47bd6c7
SHA1 (patch-media_webrtc_webrtc__config.gypi) = adf9afcf64e2504a8216cdff2ebe0720b9d70826
SHA1 (patch-netwerk__protocol__websocket__WebSocketChannel.cpp) = 3b9a2212abd66b26c8af96d346d7c961ca665c93
SHA1 (patch-netwerk_sctp_src_Makefile.in) = e86199357b57c64dac95e5eff5c0d29509dce628
SHA1 (patch-netwerk_sctp_src_netinet_sctp__os__userspace.h) = d1af7cc0eaf201041e3de4128c516a6f71d7b773
SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 31d49db31b1e130f1b455f883e5b7c606d438771
SHA1 (patch-netwerk_sctp_src_netinet_sctp__os__userspace.h) = b3f94ac0f2bd652371fef22c642b14bf30162998
SHA1 (patch-netwerk_sctp_src_netinet_sctp__usrreq.c) = 421b6e071a9934567ccba337033a42208e6e4bd5
SHA1 (patch-netwerk_sctp_src_user__recv__thread.c) = cf26945441f74c581aeb5a8d7435780f4a48a607
SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 3b001cea73ed1162d11391efcba38d1bba2ff4f7
SHA1 (patch-netwerk_sctp_src_user__socket.c) = c0b32ed2888b5845ce2b7646b85af8f0728bc7c3
SHA1 (patch-netwerk_sctp_src_user__socketvar.h) = 1b6e2864916ced693b1ab6c1bbdd80a4ffc4f7e4
SHA1 (patch-pa) = 8045cf02d83e87684b497dd30e890107f76a3bdf
SHA1 (patch-pb) = 7665d8156fa734cdc2e1746558cc08b7eefce98e
SHA1 (patch-pc) = 099a4f6ac32fd2f45c91eb525750bde96684693a
@ -114,11 +112,10 @@ SHA1 (patch-pg) = d6d6071cbe8a771873e1537034c0bb9186f8e245
SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 15e9466d60e60f93a27fe23aadfea6e1d59ad0bc
SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
SHA1 (patch-toolkit_toolkit-tiers.mk) = 59e5174edd04f3c4e5d6ebb450a42e4e1dee0801
SHA1 (patch-toolkit_toolkit.mozbuild) = 07e87d977cee59c0f5a5d14a8d41dc2a4230c01e
SHA1 (patch-xa) = 9182485283599a96663358bdc680c5cdb1d94a78
SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
SHA1 (patch-xd) = 5fcb512091db8193ade345ece8eb2909f0a278e7
SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf
SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488
@ -128,10 +125,8 @@ SHA1 (patch-xl) = e7dbe631e8d1fcee48054c0cb8ff01169cfcb744
SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657
SHA1 (patch-xn) = c042e39d93706934ec03c78be3dc6e224ac62c0e
SHA1 (patch-xo) = aae6107dcfaf731bd3e9962d953fb8701fc5f163
SHA1 (patch-xpcom_Makefile.in) = e5f77ed56ed4ad26a08a67085e3dfec0e7af3fa6
SHA1 (patch-xpcom__reflect__xptcall__src__md__unix__xptcstubs_sparc64_openbsd.cpp) = 85f66fa6dadc9e0a819ed67065ea6b1944fde70b
SHA1 (patch-xpcom__reflect__xptcall__src__md__unix__xptcstubs_sparc64_openbsd.cpp) = 5292416db0fa94d8a03ea8a3d09a9c3c8b5a11ae
SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30
SHA1 (patch-xpcom_io_nsMultiplexInputStream_cpp) = 899e4797dcef5c295cc7afd7cc31f593a7d46a19
SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cd42915cd32756b55894a773a1e6d7c012b4467
SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp) = e9e336817c172187f3e15ddf539a8a2176e3e952
SHA1 (patch-xpcom_string_public_nsAlgorithm.h) = 6cdce480510f0cebbb1271de385b6ec7f5c3ddee

9
www/firefox/mozilla-common.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: mozilla-common.mk,v 1.6 2013/06/21 23:11:42 ryoon Exp $
# $NetBSD: mozilla-common.mk,v 1.7 2013/06/26 11:32:12 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@ -23,7 +23,6 @@ GCC_REQD+= 4.5
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
CHECK_INTERPRETER_SKIP+=lib/xulrunner-sdk/sdk/bin/xpt.py
CONFIGURE_ARGS+= --disable-tests --disable-pedantic
CONFIGURE_ARGS+= --enable-crypto
@ -68,6 +67,8 @@ PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/application.mk"
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
#BUILD_MAKE_FLAGS+= MOZ_WEBRTC_IN_LIBXUL=1
SUBST_CLASSES+= python
SUBST_STAGE.python= pre-configure
SUBST_MESSAGE.python= Fixing path to python.
@ -141,8 +142,4 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.if (${OPSYS} == "Linux") || (${OPSYS} == "Darwin") || \
(${OPSYS} == "FreeBSD") || (${OPSYS} == "OpenBSD")
.include "../../graphics/libv4l/buildlink3.mk"
.endif

17
www/firefox/options.mk
View file

@ -1,14 +1,19 @@
# $NetBSD: options.mk,v 1.13 2013/05/23 13:12:13 ryoon Exp $
# $NetBSD: options.mk,v 1.14 2013/06/26 11:32:12 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
PKG_SUPPORTED_OPTIONS+= debug mozilla-jemalloc gnome pulseaudio
PKG_SUPPORTED_OPTIONS+= debug mozilla-jemalloc gnome pulseaudio webrtc
PLIST_VARS+= gnome jemalloc debug
.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
.endif
# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "Linux") || (${OPSYS} == "OpenBSD")
PKG_SUGGESTED_OPTIONS+= webrtc
.endif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgnome)
@ -56,3 +61,11 @@ NO_BIN_ON_FTP= ${RESTRICTED}
.else
PLIST.nobranding= yes
.endif
PLIST_VARS+= webrtc
.if !empty(PKG_OPTIONS:Mwebrtc)
.include "../../graphics/libv4l/buildlink3.mk"
CONFIGURE_ARGS+= --enable-webrtc
.else
CONFIGURE_ARGS+= --disable-webrtc
.endif

59
www/firefox/patches/patch-aa
View file

@ -1,10 +1,10 @@
$NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
$NetBSD: patch-aa,v 1.12 2013/06/26 11:32:12 ryoon Exp $
--- configure.in.orig 2013-05-11 19:19:23.000000000 +0000
--- configure.in.orig 2013-06-17 22:12:58.000000000 +0000
+++ configure.in
@@ -1404,6 +1404,17 @@ if test "$GNU_CC"; then
@@ -1388,6 +1388,17 @@ if test "$GNU_CC"; then
CFLAGS=$_SAVE_CFLAGS
AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3)
AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1)
+ # Check for -msse4.1 on $CC
+ AC_MSG_CHECKING([if toolchain supports -msse4.1 option])
@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
;;
*-mingw*)
DSO_CFLAGS=
@@ -2848,6 +2862,7 @@ EOF
@@ -2862,6 +2876,7 @@ EOF
#pragma GCC visibility push(hidden)
#pragma GCC visibility push(default)
#include <string.h>
@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
#pragma GCC visibility pop
__attribute__ ((visibility ("default"))) void Func() {
@@ -2856,7 +2871,7 @@ __attribute__ ((visibility ("default")))
@@ -2870,7 +2885,7 @@ __attribute__ ((visibility ("default")))
}
EOF
ac_cv_have_visibility_builtin_bug=no
@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
ac_cv_have_visibility_builtin_bug=yes
else
if test `grep -c "@PLT" conftest.S` = 0; then
@@ -3018,6 +3033,9 @@ dnl ====================================
@@ -3032,6 +3047,9 @@ dnl ====================================
case $target in
*-hpux11.*)
;;
@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
*)
AC_CHECK_LIB(c_r, gethostbyname_r)
;;
@@ -3319,6 +3337,9 @@ AC_CACHE_CHECK(
@@ -3333,6 +3351,9 @@ AC_CACHE_CHECK(
#ifdef linux
#define _BSD_SOURCE 1
#endif
@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
#include <resolv.h>
],
[int foo = res_ninit(&_res);],
@@ -3989,6 +4010,14 @@ if test -n "$YASM"; then
@@ -3995,6 +4016,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
@@ -4016,11 +4045,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
@@ -4022,11 +4051,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@ -95,41 +95,26 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
MOZ_NATIVE_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
@@ -5212,7 +5237,11 @@ if test -n "$MOZ_WEBRTC"; then
dnl Make sure doesn't get matched by *-linux*
MOZ_WEBRTC=
@@ -5260,7 +5285,7 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_WEBRTC=
fi
;;
- *-linux*|*-mingw*|*-darwin*)
+ *-netbsd*|*-dragonfly*)
+ dnl Custom socketvar.h is not compatible with NetBSD.
+ MOZ_WEBRTC=
+ ;;
+ *-linux*|*-mingw*|*-darwin*|*-freebsd*|*-openbsd*)
+ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled
;;
*)
@@ -5263,6 +5292,9 @@ if test -n "$MOZ_WEBRTC"; then
@@ -5314,6 +5339,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
dnl OpenSLES is only available in Android 2.3 and later; we'll change this
dnl hard dependency to a dynamic load with graceful runtime failure before
dnl we make --enable-webrtc on by default in Android (bug 815905)
@@ -5299,8 +5331,8 @@ AC_SUBST(MOZ_WEBRTC_IN_LIBXUL)
AC_SUBST(MOZ_SCTP)
AC_SUBST(MOZ_SRTP)
-case "$target_cpu" in
-arm*)
+case "$target" in
+arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
MOZ_SAMPLE_TYPE_S16=1
AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
AC_SUBST(MOZ_SAMPLE_TYPE_S16)
@@ -5704,7 +5736,7 @@ MOZ_ALSA=)
if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
dnl OpenSLES is only available in Android 2.3 and later; we'll change this
dnl hard dependency to a dynamic load with graceful runtime failure before
@@ -5727,7 +5755,7 @@ MOZ_ALSA=)
if test -n "$MOZ_ALSA"; then
AC_DEFINE(MOZ_CUBEB)
@ -138,7 +123,7 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
[echo "$MOZ_ALSA_PKG_ERRORS"
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
fi
@@ -8311,16 +8343,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
@@ -8413,16 +8441,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
NECKO_WIFI=,
NECKO_WIFI=1)
@ -175,8 +160,8 @@ $NetBSD: patch-aa,v 1.11 2013/06/02 06:48:37 ryoon Exp $
fi
if test "$NECKO_WIFI"; then
@@ -8981,6 +9023,27 @@ elif test "${OS_TARGET}" = "Android"; th
fi
@@ -9102,6 +9140,27 @@ if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE
EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1"
fi
+# Keep libcubeb and audio_device backends in sync

48
www/firefox/patches/patch-an
View file

@ -1,48 +0,0 @@
$NetBSD: patch-an,v 1.9 2013/05/23 13:12:13 ryoon Exp $
SHA1_Update conflicts with openssl which may be dynamically loaded
at runtime via libcups or libgssapi so causing a crash due to using
the wrong binding. So rename here to avoid conflict.
--- security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2013-01-04 23:44:43.000000000 +0000
+++ security/nss/lib/freebl/sha-fast-amd64-sun.s
@@ -1680,9 +1680,9 @@ shaCompress:
.LFE7:
.size shaCompress, .-shaCompress
.align 16
-.globl SHA1_Update
- .type SHA1_Update, @function
-SHA1_Update:
+.globl NSS_SHA1_Update
+ .type NSS_SHA1_Update, @function
+NSS_SHA1_Update:
.LFB5:
pushq %rbp
.LCFI5:
@@ -1768,7 +1768,7 @@ SHA1_Update:
call shaCompress
jmp .L245
.LFE5:
- .size SHA1_Update, .-SHA1_Update
+ .size NSS_SHA1_Update, .-NSS_SHA1_Update
.section .rodata
.align 32
.type bulk_pad.0, @object
@@ -1870,7 +1870,7 @@ SHA1_End:
subl %r8d, %edx
andl $63, %edx
incl %edx
- call SHA1_Update@PLT
+ call NSS_SHA1_Update@PLT
movq %rbx, %rdi
movq %r12, %rsi
shrq $32, %rdi
@@ -1986,7 +1986,7 @@ SHA1_HashBuf:
movl %r12d, %edx
movq %r13, %rsi
movq %rbx, %rdi
- call SHA1_Update@PLT
+ call NSS_SHA1_Update@PLT
leaq -292(%rbp), %rdx
movq %r14, %rsi
movq %rbx, %rdi

41
www/firefox/patches/patch-au
View file

@ -1,41 +0,0 @@
$NetBSD: patch-au,v 1.3 2013/05/23 13:12:13 ryoon Exp $
- Fix device name on NetBSD
- SOUND_VERSION just isn't a reliable way to detect features supported by
particular OSS implementation.
--- media/libsydneyaudio/src/sydney_audio_oss.c.orig 2013-05-11 19:19:43.000000000 +0000
+++ media/libsydneyaudio/src/sydney_audio_oss.c
@@ -23,7 +23,7 @@
// support only versions newer than 3.6.1
#define SUPP_OSS_VERSION OSS_VERSION(3,0,1)
-#if (SOUND_VERSION < SUPP_OSS_VERSION)
+#if 0 // (SOUND_VERSION < SUPP_OSS_VERSION)
#error Unsupported OSS Version
#else
@@ -173,7 +173,12 @@ sa_stream_create_pcm(
return SA_ERROR_SYSTEM;
}
+#if defined(__NetBSD__)
+ /* XXX should use DEVOSSAUDIO provided by pkgsrc. */
+ s->output_unit = "/dev/audio";
+#else
s->output_unit = "/dev/dsp";
+#endif
s->output_fd = -1;
s->thread_id = 0;
s->playing = 0;
@@ -446,6 +451,10 @@ static void audio_callback(void* data)
printf("!"); /* not enough audio data */
#endif
bytes = bytes-bytes_to_copy;
+ struct timespec ts = {0, 1000000};
+ pthread_mutex_unlock(&s->mutex);
+ nanosleep(&ts, NULL);
+ pthread_mutex_lock(&s->mutex);
break;
}
free(s->bl_head);

8
www/firefox/patches/patch-config_stl__wrappers_ios
View file

@ -1,8 +0,0 @@
$NetBSD: patch-config_stl__wrappers_ios,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- config/stl_wrappers/ios.orig 2013-05-13 18:23:07.000000000 +0000
+++ config/stl_wrappers/ios
@@ -0,0 +1,3 @@
+#pragma GCC visibility push(default)
+#include_next <ios>
+#pragma GCC visibility pop

8
www/firefox/patches/patch-config_stl__wrappers_ostream
View file

@ -1,8 +0,0 @@
$NetBSD: patch-config_stl__wrappers_ostream,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- config/stl_wrappers/ostream.orig 2013-05-13 18:22:40.000000000 +0000
+++ config/stl_wrappers/ostream
@@ -0,0 +1,3 @@
+#pragma GCC visibility push(default)
+#include_next <ostream>
+#pragma GCC visibility pop

9
www/firefox/patches/patch-config_system__wrappers_unwind.h
View file

@ -1,9 +0,0 @@
$NetBSD: patch-config_system__wrappers_unwind.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- config/system_wrappers/unwind.h.orig 2013-05-13 19:56:18.000000000 +0000
+++ config/system_wrappers/unwind.h
@@ -0,0 +1,4 @@
+#pragma GCC system_header
+#pragma GCC visibility push(default)
+#include_next <unwind.h>
+#pragma GCC visibility pop

13
www/firefox/patches/patch-content_media_AudioStream.cpp
View file

@ -1,13 +0,0 @@
$NetBSD: patch-content_media_AudioStream.cpp,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- content/media/AudioStream.cpp.orig 2013-05-11 19:19:24.000000000 +0000
+++ content/media/AudioStream.cpp
@@ -314,7 +314,7 @@ nsresult NativeAudioStream::Init(int32_t
mChannels = aNumChannels;
if (sa_stream_create_pcm(reinterpret_cast<sa_stream_t**>(&mAudioHandle),
- NULL,
+ "Mozilla",
SA_MODE_WRONLY,
SA_PCM_FORMAT_S16_NE,
aRate,

5
www/firefox/patches/patch-js__public__HeapAPI.h
View file

@ -1,6 +1,7 @@
$NetBSD: patch-js__public__HeapAPI.h,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-js__public__HeapAPI.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $
From bugzilla, bug 840242, attachment v1
From bugzilla, bug 840242,
https://hg.mozilla.org/integration/mozilla-inbound/rev/49e4ff129351
Use the runtime page size to control arena decommit.
As a side effect, this removes the hard coded page-size == 4k requirement.

17
www/firefox/patches/patch-js__src__gc__Marking.cpp
View file

@ -1,4 +1,4 @@
$NetBSD: patch-js__src__gc__Marking.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-js__src__gc__Marking.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
# HG changeset patch
# User Martin Husemann <martin@netbsd.org>
@ -8,14 +8,9 @@ $NetBSD: patch-js__src__gc__Marking.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
Bug 871101: Make "kind" a full uintptr_t value so it overwrites its pointer union counterpart for sure r=billm
diff js/src/gc/Marking.cpp js/src/gc/Marking.cpp
--- js/src/gc/Marking.cpp
--- js/src/gc/Marking.cpp.orig 2013-06-17 22:13:09.000000000 +0000
+++ js/src/gc/Marking.cpp
@@ -1199,17 +1199,17 @@ gc::PushArena(GCMarker *gcmarker, ArenaH
break;
}
}
struct SlotArrayLayout
@@ -1143,7 +1143,7 @@ struct SlotArrayLayout
{
union {
HeapSlot *end;
@ -24,9 +19,3 @@ diff js/src/gc/Marking.cpp js/src/gc/Marking.cpp
};
union {
HeapSlot *start;
uintptr_t index;
};
JSObject *obj;
static void staticAsserts() {

13
www/firefox/patches/patch-js__src__gc__Memory.h
View file

@ -1,4 +1,4 @@
$NetBSD: patch-js__src__gc__Memory.h,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-js__src__gc__Memory.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $
From bugzilla, bug 840242, attachment v1
Use the runtime page size to control arena decommit.
@ -7,14 +7,9 @@ As a side effect, this removes the hard coded page-size == 4k requirement.
diff js/src/gc/Memory.h js/src/gc/Memory.h
--- js/src/gc/Memory.h
--- js/src/gc/Memory.h.orig 2013-06-17 22:13:09.000000000 +0000
+++ js/src/gc/Memory.h
@@ -10,30 +10,41 @@
#include <stddef.h>
#include "jsgc.h"
namespace js {
namespace gc {
@@ -16,23 +16,34 @@ namespace gc {
// Sanity check that our compiled configuration matches the currently running
// instance and initialize any runtime data needed for allocation.
@ -55,5 +50,3 @@ diff js/src/gc/Memory.h js/src/gc/Memory.h
} // namespace gc
} // namespace js
#endif // jsgc_memory_h___

16
www/firefox/patches/patch-js__src__jsapi.cpp
View file

@ -1,4 +1,4 @@
$NetBSD: patch-js__src__jsapi.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-js__src__jsapi.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
From bugzilla, bug 840242, attachment v1
Use the runtime page size to control arena decommit.
@ -7,14 +7,9 @@ As a side effect, this removes the hard coded page-size == 4k requirement.
diff js/src/jsapi.cpp js/src/jsapi.cpp
--- js/src/jsapi.cpp
--- js/src/jsapi.cpp.orig 2013-06-17 22:13:11.000000000 +0000
+++ js/src/jsapi.cpp
@@ -1138,18 +1138,16 @@ JS_NewRuntime(uint32_t maxbytes, JSUseHe
++numfmtspecs; \
} \
JS_ASSERT(count == numfmtspecs); \
JS_END_MACRO;
#include "js.msg"
@@ -1131,8 +1131,6 @@ JS_NewRuntime(uint32_t maxbytes, JSUseHe
#undef MSG_DEF
#endif /* DEBUG */
@ -23,8 +18,3 @@ diff js/src/jsapi.cpp js/src/jsapi.cpp
if (!js::TlsPerThreadData.init())
return NULL;
js_NewRuntimeWasCalled = JS_TRUE;
}
JSRuntime *rt = js_new<JSRuntime>(useHelperThreads);
if (!rt)

16
www/firefox/patches/patch-js__src__jscntxt.h
View file

@ -1,4 +1,4 @@
$NetBSD: patch-js__src__jscntxt.h,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-js__src__jscntxt.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $
From bugzilla, bug 840242, attachment v1
Use the runtime page size to control arena decommit.
@ -7,14 +7,9 @@ As a side effect, this removes the hard coded page-size == 4k requirement.
diff js/src/jscntxt.h js/src/jscntxt.h
--- js/src/jscntxt.h
--- js/src/jscntxt.h.orig 2013-06-17 22:13:11.000000000 +0000
+++ js/src/jscntxt.h
@@ -1132,16 +1132,25 @@ struct JSRuntime : public JS::shadow::Ru
JSTraceDataOp gcBlackRootsTraceOp;
void *gcBlackRootsData;
JSTraceDataOp gcGrayRootsTraceOp;
void *gcGrayRootsData;
@@ -1101,6 +1101,15 @@ struct JSRuntime : js::RuntimeFriendFiel
/* Stack of thread-stack-allocated GC roots. */
js::AutoGCRooter *autoGCRooters;
@ -30,8 +25,3 @@ diff js/src/jscntxt.h js/src/jscntxt.h
/* Strong references on scripts held for PCCount profiling API. */
js::ScriptAndCountsVector *scriptAndCountsVector;
/* Well-known numbers held for use by this runtime's contexts. */
js::Value NaNValue;
js::Value negativeInfinityValue;
js::Value positiveInfinityValue;

5
www/firefox/patches/patch-js__src__jsgc.cpp
View file

@ -1,6 +1,7 @@
$NetBSD: patch-js__src__jsgc.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-js__src__jsgc.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
From bugzilla, bug 840242, attachment v1
From bugzilla, bug 840242,
https://hg.mozilla.org/integration/mozilla-inbound/rev/49e4ff129351
Use the runtime page size to control arena decommit.
As a side effect, this removes the hard coded page-size == 4k requirement.

31
www/firefox/patches/patch-js_src_ion_AsmJS.cpp Normal file
View file

@ -0,0 +1,31 @@
$NetBSD: patch-js_src_ion_AsmJS.cpp,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- js/src/ion/AsmJS.cpp.orig 2013-06-17 22:13:09.000000000 +0000
+++ js/src/ion/AsmJS.cpp
@@ -1324,7 +1324,7 @@ class ModuleCompiler
void setSecondPassComplete() {
JS_ASSERT(currentPass_ == 2);
- masm_.align(gc::PageSize);
+ masm_.align(AsmJSPageSize);
module_->setFunctionBytes(masm_.size());
currentPass_ = 3;
}
@@ -1357,7 +1357,7 @@ class ModuleCompiler
// The code must be page aligned, so include extra space so that we can
// AlignBytes the allocation result below.
- size_t allocedBytes = totalBytes + gc::PageSize;
+ size_t allocedBytes = totalBytes + AsmJSPageSize;
// Allocate the slab of memory.
JSC::ExecutableAllocator *execAlloc = cx_->compartment->ionCompartment()->execAlloc();
@@ -1365,7 +1365,7 @@ class ModuleCompiler
uint8_t *unalignedBytes = (uint8_t*)execAlloc->alloc(allocedBytes, &pool, JSC::ASMJS_CODE);
if (!unalignedBytes)
return false;
- uint8_t *code = (uint8_t*)AlignBytes((uintptr_t)unalignedBytes, gc::PageSize);
+ uint8_t *code = (uint8_t*)AlignBytes((uintptr_t)unalignedBytes, AsmJSPageSize);
// The ExecutablePool owns the memory and must be released by the AsmJSModule.
module_->takeOwnership(pool, code, codeBytes, totalBytes);

14
www/firefox/patches/patch-js_src_ion_AsmJS.h Normal file
View file

@ -0,0 +1,14 @@
$NetBSD: patch-js_src_ion_AsmJS.h,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- js/src/ion/AsmJS.h.orig 2013-06-17 22:13:09.000000000 +0000
+++ js/src/ion/AsmJS.h
@@ -97,6 +97,9 @@ class AsmJSActivation
void setResumePC(void *pc) { resumePC_ = pc; }
};
+// The assumed page size; dynamically checked in CompileAsmJS.
+const size_t AsmJSPageSize = 4096;
+
// The asm.js spec requires that the ArrayBuffer's byteLength be a multiple of 4096.
static const size_t AsmJSAllocationGranularity = 4096;

13
www/firefox/patches/patch-js_src_ion_AsmJSSignalHandlers.cpp Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-js_src_ion_AsmJSSignalHandlers.cpp,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- js/src/ion/AsmJSSignalHandlers.cpp.orig 2013-06-17 22:13:09.000000000 +0000
+++ js/src/ion/AsmJSSignalHandlers.cpp
@@ -271,7 +271,7 @@ LookupHeapAccess(const AsmJSModule &modu
# if defined(JS_CPU_X64)
# if defined(__DragonFly__)
# include <machine/npx.h> // for union savefpu
-# elif defined(__FreeBSD__) || defined(__OpenBSD__)
+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
# include <machine/fpu.h> // for struct savefpu/fxsave64
# endif
# endif

14
www/firefox/patches/patch-js_src_jscompartment.h
View file

@ -1,20 +1,16 @@
$NetBSD: patch-js_src_jscompartment.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-js_src_jscompartment.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- js/src/jscompartment.h.orig 2013-05-11 19:19:34.000000000 +0000
--- js/src/jscompartment.h.orig 2013-06-17 22:13:11.000000000 +0000
+++ js/src/jscompartment.h
@@ -596,12 +596,12 @@ class js::AutoDebugModeGC
// The DEBUG_MODE_GC reason forces the collector to always throw
// everything away, as required for debug mode transitions.
if (needGC)
- GC(rt, GC_NORMAL, gcreason::DEBUG_MODE_GC);
+ GC(rt, GC_NORMAL, js::gcreason::DEBUG_MODE_GC);
@@ -396,9 +396,9 @@ class js::AutoDebugModeGC
GC(rt, GC_NORMAL, JS::gcreason::DEBUG_MODE_GC);
}
- void scheduleGC(Zone *zone) {
+ void scheduleGC(JS::Zone *zone) {
JS_ASSERT(!rt->isHeapBusy());
- PrepareZoneForGC(zone);
+ js::PrepareZoneForGC(zone);
+ JS::PrepareZoneForGC(zone);
needGC = true;
}
};

22
www/firefox/patches/patch-js_src_jspropertycacheinlines.h
View file

@ -1,22 +0,0 @@
$NetBSD: patch-js_src_jspropertycacheinlines.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- js/src/jspropertycacheinlines.h.orig 2013-05-11 19:19:34.000000000 +0000
+++ js/src/jspropertycacheinlines.h
@@ -32,7 +32,7 @@ JS_ALWAYS_INLINE void
js::PropertyCache::test(JSContext *cx, jsbytecode *pc, JSObject **obj,
JSObject **pobj, PropertyCacheEntry **entry, PropertyName **name)
{
- AutoAssertNoGC nogc;
+ js::AutoAssertNoGC nogc;
JS_ASSERT(this == &cx->propertyCache());
@@ -65,7 +65,7 @@ JS_ALWAYS_INLINE bool
js::PropertyCache::testForSet(JSContext *cx, jsbytecode *pc, JSObject *obj,
PropertyCacheEntry **entryp, JSObject **obj2p, PropertyName **namep)
{
- AutoAssertNoGC nogc;
+ js::AutoAssertNoGC nogc;
JS_ASSERT(this == &cx->propertyCache());

54
www/firefox/patches/patch-js_src_jstypedarray.cpp Normal file
View file

@ -0,0 +1,54 @@
$NetBSD: patch-js_src_jstypedarray.cpp,v 1.1 2013/06/26 11:32:12 ryoon Exp $
https://hg.mozilla.org/integration/mozilla-inbound/rev/49e4ff129351
--- js/src/jstypedarray.cpp.orig 2013-06-17 22:13:11.000000000 +0000
+++ js/src/jstypedarray.cpp
@@ -341,9 +341,9 @@ ArrayBufferObject::uninlineData(JSContex
// | \ /
// obj->elements required to be page boundaries
//
-JS_STATIC_ASSERT(sizeof(ObjectElements) < PageSize);
-JS_STATIC_ASSERT(AsmJSAllocationGranularity == PageSize);
-static const size_t AsmJSMappedSize = PageSize + AsmJSBufferProtectedSize;
+JS_STATIC_ASSERT(sizeof(ObjectElements) < AsmJSPageSize);
+JS_STATIC_ASSERT(AsmJSAllocationGranularity == AsmJSPageSize);
+static const size_t AsmJSMappedSize = AsmJSPageSize + AsmJSBufferProtectedSize;
bool
ArrayBufferObject::prepareForAsmJS(JSContext *cx, Handle<ArrayBufferObject*> buffer)
@@ -364,17 +364,19 @@ ArrayBufferObject::prepareForAsmJS(JSCon
# endif
// Enable access to the valid region.
- JS_ASSERT(buffer->byteLength() % AsmJSAllocationGranularity == 0);
+ JS_ASSERT(buffer->byteLength() % static const size_t AsmJSMappedSize = PageSize + AsmJSBufferProtectedSize;smJSAllocationGranularity == 0);
# ifdef XP_WIN
- if (!VirtualAlloc(p, PageSize + buffer->byteLength(), MEM_COMMIT, PAGE_READWRITE))
+ if (!VirtualAlloc(p, AsmJSPageSize + buffer->byteLength(), MEM_COMMIT, PAGE_READWRITE)) {
return false;
+ }
# else
- if (mprotect(p, PageSize + buffer->byteLength(), PROT_READ | PROT_WRITE))
+ if (mprotect(p, AsmJSPageSize + buffer->byteLength(), PROT_READ | PROT_WRITE)) {
return false;
+ }
# endif
// Copy over the current contents of the typed array.
- uint8_t *data = reinterpret_cast<uint8_t*>(p) + PageSize;
+ uint8_t *data = reinterpret_cast<uint8_t*>(p) + AsmJSPageSize;
memcpy(data, buffer->dataPointer(), buffer->byteLength());
// Swap the new elements into the ArrayBufferObject.
@@ -396,8 +398,8 @@ ArrayBufferObject::releaseAsmJSArrayBuff
ArrayBufferObject &buffer = obj->asArrayBuffer();
JS_ASSERT(buffer.isAsmJSArrayBuffer());
- uint8_t *p = buffer.dataPointer() - PageSize ;
- JS_ASSERT(uintptr_t(p) % PageSize == 0);
+ uint8_t *p = buffer.dataPointer() - AsmJSPageSize ;
+ JS_ASSERT(uintptr_t(p) % AsmJSPageSize == 0);
# ifdef XP_WIN
VirtualFree(p, 0, MEM_RELEASE);
# else

14
www/firefox/patches/patch-js_src_vm_ObjectImpl-inl.h
View file

@ -1,8 +1,8 @@
$NetBSD: patch-js_src_vm_ObjectImpl-inl.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-js_src_vm_ObjectImpl-inl.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- js/src/vm/ObjectImpl-inl.h.orig 2013-05-11 19:19:36.000000000 +0000
--- js/src/vm/ObjectImpl-inl.h.orig 2013-06-17 22:13:12.000000000 +0000
+++ js/src/vm/ObjectImpl-inl.h
@@ -164,9 +164,9 @@ js::ObjectImpl::initializeSlotRange(uint
@@ -181,9 +181,9 @@ js::ObjectImpl::initializeSlotRange(uint
JSRuntime *rt = runtime();
uint32_t offset = start;
for (HeapSlot *sp = fixedStart; sp < fixedEnd; sp++)
@ -14,7 +14,7 @@ $NetBSD: patch-js_src_vm_ObjectImpl-inl.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
}
inline bool
@@ -321,7 +321,7 @@ js::ObjectImpl::sizeOfThis() const
@@ -353,7 +353,7 @@ ZoneOfValue(const JS::Value &value)
js::ObjectImpl::readBarrier(ObjectImpl *obj)
{
#ifdef JSGC_INCREMENTAL
@ -23,7 +23,7 @@ $NetBSD: patch-js_src_vm_ObjectImpl-inl.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
if (zone->needsBarrier()) {
MOZ_ASSERT(!zone->rt->isHeapBusy());
JSObject *tmp = obj->asObjectPtr();
@@ -335,7 +335,7 @@ inline void
@@ -367,7 +367,7 @@ inline void
js::ObjectImpl::privateWriteBarrierPre(void **old)
{
#ifdef JSGC_INCREMENTAL
@ -32,8 +32,8 @@ $NetBSD: patch-js_src_vm_ObjectImpl-inl.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
if (zone->needsBarrier()) {
if (*old && getClass()->trace)
getClass()->trace(zone->barrierTracer(), this->asObjectPtr());
@@ -362,7 +362,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm
if (uintptr_t(obj) < 32)
@@ -394,7 +394,7 @@ js::ObjectImpl::writeBarrierPre(ObjectIm
if (IsNullTaggedPointer(obj))
return;
- Zone *zone = obj->zone();

21
www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp
View file

@ -1,23 +1,14 @@
$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2013-05-11 19:19:43.000000000 +0000
--- media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2013-06-17 22:13:19.000000000 +0000
+++ media/libsoundtouch/src/cpu_detect_x86.cpp
@@ -101,7 +101,7 @@ uint detectCPUextensions(void)
uint res = 0;
-#if defined(__GNUC__)
+#if defined(__GNUC__) && defined(HAVE_CPUID_H)
// GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
@@ -131,6 +131,9 @@ uint detectCPUextensions(void)
@@ -112,6 +112,9 @@ uint detectCPUextensions(void)
if (edx & bit_SSE) res = res | SUPPORT_SSE;
if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
return res & ~_dwDisabledISA;
+#elif defined(__GNUC__)
+ // No cpuid.h --> no cpuid support
+ return 0;
#else
// Window / VS version of cpuid. Notice that Visual Studio 2005 or later required
// for __cpuid intrinsic support.
/// One of these is true:

37
www/firefox/patches/patch-media_mtransport_third__party_nICEr_src_stun_addrs.c
View file

@ -1,32 +1,21 @@
$NetBSD: patch-media_mtransport_third__party_nICEr_src_stun_addrs.c,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-media_mtransport_third__party_nICEr_src_stun_addrs.c,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- media/mtransport/third_party/nICEr/src/stun/addrs.c.orig 2013-05-11 19:19:43.000000000 +0000
--- media/mtransport/third_party/nICEr/src/stun/addrs.c.orig 2013-06-17 22:13:19.000000000 +0000
+++ media/mtransport/third_party/nICEr/src/stun/addrs.c
@@ -55,7 +55,9 @@ static char *RCSSTRING __UNUSED__="$Id:
@@ -54,11 +54,15 @@ static char *RCSSTRING __UNUSED__="$Id:
#include <linux/sysctl.h>
#endif
#include <net/if.h>
#ifndef LINUX
+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
-#ifndef LINUX
+#if defined(__FreeBSD__)
#include <net/if_var.h>
+#endif
#include <net/if_dl.h>
#include <net/if_types.h>
#include <sys/sockio.h>
@@ -80,7 +82,7 @@ static char *RCSSTRING __UNUSED__="$Id:
-#ifdef DARWIN
+#if defined(BSD) || defined(DARWIN)
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -690,7 +692,7 @@ nr_stun_get_addrs(nr_transport_addr addr
int _status=0;
int i;
-#ifdef DARWIN
+#if defined(BSD) || defined(DARWIN)
_status = stun_get_mib_addrs(addrs, maxaddrs, count);
#elif defined(WIN32)
_status = stun_get_win32_addrs(addrs, maxaddrs, count);
+#elif defined(__NetBSD__)
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#include <sys/sockio.h>
#else
#include <linux/if.h>
#endif

8
www/firefox/patches/patch-media_mtransport_third__party_nICEr_src_util_mbslen.c
View file

@ -1,6 +1,6 @@
$NetBSD: patch-media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- media/mtransport/third_party/nICEr/src/util/mbslen.c.orig 2013-05-11 19:19:43.000000000 +0000
--- media/mtransport/third_party/nICEr/src/util/mbslen.c.orig 2013-06-17 22:13:19.000000000 +0000
+++ media/mtransport/third_party/nICEr/src/util/mbslen.c
@@ -43,9 +43,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include <locale.h>
@ -53,7 +53,7 @@ $NetBSD: patch-media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.1 2013/
#ifdef WIN32
if (!setlocale(LC_CTYPE, 0))
@@ -98,18 +106,18 @@ mbslen(const char *s, size_t *ncharsp)
@@ -99,18 +107,18 @@ mbslen(const char *s, size_t *ncharsp)
ABORT(R_NOT_FOUND);
#endif
@ -75,4 +75,4 @@ $NetBSD: patch-media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.1 2013/
+#endif /* HAVE_XLOCALE */
{
if (nbytes == (size_t)-1) /* should never happen */ {
assert(0);
ABORT(R_INTERNAL);

60
www/firefox/patches/patch-media_webrtc_trunk_build_common.gypi
View file

@ -1,60 +0,0 @@
$NetBSD: patch-media_webrtc_trunk_build_common.gypi,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- media/webrtc/trunk/build/common.gypi.orig 2013-05-11 19:19:44.000000000 +0000
+++ media/webrtc/trunk/build/common.gypi
@@ -80,12 +80,21 @@
['use_ash==1', {
'use_aura%': 1,
}],
+
+ # A flag for BSD platforms
+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or \
+ OS=="openbsd"', {
+ 'os_bsd%': 1,
+ }, {
+ 'os_bsd%': 0,
+ }],
],
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'os_bsd%': '<(os_bsd)',
'use_openssl%': '<(use_openssl)',
'use_ibus%': '<(use_ibus)',
'enable_viewport%': '<(enable_viewport)',
@@ -119,7 +128,7 @@
}],
# Set toolkit_uses_gtk for the Chromium browser on Linux.
- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
+ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_aura==0', {
'toolkit_uses_gtk%': 1,
}, {
'toolkit_uses_gtk%': 0,
@@ -144,6 +153,7 @@
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
+ 'os_bsd%': '<(os_bsd)',
'use_openssl%': '<(use_openssl)',
'use_ibus%': '<(use_ibus)',
'enable_viewport%': '<(enable_viewport)',
@@ -406,15 +416,8 @@
'os_posix%': 1,
}],
- # A flag for BSD platforms
- ['OS=="freebsd" or OS=="openbsd"', {
- 'os_bsd%': 1,
- }, {
- 'os_bsd%': 0,
- }],
-
# NSS usage.
- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', {
+ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_openssl==0', {
'use_nss%': 1,
}, {
'use_nss%': 0,

19
www/firefox/patches/patch-media_webrtc_trunk_testing_gtest_include_gtest_internal_gtest-port.h
View file

@ -1,19 +0,0 @@
$NetBSD: patch-media_webrtc_trunk_testing_gtest_include_gtest_internal_gtest-port.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h.orig 2013-05-11 19:19:44.000000000 +0000
+++ media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h
@@ -490,10 +490,10 @@
# define GTEST_ENV_HAS_TR1_TUPLE_ 1
# endif
-// C++11 specifies that <tuple> provides std::tuple. Users can't use
-// gtest in C++11 mode until their standard library is at least that
-// compliant.
-# if GTEST_LANG_CXX11
+// C++11 specifies that <tuple> provides std::tuple. Use that if gtest is used
+// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6
+// can build with clang but need to use gcc4.2's libstdc++).
+# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325)
# define GTEST_ENV_HAS_STD_TUPLE_ 1
# endif

18
www/firefox/patches/patch-media_webrtc_trunk_third__party_libyuv_libyuv.gyp
View file

@ -1,18 +1,10 @@
$NetBSD: patch-media_webrtc_trunk_third__party_libyuv_libyuv.gyp,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-media_webrtc_trunk_third__party_libyuv_libyuv.gyp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- media/webrtc/trunk/third_party/libyuv/libyuv.gyp.orig 2013-05-11 19:19:44.000000000 +0000
--- media/webrtc/trunk/third_party/libyuv/libyuv.gyp.orig 2013-06-17 22:13:19.000000000 +0000
+++ media/webrtc/trunk/third_party/libyuv/libyuv.gyp
@@ -9,6 +9,7 @@
{
'variables': {
'use_system_libjpeg%': 0,
+ 'yuv_disable_asm%': 0,
},
'targets': [
{
@@ -50,6 +51,11 @@
],
},
@@ -58,6 +58,11 @@
}],
],
'conditions': [
+ ['yuv_disable_asm==1', {
+ 'defines': [

18
www/firefox/patches/patch-media_webrtc_trunk_webrtc_build_common.gypi
View file

@ -1,7 +1,19 @@
$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- media/webrtc/trunk/webrtc/build/common.gypi.orig 2013-05-11 19:19:44.000000000 +0000
--- media/webrtc/trunk/webrtc/build/common.gypi.orig 2013-06-17 22:13:20.000000000 +0000
+++ media/webrtc/trunk/webrtc/build/common.gypi
@@ -71,9 +71,9 @@
'enable_data_logging%': 0,
# Disable these to not build components which can be externally provided.
- 'build_libjpeg%': 1,
+ 'build_libjpeg%': 0,
'build_libyuv%': 1,
- 'build_libvpx%': 1,
+ 'build_libvpx%': 0,
# Enable to use the Mozilla internal settings.
'build_with_mozilla%': 0,
@@ -124,6 +124,11 @@
# and Java Implementation
'enable_android_opensl%': 0,
@ -14,7 +26,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_build_common.gypi,v 1.1 2013/05/23 13:1
['OS=="ios"', {
'enable_video%': 0,
'enable_protobuf%': 0,
@@ -210,6 +215,18 @@
@@ -215,6 +220,18 @@
}],
],
}],

15
www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture__factory.cc Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture__factory.cc,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture_factory.cc.orig 2013-06-17 22:13:20.000000000 +0000
+++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture_factory.cc
@@ -8,8 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+_Pragma("GCC visibility push(default)")
#include "video_capture_factory.h"
#include "video_capture_impl.h"
+_Pragma("GCC visibility pop")
namespace webrtc
{

41
www/firefox/patches/patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc
View file

@ -1,13 +1,15 @@
$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.cc,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc.orig 2013-05-11 19:19:46.000000000 +0000
--- media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc.orig 2013-06-17 22:13:20.000000000 +0000
+++ media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc
@@ -59,6 +59,17 @@
@@ -59,6 +59,19 @@
#include <sys/prctl.h>
#endif
+#if defined(__NetBSD__)
+#include <lwp.h>
+#include <pthread.h>
+#include <sched.h>
+#elif defined(__FreeBSD__)
+#include <sys/param.h>
+#include <sys/thr.h>
@ -20,7 +22,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.c
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
@@ -141,6 +152,20 @@ uint32_t ThreadWrapper::GetThreadId() {
@@ -141,6 +154,20 @@ uint32_t ThreadWrapper::GetThreadId() {
return static_cast<uint32_t>(syscall(__NR_gettid));
#elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
return pthread_mach_thread_np(pthread_self());
@ -41,7 +43,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.c
#else
return reinterpret_cast<uint32_t>(pthread_self());
#endif
@@ -172,7 +197,7 @@ ThreadPosix::~ThreadPosix() {
@@ -172,7 +199,7 @@ ThreadPosix::~ThreadPosix() {
delete crit_state_;
}
@ -50,13 +52,12 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.c
bool ThreadPosix::Start(unsigned int& thread_id)
{
@@ -237,13 +262,18 @@ bool ThreadPosix::Start(unsigned int& th
@@ -237,21 +264,43 @@ bool ThreadPosix::Start(unsigned int& th
// CPU_ZERO and CPU_SET are not available in NDK r7, so disable
// SetAffinity on Android for now.
-#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)))
+#if defined(__FreeBSD__) || (defined(WEBRTC_LINUX) && \
+ (!defined(WEBRTC_ANDROID)))
-#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK)))
+#if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK)))
bool ThreadPosix::SetAffinity(const int* processor_numbers,
const unsigned int amount_of_processors) {
if (!processor_numbers || (amount_of_processors == 0)) {
@ -64,26 +65,40 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_system__wrappers_source_thread__posix.c
}
+#if defined(__FreeBSD__)
+ cpuset_t mask;
+#elif defined(__NetBSD__)
+ cpuset_t *mask;
+#else
cpu_set_t mask;
+#endif
+#if defined(__NetBSD__)
+ cpuset_zero(mask);
+#else
CPU_ZERO(&mask);
+#endif
for (unsigned int processor = 0;
@@ -251,7 +281,11 @@ bool ThreadPosix::SetAffinity(const int*
processor < amount_of_processors;
++processor) {
+#if defined(__NetBSD__)
+ cpuset_set(processor_numbers[processor], mask);
+#else
CPU_SET(processor_numbers[processor], &mask);
+#endif
}
-#if defined(WEBRTC_ANDROID)
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK)
+#if defined(__FreeBSD__)
+ const int result = pthread_setaffinity_np(thread_,
+ sizeof(mask),
+ &mask);
+#elif defined(WEBRTC_ANDROID)
+#elif defined(__NetBSD__)
+ const int result = pthread_setaffinity_np(thread_,
+ sizeof(mask),
+ mask);
+#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK)
// Android.
const int result = syscall(__NR_sched_setaffinity,
pid_,
@@ -325,6 +359,10 @@ void ThreadPosix::Run() {
@@ -325,6 +374,10 @@ void ThreadPosix::Run() {
if (set_thread_name_) {
#ifdef WEBRTC_LINUX
prctl(PR_SET_NAME, (unsigned long)name_, 0, 0, 0);

6
www/firefox/patches/patch-media_webrtc_webrtc__config.gypi
View file

@ -1,6 +1,6 @@
$NetBSD: patch-media_webrtc_webrtc__config.gypi,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-media_webrtc_webrtc__config.gypi,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- media/webrtc/webrtc_config.gypi.orig 2013-05-11 19:19:46.000000000 +0000
--- media/webrtc/webrtc_config.gypi.orig 2013-06-17 22:13:21.000000000 +0000
+++ media/webrtc/webrtc_config.gypi
@@ -14,7 +14,6 @@
'include_internal_video_render': 0,
@ -8,5 +8,5 @@ $NetBSD: patch-media_webrtc_webrtc__config.gypi,v 1.1 2013/05/23 13:12:13 ryoon
'enable_protobuf': 0,
- 'include_pulse_audio': 0,
'include_tests': 0,
'enable_android_opensl': 1,
# use_system_lib* still seems to be in use in trunk/build
'use_system_libjpeg': 0,

23
www/firefox/patches/patch-mp
View file

@ -1,23 +0,0 @@
$NetBSD: patch-mp,v 1.3 2013/05/23 13:12:13 ryoon Exp $
--- media/libsydneyaudio/src/Makefile.in.orig 2013-05-11 19:19:43.000000000 +0000
+++ media/libsydneyaudio/src/Makefile.in
@@ -70,6 +70,18 @@ CSRCS = \
$(NULL)
endif
+ifdef MOZ_PULSEAUDIO
+CSRCS = \
+ sydney_audio_pulseaudio.c \
+ $(NULL)
+endif
+
+ifdef MOZ_PULSEAUDIO
+CSRCS = \
+ sydney_audio_pulseaudio.c \
+ $(NULL)
+endif
+
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += winmm.lib
endif

41
www/firefox/patches/patch-netwerk__protocol__websocket__WebSocketChannel.cpp
View file

@ -1,4 +1,4 @@
$NetBSD: patch-netwerk__protocol__websocket__WebSocketChannel.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-netwerk__protocol__websocket__WebSocketChannel.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
# HG changeset patch
# User Martin Husemann <martin@netbsd.org>
@ -8,14 +8,9 @@ $NetBSD: patch-netwerk__protocol__websocket__WebSocketChannel.cpp,v 1.1 2013/06/
Bug 871555: Use memcpy and properly aligned temporary variables instead of pointer casts with unclear alignment r=mcmanus
diff netwerk/protocol/websocket/WebSocketChannel.cpp netwerk/protocol/websocket/WebSocketChannel.cpp
--- netwerk/protocol/websocket/WebSocketChannel.cpp
--- netwerk/protocol/websocket/WebSocketChannel.cpp.orig 2013-06-17 22:13:23.000000000 +0000
+++ netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -1627,17 +1627,18 @@ WebSocketChannel::PrimeNewOutgoingMessag
// payload is offset 6 including 4 for the mask
payload = mOutHeader + 6;
// The close reason code sits in the first 2 bytes of payload
// If the channel user provided a code and reason during Close()
@@ -1632,7 +1632,8 @@ WebSocketChannel::PrimeNewOutgoingMessag
// and there isn't an internal error, use that.
if (NS_SUCCEEDED(mStopOnClose)) {
if (mScriptCloseCode) {
@ -25,17 +20,7 @@ diff netwerk/protocol/websocket/WebSocketChannel.cpp netwerk/protocol/websocket/
mOutHeader[1] += 2;
mHdrOutToSend = 8;
if (!mScriptCloseReason.IsEmpty()) {
NS_ABORT_IF_FALSE(mScriptCloseReason.Length() <= 123,
"Close Reason Too Long");
mOutHeader[1] += mScriptCloseReason.Length();
mHdrOutToSend += mScriptCloseReason.Length();
memcpy (payload + 2,
@@ -1646,17 +1647,18 @@ WebSocketChannel::PrimeNewOutgoingMessag
}
} else {
// No close code/reason, so payload length = 0. We must still send mask
// even though it's not used. Keep payload offset so we write mask
// below.
@@ -1651,7 +1652,8 @@ WebSocketChannel::PrimeNewOutgoingMessag
mHdrOutToSend = 6;
}
} else {
@ -45,17 +30,7 @@ diff netwerk/protocol/websocket/WebSocketChannel.cpp netwerk/protocol/websocket/
mOutHeader[1] += 2;
mHdrOutToSend = 8;
}
if (mServerClosed) {
/* bidi close complete */
mReleaseOnTransmit = 1;
} else if (NS_FAILED(mStopOnClose)) {
@@ -1734,17 +1736,18 @@ WebSocketChannel::PrimeNewOutgoingMessag
LOG(("WebSocketChannel::PrimeNewOutgoingMessage(): "
"GenerateRandomBytes failure %x\n", rv));
StopSession(rv);
return;
}
@@ -1739,7 +1741,8 @@ WebSocketChannel::PrimeNewOutgoingMessag
mask = * reinterpret_cast<uint32_t *>(buffer);
NS_Free(buffer);
} while (!mask);
@ -65,9 +40,3 @@ diff netwerk/protocol/websocket/WebSocketChannel.cpp netwerk/protocol/websocket/
LOG(("WebSocketChannel::PrimeNewOutgoingMessage() using mask %08x\n", mask));
// We don't mask the framing, but occasionally we stick a little payload
// data in the buffer used for the framing. Close frames are the current
// example. This data needs to be masked, but it is never more than a
// handful of bytes and might rotate the mask, so we can just do it locally.
// For real data frames we ship the bulk of the payload off to ApplyMask()

13
www/firefox/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- netwerk/sctp/src/netinet6/sctp6_usrreq.c.orig 2013-06-17 22:13:23.000000000 +0000
+++ netwerk/sctp/src/netinet6/sctp6_usrreq.c
@@ -459,6 +459,8 @@ sctp6_notify(struct sctp_inpcb *inp,
(icmph->icmp6_code == ICMP_UNREACH_HOST_PROHIB) ||
#ifdef __Panda__
(icmph->icmp6_code == ICMP_UNREACH_ADMIN)) {
+#elif defined(__Userspace_os_NetBSD)
+ (icmph->icmp6_code == ICMP_UNREACH_ADMIN_PROHIBIT)) {
#else
(icmph->icmp6_code == ICMP_UNREACH_FILTER_PROHIB)) {
#endif

33
www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__os__userspace.h
View file

@ -1,8 +1,17 @@
$NetBSD: patch-netwerk_sctp_src_netinet_sctp__os__userspace.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-netwerk_sctp_src_netinet_sctp__os__userspace.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- netwerk/sctp/src/netinet/sctp_os_userspace.h.orig 2013-05-11 19:19:49.000000000 +0000
--- netwerk/sctp/src/netinet/sctp_os_userspace.h.orig 2013-06-17 22:13:23.000000000 +0000
+++ netwerk/sctp/src/netinet/sctp_os_userspace.h
@@ -395,7 +395,9 @@ typedef pthread_t userland_thread_t;
@@ -383,7 +383,7 @@ struct udphdr {
#else /* !defined(Userspace_os_Windows) */
#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
#include <sys/socket.h>
-#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
+#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID) || defined(__Userspace_os_NetBSD)
#include <pthread.h>
#endif
typedef pthread_mutex_t userland_mutex_t;
@@ -397,7 +397,9 @@ typedef pthread_t userland_thread_t;
#define MA_OWNED 7 /* sys/mutex.h typically on FreeBSD */
#if !defined(__Userspace_os_FreeBSD)
struct mtx {int dummy;};
@ -12,3 +21,21 @@ $NetBSD: patch-netwerk_sctp_src_netinet_sctp__os__userspace.h,v 1.1 2013/05/23 1
struct sx {int dummy;};
#endif
@@ -500,7 +502,7 @@ struct sx {int dummy;};
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
#endif
-#if defined(__Userspace_os_Linux) || defined(__Userspace_os_Darwin) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) ||defined(__Userspace_os_Windows)
+#if defined(__Userspace_os_Linux) || defined(__Userspace_os_Darwin) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) ||defined(__Userspace_os_Windows) || defined(__Userspace_os_NetBSD)
#include "user_ip6_var.h"
#else
#include <netinet6/ip6_var.h>
@@ -1120,6 +1122,8 @@ sctp_get_mbuf_for_msg(unsigned int space
#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD)
/* stolen from /usr/include/sys/socket.h */
#define CMSG_ALIGN(n) _ALIGN(n)
+#elif defined(__Userspace_os_NetBSD)
+#define CMSG_ALIGN(n) (((n) + __ALIGNBYTES) & ~__ALIGNBYTES)
#elif defined(__Userspace_os_Darwin)
#if !defined(__DARWIN_ALIGNBYTES)
#define __DARWIN_ALIGNBYTES (sizeof(__darwin_size_t) - 1)

13
www/firefox/patches/patch-netwerk_sctp_src_netinet_sctp__usrreq.c Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-netwerk_sctp_src_netinet_sctp__usrreq.c,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- netwerk/sctp/src/netinet/sctp_usrreq.c.orig 2013-06-17 22:13:23.000000000 +0000
+++ netwerk/sctp/src/netinet/sctp_usrreq.c
@@ -414,6 +414,8 @@ sctp_notify(struct sctp_inpcb *inp,
(icmph->icmp_code == ICMP_UNREACH_HOST_PROHIB) ||
#ifdef __Panda__
(icmph->icmp_code == ICMP_UNREACH_ADMIN)) {
+#elif defined(__Userspace_os_NetBSD)
+ (icmph->icmp_code == ICMP_UNREACH_ADMIN_PROHIBIT)) {
#else
(icmph->icmp_code == ICMP_UNREACH_FILTER_PROHIB)) {
#endif

53
www/firefox/patches/patch-netwerk_sctp_src_user__socket.c Normal file
View file

@ -0,0 +1,53 @@
$NetBSD: patch-netwerk_sctp_src_user__socket.c,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- netwerk/sctp/src/user_socket.c.orig 2013-06-17 22:13:23.000000000 +0000
+++ netwerk/sctp/src/user_socket.c
@@ -1104,8 +1104,13 @@ userspace_sctp_recvmsg(struct socket *so
(struct sctp_sndrcvinfo *)sinfo, 1);
if (error) {
+#if defined(__Userspace_os_NetBSD)
+ if (auio.uio_resid != (int)ulen && (
+ error == EINTR || error == EWOULDBLOCK))
+#else
if (auio.uio_resid != (int)ulen && (error == ERESTART ||
error == EINTR || error == EWOULDBLOCK))
+#endif
error = 0;
}
if ((fromlenp != NULL) && (fromlen > 0) && (from != NULL)) {
@@ -1193,7 +1198,11 @@ usrsctp_recvv(struct socket *so,
(struct sctp_sndrcvinfo *)&seinfo, 1);
if (errno) {
if (auio.uio_resid != (int)ulen &&
+#if defined(__Userspace_os_NetBSD)
+ (errno == EINTR || errno == EWOULDBLOCK)) {
+#else
(errno == ERESTART || errno == EINTR || errno == EWOULDBLOCK)) {
+#endif
errno = 0;
}
}
@@ -2143,7 +2152,11 @@ int user_connect(struct socket *so, stru
error = pthread_cond_wait(SOCK_COND(so), SOCK_MTX(so));
#endif
if (error) {
+#if defined(__Userspace_os_NetBSD)
+ if (error == EINTR)
+#else
if (error == EINTR || error == ERESTART)
+#endif
interrupted = 1;
break;
}
@@ -2157,8 +2170,10 @@ int user_connect(struct socket *so, stru
bad:
if (!interrupted)
so->so_state &= ~SS_ISCONNECTING;
+#if !defined(__Userspace_os_NetBSD)
if (error == ERESTART)
error = EINTR;
+#endif
done1:
return (error);
}

20
www/firefox/patches/patch-netwerk_sctp_src_user__socketvar.h
View file

@ -1,6 +1,6 @@
$NetBSD: patch-netwerk_sctp_src_user__socketvar.h,v 1.1 2013/05/23 13:12:13 ryoon Exp $
$NetBSD: patch-netwerk_sctp_src_user__socketvar.h,v 1.2 2013/06/26 11:32:12 ryoon Exp $
--- netwerk/sctp/src/user_socketvar.h.orig 2013-05-11 19:19:49.000000000 +0000
--- netwerk/sctp/src/user_socketvar.h.orig 2013-06-17 22:13:23.000000000 +0000
+++ netwerk/sctp/src/user_socketvar.h
@@ -47,7 +47,7 @@
/* #include <sys/_lock.h> was 0 byte file */
@ -11,23 +11,17 @@ $NetBSD: patch-netwerk_sctp_src_user__socketvar.h,v 1.1 2013/05/23 13:12:13 ryoo
#include <sys/uio.h>
#endif
#define SOCK_MAXADDRLEN 255
@@ -64,16 +64,18 @@
@@ -64,11 +64,11 @@
#define ERESTART (-1)
#endif
-#if !defined(__Userspace_os_Darwin)
+#if !defined(__Userspace_os_Darwin) && !defined(__Userspace_os_NetBSD)
-#if !defined(__Userspace_os_Darwin) && !defined(__Userspace_os_OpenBSD)
+#if !defined(__Userspace_os_Darwin) && !defined(__Userspace_os_OpenBSD) && !defined(__Userspace_os_NetBSD)
enum uio_rw { UIO_READ, UIO_WRITE };
#endif
+#if !defined(__Userspace_os_NetBSD)
-#if !defined(__Userspace_os_OpenBSD)
+#if !defined(__Userspace_os_OpenBSD) && !defined(__Userspace_os_NetBSD)
/* Segment flag values. */
enum uio_seg {
UIO_USERSPACE, /* from user data space */
UIO_SYSSPACE, /* from system space */
UIO_NOCOPY /* don't copy, already in object */
};
+#endif
struct proc {
int stub; /* struct proc is a dummy for __Userspace__ */

13
www/firefox/patches/patch-toolkit_toolkit-tiers.mk
View file

@ -1,13 +0,0 @@
$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- toolkit/toolkit-tiers.mk.orig 2013-01-04 23:44:46.000000000 +0000
+++ toolkit/toolkit-tiers.mk
@@ -43,7 +43,7 @@ ifdef MOZ_UPDATER
ifndef MOZ_NATIVE_BZ2
tier_platform_dirs += modules/libbz2
endif
-tier_platform_dirs += other-licenses/bsdiff
+#tier_platform_dirs += other-licenses/bsdiff
endif
tier_platform_dirs += gfx/qcms

13
www/firefox/patches/patch-toolkit_toolkit.mozbuild Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-toolkit_toolkit.mozbuild,v 1.1 2013/06/26 11:32:12 ryoon Exp $
--- toolkit/toolkit.mozbuild.orig 2013-06-17 22:13:28.000000000 +0000
+++ toolkit/toolkit.mozbuild
@@ -46,7 +46,7 @@ if CONFIG['MOZ_UPDATER']:
if not CONFIG['MOZ_NATIVE_BZ2']:
add_tier_dir('platform', 'modules/libbz2')
- add_tier_dir('platform', 'other-licenses/bsdiff')
+# add_tier_dir('platform', 'other-licenses/bsdiff')
# Gecko/Core components.

15
www/firefox/patches/patch-xpcom_Makefile.in
View file

@ -1,15 +0,0 @@
$NetBSD: patch-xpcom_Makefile.in,v 1.1 2013/05/23 13:12:13 ryoon Exp $
--- xpcom/Makefile.in.orig 2013-01-04 23:44:47.000000000 +0000
+++ xpcom/Makefile.in
@@ -35,6 +35,10 @@ DIRS += windbgdlg
endif
endif
+ifeq ($(OS_ARCH),NetBSD)
+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner/sdk/lib
+endif
+
ifdef ENABLE_TESTS
TOOL_DIRS += \
tests \

17
www/firefox/patches/patch-xpcom__reflect__xptcall__src__md__unix__xptcstubs_sparc64_openbsd.cpp
View file

@ -1,4 +1,4 @@
$NetBSD: patch-xpcom__reflect__xptcall__src__md__unix__xptcstubs_sparc64_openbsd.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
$NetBSD: patch-xpcom__reflect__xptcall__src__md__unix__xptcstubs_sparc64_openbsd.cpp,v 1.2 2013/06/26 11:32:12 ryoon Exp $
# HG changeset patch
# User Martin Husemann <martin@netbsd.org>
@ -10,14 +10,9 @@ Bug 867914: Declare SharedStub as returning nsresult in xptcstubs_sparc64_openbs
Fixes a build issue on NetBSD/sparc64, no apparent fallout on OpenBSD/sparc64
diff xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp.orig 2013-06-17 22:13:29.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp
@@ -78,17 +78,17 @@ PrepareAndDispatch(nsXPTCStubBase* self,
result = self->mOuter->CallMethod((uint16_t)methodIndex, info, dispatchParams);
if(dispatchParams != paramBuffer)
delete [] dispatchParams;
@@ -83,7 +83,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
return result;
}
@ -26,9 +21,3 @@ diff xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp xpcom/refle
#define STUB_ENTRY(n) \
nsresult nsXPTCStubBase::Stub##n() \
{ \
int dummy; /* defeat tail-call optimization */ \
return SharedStub(n, &dummy); \
}

18
www/firefox/patches/patch-xpcom_io_nsMultiplexInputStream_cpp
View file

@ -1,18 +0,0 @@
$NetBSD: patch-xpcom_io_nsMultiplexInputStream_cpp,v 1.1 2013/05/23 13:12:13 ryoon Exp $
Fix PR/47722, dragonfly (gcc 4.7) build problem:
error: no matching function for call to
'NS_MIN(int64_t&, __gnu_cxx::__enable_if<true, double>::__type)'
devel/xulrunner/work/mozilla-release/xpcom/io/nsMultiplexInputStream.cpp:532:83
--- xpcom/io/nsMultiplexInputStream.cpp.orig 2013-05-11 19:19:56.000000000 +0000
+++ xpcom/io/nsMultiplexInputStream.cpp
@@ -529,7 +529,7 @@ nsMultiplexInputStream::Seek(int32_t aWh
rv = stream->Tell(&avail);
NS_ENSURE_SUCCESS(rv, rv);
- int64_t newPos = streamPos + XPCOM_MIN(avail, std::abs(remaining));
+ int64_t newPos = streamPos + XPCOM_MIN(avail, (int64_t)std::abs(remaining));
rv = stream->Seek(NS_SEEK_END, -newPos);
NS_ENSURE_SUCCESS(rv, rv);