Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/files/, www-client/firefox/
Date: Sun, 01 Mar 2015 18:41:12
Message-Id: 1425234214.ecb55af0b6e0cba65df5b6b0595c3e81b488d8a7.axs@gentoo
1 commit: ecb55af0b6e0cba65df5b6b0595c3e81b488d8a7
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 1 18:23:34 2015 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 1 18:23:34 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=ecb55af0
7
8 another disable-ion fix
9
10 ---
11 .../files/firefox-36.0-depollute-CONST-from-dtoa.patch | 18 ++++++++++++++++++
12 www-client/firefox/firefox-36.0.ebuild | 1 +
13 2 files changed, 19 insertions(+)
14
15 diff --git a/www-client/firefox/files/firefox-36.0-depollute-CONST-from-dtoa.patch b/www-client/firefox/files/firefox-36.0-depollute-CONST-from-dtoa.patch
16 new file mode 100644
17 index 0000000..137bbfd
18 --- /dev/null
19 +++ b/www-client/firefox/files/firefox-36.0-depollute-CONST-from-dtoa.patch
20 @@ -0,0 +1,18 @@
21 +--- a/mozilla-release/js/src/dtoa.c 2015-03-01 12:51:12.950912536 -0500
22 ++++ b/mozilla-release/js/src/dtoa.c 2015-03-01 12:57:49.670919777 -0500
23 +@@ -245,6 +245,7 @@
24 + #endif
25 +
26 + #ifndef CONST
27 ++#define DTOA_UNSETCONSTDEF
28 + #ifdef KR_headers
29 + #define CONST /* blank */
30 + #else
31 +@@ -3246,3 +3247,7 @@
32 + *rve = s;
33 + return s0;
34 + }
35 ++
36 ++#ifdef DTOA_UNSETCONSTDEF
37 ++#undef CONST
38 ++#endif
39
40 diff --git a/www-client/firefox/firefox-36.0.ebuild b/www-client/firefox/firefox-36.0.ebuild
41 index 56569e5..a3cc92f 100644
42 --- a/www-client/firefox/firefox-36.0.ebuild
43 +++ b/www-client/firefox/firefox-36.0.ebuild
44 @@ -148,6 +148,7 @@ src_prepare() {
45
46 epatch "${FILESDIR}"/${PN}-35.0-gmp-clearkey-sprintf.patch
47 epatch "${FILESDIR}"/${PN}-36.0-disable-ion.patch
48 + epatch "${FILESDIR}"/${PN}-36.0-depollute-CONST-from-dtoa.patch
49
50 # Allow user to apply any additional patches without modifing ebuild
51 epatch_user