Tue Mar 31 10:59:43 2015 UTC ()
Avoid another crash on big endian 64 bit platforms


(martin)
diff -r1.202 -r1.203 pkgsrc/www/firefox/Makefile
diff -r1.196 -r1.197 pkgsrc/www/firefox/distinfo
diff -r0 -r1.1 pkgsrc/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp
cvs diff -r1.202 -r1.203 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2015/03/22 00:21:16 1.202
+++ pkgsrc/www/firefox/Makefile 2015/03/31 10:59:43 1.203
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.202 2015/03/22 00:21:16 ryoon Exp $ 1# $NetBSD: Makefile,v 1.203 2015/03/31 10:59:43 martin Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 36.0 4MOZ_BRANCH= 36.0
5MOZ_BRANCH_MINOR= .4 5MOZ_BRANCH_MINOR= .4
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
13 14
14WRKSRC= ${WRKDIR}/mozilla-release 15WRKSRC= ${WRKDIR}/mozilla-release
15#WRKSRC= ${WRKDIR}/mozilla-beta 16#WRKSRC= ${WRKDIR}/mozilla-beta
16 17
17MAINTAINER= ryoon@NetBSD.org 18MAINTAINER= ryoon@NetBSD.org
18HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 19HOMEPAGE= http://www.mozilla.com/en-US/firefox/
19COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//}) 20COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//})
20LICENSE= mpl-1.1 21LICENSE= mpl-1.1
21 22
cvs diff -r1.196 -r1.197 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2015/03/22 00:21:16 1.196
+++ pkgsrc/www/firefox/distinfo 2015/03/31 10:59:43 1.197
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.196 2015/03/22 00:21:16 ryoon Exp $ 1$NetBSD: distinfo,v 1.197 2015/03/31 10:59:43 martin Exp $
2 2
3SHA1 (firefox-36.0.4.source.tar.bz2) = ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea 3SHA1 (firefox-36.0.4.source.tar.bz2) = ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea
4RMD160 (firefox-36.0.4.source.tar.bz2) = 75d10ff454f9169a16243cb08397cd4710926f9f 4RMD160 (firefox-36.0.4.source.tar.bz2) = 75d10ff454f9169a16243cb08397cd4710926f9f
5Size (firefox-36.0.4.source.tar.bz2) = 179307558 bytes 5Size (firefox-36.0.4.source.tar.bz2) = 179307558 bytes
6SHA1 (patch-aa) = 4af7ee0e63ca4b1a7584199561e9ecf0528d03aa 6SHA1 (patch-aa) = 4af7ee0e63ca4b1a7584199561e9ecf0528d03aa
7SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc 7SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc
8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 8SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9 9SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
10SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a 10SHA1 (patch-as) = 6630ac63a5b0169c47dbc91bdabf7602e3979a8a
11SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0 11SHA1 (patch-b2g_installer_Makefile.in) = 95eb82774734db093c990919ba669d4666e55df0
12SHA1 (patch-b2g_installer_package-manifest.in) = cdb43eece164b43b49a9c0f1a47de4e7db56ed76 12SHA1 (patch-b2g_installer_package-manifest.in) = cdb43eece164b43b49a9c0f1a47de4e7db56ed76
13SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756 13SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
14SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25 14SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
@@ -81,26 +81,27 @@ SHA1 (patch-js_src_dtoa.c) = e4050e94664 @@ -81,26 +81,27 @@ SHA1 (patch-js_src_dtoa.c) = e4050e94664
81SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc 81SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
82SHA1 (patch-js_src_gc_Memory.cpp) = f2ee54f0a05d870651a3235b95bbb346586f3c3c 82SHA1 (patch-js_src_gc_Memory.cpp) = f2ee54f0a05d870651a3235b95bbb346586f3c3c
83SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c 83SHA1 (patch-js_src_gc_Statistics.cpp) = 227d047f5befeff2a619e8bec9e98d69a78adf5c
84SHA1 (patch-js_src_jit-LIR.cpp) = 4231ab9271b12ca712492e2cdbd4e1e82e108b68 84SHA1 (patch-js_src_jit-LIR.cpp) = 4231ab9271b12ca712492e2cdbd4e1e82e108b68
85SHA1 (patch-js_src_jit_ExecutableAllocator.h) = cfcf810b25adeeb13eaed8c1405ed286565941cd 85SHA1 (patch-js_src_jit_ExecutableAllocator.h) = cfcf810b25adeeb13eaed8c1405ed286565941cd
86SHA1 (patch-js_src_jit_MIR.cpp) = 64071494d1aac905e95d25046f0cf1f9f96b74e9 86SHA1 (patch-js_src_jit_MIR.cpp) = 64071494d1aac905e95d25046f0cf1f9f96b74e9
87SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = 7352da6b9850bbfef68893d9a120c9e513492518 87SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = 7352da6b9850bbfef68893d9a120c9e513492518
88SHA1 (patch-js_src_jit_none_Lowering-none.h) = 0cbbaae57ddea272b442b6298ee562c412f552f3 88SHA1 (patch-js_src_jit_none_Lowering-none.h) = 0cbbaae57ddea272b442b6298ee562c412f552f3
89SHA1 (patch-js_src_jsapi.cpp) = 16269342723fe9420909ea17e19d02b23ad1a70b 89SHA1 (patch-js_src_jsapi.cpp) = 16269342723fe9420909ea17e19d02b23ad1a70b
90SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c 90SHA1 (patch-js_src_jsdate.cpp) = 0e577aefa24693c7941ead0365c58b2b4b41dc8c
91SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59 91SHA1 (patch-js_src_jskwgen.cpp) = 34d3b92e13366d4b43ff755ad54f392c116d5c59
92SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9 92SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
93SHA1 (patch-js_src_shell_jsoptparse.cpp) = f3a306fe3cf629370a671267ef0e102c1a7a226c 93SHA1 (patch-js_src_shell_jsoptparse.cpp) = f3a306fe3cf629370a671267ef0e102c1a7a226c
 94SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
94SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926 95SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
95SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af 96SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
96SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db 97SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
97SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 6c393966b3778f9a8d80ca1f56509096e50e0105 98SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 6c393966b3778f9a8d80ca1f56509096e50e0105
98SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62 99SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62
99SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c 100SHA1 (patch-media_libcubeb_src_moz.build) = a793f0dd1bd90d9a9a967dbef8da1183cd909b7c
100SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a 101SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
101SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696 102SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
102SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = b7c21a68f09176100794148aa75eb19829417fed 103SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = b7c21a68f09176100794148aa75eb19829417fed
103SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b59809a7292d41bdb352bc425dc46273f1c0c270 104SHA1 (patch-media_libstagefright_system_core_liblog_fake__log__device.c) = b59809a7292d41bdb352bc425dc46273f1c0c270
104SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de 105SHA1 (patch-media_libstagefright_system_core_liblog_logprint.c) = 56c5590b57caf568e12f8ff7df07daec281855de
105SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718 106SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
106SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933 107SHA1 (patch-media_libtheora_lib_info.c) = cb7628134427aaa4d5824c0e0770c30e5111a933
File Added: pkgsrc/www/firefox/patches/Attic/patch-js_xpconnect_src_XPCConvert.cpp
$NetBSD: patch-js_xpconnect_src_XPCConvert.cpp,v 1.1 2015/03/31 10:59:43 martin Exp $

Suggested workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1147837
Avoids a crash on big endian 64 bit architectures.

--- js/xpconnect/src/XPCConvert.cpp.orig	2015-03-21 04:42:37.000000000 +0100
+++ js/xpconnect/src/XPCConvert.cpp	2015-03-30 13:49:16.000000000 +0200
@@ -134,7 +134,7 @@
         d.setNumber(*static_cast<const float*>(s));
         return true;
     case nsXPTType::T_DOUBLE:
-        d.setNumber(*static_cast<const double*>(s));
+        d.setNumber(CanonicalizeNaN(*static_cast<const double*>(s)));
         return true;
     case nsXPTType::T_BOOL  :
         d.setBoolean(*static_cast<const bool*>(s));