summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authormartin <martin@pkgsrc.org>2015-03-31 10:59:43 +0000
committermartin <martin@pkgsrc.org>2015-03-31 10:59:43 +0000
commitf5c1bb6571d49cabce5371d1606c3c97c8214408 (patch)
treebb8678cd6d15731c84d1f9cedf9bd19b02b3db07 /www
parent3aa426647088736974e13eb51a8481d175adb19e (diff)
downloadpkgsrc-f5c1bb6571d49cabce5371d1606c3c97c8214408.tar.gz
Avoid another crash on big endian 64 bit platforms
Diffstat (limited to 'www')
-rw-r--r--www/firefox/Makefile3
-rw-r--r--www/firefox/distinfo3
-rw-r--r--www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp16
3 files changed, 20 insertions, 2 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 022578d8a53..d89a715a926 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -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 @@ MOZ_BRANCH_MINOR= .4
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 --git a/www/firefox/distinfo b/www/firefox/distinfo
index a618956f1bd..e452d8b8ab2 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -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_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_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 --git a/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp b/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp
new file mode 100644
index 00000000000..67ca9a8bd33
--- /dev/null
+++ b/www/firefox/patches/patch-js_xpconnect_src_XPCConvert.cpp
@@ -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));