diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2013-05-28 13:35:18 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2013-05-28 13:35:18 +0000 |
| commit | d5a5150b49997a2cda907c5f4e0943781270823c (patch) | |
| tree | fba01c4ff5fb9fd1cef25b7c1e098fb0e86ca6b4 /www-client/firefox | |
| parent | New snapshot. (diff) | |
| download | gentoo-2-d5a5150b49997a2cda907c5f4e0943781270823c.tar.gz gentoo-2-d5a5150b49997a2cda907c5f4e0943781270823c.tar.bz2 gentoo-2-d5a5150b49997a2cda907c5f4e0943781270823c.zip | |
add missing patch, bug 471568
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0xB4D088B4)
Diffstat (limited to 'www-client/firefox')
| -rw-r--r-- | www-client/firefox/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/firefox/files/bug-846986.patch | 29 |
2 files changed, 33 insertions, 1 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog index 08b837d9a528..1a9ab0c9e5e0 100644 --- a/www-client/firefox/ChangeLog +++ b/www-client/firefox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/firefox # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.242 2013/05/28 03:37:14 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.243 2013/05/28 13:35:18 anarchy Exp $ + + 28 May 2013; <anarchy@gentoo.org> +files/bug-846986.patch: + Add missing patch, bug #471568 *firefox-21.0 (28 May 2013) diff --git a/www-client/firefox/files/bug-846986.patch b/www-client/firefox/files/bug-846986.patch new file mode 100644 index 000000000000..7969f65bf5ef --- /dev/null +++ b/www-client/firefox/files/bug-846986.patch @@ -0,0 +1,29 @@ +# HG changeset patch +# User Jeff Walden <jwalden@mit.edu> +# Date 1365111823 25200 +# Node ID 489ab986ea69e1ba7746e383a267483db9d861ea +# Parent 04f2c0f0a220b409af15722eaec46304979f04ac +#include jsscriptinlines.h in SPSProfiler.cpp so that it builds in no-jit configurations. No bug, r=sparky + +diff --git a/js/src/vm/SPSProfiler.cpp b/js/src/vm/SPSProfiler.cpp +--- a/js/src/vm/SPSProfiler.cpp ++++ b/js/src/vm/SPSProfiler.cpp +@@ -11,16 +11,18 @@ + #include "jsscript.h" + + #include "methodjit/MethodJIT.h" + #include "methodjit/Compiler.h" + + #include "vm/SPSProfiler.h" + #include "vm/StringBuffer.h" + ++#include "jsscriptinlines.h" ++ + using namespace js; + + using mozilla::DebugOnly; + + SPSProfiler::SPSProfiler(JSRuntime *rt) + : rt(rt), + stack_(NULL), + size_(NULL), |