[pkgsrc/trunk]: pkgsrc/www/firefox Workaround for Bug 1152776 (apparently onl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/138240de667d
branches:  trunk
changeset: 649862:138240de667d
user:      martin <martin%pkgsrc.org@localhost>
date:      Sun Apr 12 06:24:32 2015 +0000

description:
Workaround for Bug 1152776 (apparently only affecting architectures w/o real
JIT support). Better fix upstream in all newer branches already.

diffstat:

 www/firefox/Makefile                            |   4 ++--
 www/firefox/distinfo                            |   3 ++-
 www/firefox/patches/patch-js_src_jsprototypes.h |  20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 95f59432b16c -r 138240de667d www/firefox/Makefile
--- a/www/firefox/Makefile      Sun Apr 12 03:35:58 2015 +0000
+++ b/www/firefox/Makefile      Sun Apr 12 06:24:32 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2015/04/10 05:40:36 martin Exp $
+# $NetBSD: Makefile,v 1.208 2015/04/12 06:24:32 martin Exp $
 
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=    37.0.1
@@ -6,7 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   1
+PKGREVISION=   2
 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 95f59432b16c -r 138240de667d www/firefox/distinfo
--- a/www/firefox/distinfo      Sun Apr 12 03:35:58 2015 +0000
+++ b/www/firefox/distinfo      Sun Apr 12 06:24:32 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.200 2015/04/10 05:40:36 martin Exp $
+$NetBSD: distinfo,v 1.201 2015/04/12 06:24:32 martin Exp $
 
 SHA1 (firefox-37.0.1.source.tar.bz2) = 8bbffaa3cb81916bb44e11773d3f05fc4f2b9f36
 RMD160 (firefox-37.0.1.source.tar.bz2) = f3605aaab5e4e002ab29523d8dcaed1953a03ab8
@@ -89,6 +89,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_jsprototypes.h) = 30673db93c690a516c76319a834a5f702b9d0df1
 SHA1 (patch-js_src_shell_jsoptparse.cpp) = f3a306fe3cf629370a671267ef0e102c1a7a226c
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
diff -r 95f59432b16c -r 138240de667d www/firefox/patches/patch-js_src_jsprototypes.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-js_src_jsprototypes.h   Sun Apr 12 06:24:32 2015 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-js_src_jsprototypes.h,v 1.1 2015/04/12 06:24:32 martin Exp $
+
+Hack around #ifdef inconsistency (depending on exact include order) in
+some unified builds, 
+see https://bugzilla.mozilla.org/show_bug.cgi?id=1152776
+
+Remove this patch once we switch to the firefox-38 branch (where the
+#ifdef JS_HAVE_SYMBOLS is gone).
+
+--- js/src/jsprototypes.h.orig 2015-04-11 19:06:44.000000000 +0200
++++ js/src/jsprototypes.h      2015-04-11 19:06:31.000000000 +0200
+@@ -62,7 +62,7 @@
+ #define IF_SAB(real,imaginary) imaginary
+ #endif
+ 
+-#ifdef JS_HAS_SYMBOLS
++#if 1
+ #define IF_SYMBOLS(real,imaginary) real
+ #else
+ #define IF_SYMBOLS(real,imaginary) imaginary