[pkgsrc/trunk]: pkgsrc/www/firefox Avoid another crash on big endian 64 bit p...

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0de8a0f7999
branches:  trunk
changeset: 649064:a0de8a0f7999
user:      martin <martin%pkgsrc.org@localhost>
date:      Tue Mar 31 10:59:43 2015 +0000

description:
Avoid another crash on big endian 64 bit platforms

diffstat:

 www/firefox/Makefile                                      |   3 +-
 www/firefox/distinfo                                      |   3 +-
 www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp |  16 +++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r bad56126f084 -r a0de8a0f7999 www/firefox/Makefile
--- a/www/firefox/Makefile      Tue Mar 31 09:44:30 2015 +0000
+++ b/www/firefox/Makefile      Tue Mar 31 10:59:43 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202 2015/03/22 00:21:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.203 2015/03/31 10:59:43 martin Exp $
 
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=    36.0
@@ -6,6 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff -r bad56126f084 -r a0de8a0f7999 www/firefox/distinfo
--- a/www/firefox/distinfo      Tue Mar 31 09:44:30 2015 +0000
+++ b/www/firefox/distinfo      Tue Mar 31 10:59:43 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.196 2015/03/22 00:21:16 ryoon Exp $
+$NetBSD: distinfo,v 1.197 2015/03/31 10:59:43 martin Exp $
 
 SHA1 (firefox-36.0.4.source.tar.bz2) = ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea
 RMD160 (firefox-36.0.4.source.tar.bz2) = 75d10ff454f9169a16243cb08397cd4710926f9f
@@ -91,6 +91,7 @@
 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_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
 SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
 SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
diff -r bad56126f084 -r a0de8a0f7999 www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp Tue Mar 31 10:59:43 2015 +0000
@@ -0,0 +1,16 @@
+$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));