[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, www-client/firefox/files/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     dce53a77941ddae5398a7aec4c4fd8b12cef168e
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 01:47:02 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 01:47:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=dce53a77

Update patch for no-jit

---
 www-client/firefox/Manifest               |    2 +-
 www-client/firefox/files/bug-846986.patch |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 7d7b088..ebc37a5 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,4 @@
-AUX bug-846986.patch 749 SHA256 81cfda43f97b153c1918311bdd6c7c5d131bb2ee886c59ba2093d1d952e7e466 SHA512 b9ffd5a83538f545155ab37c8b533940aefe8d07f78b7a50ee9670d0f2ae5a2eb0c8c501ef87948060d7d4f6e01bc2f9e22fb92752957ba87514c77382a32852 WHIRLPOOL 6ab558d9083c51487e52b53af7b8b8523ee04889015a8ca2eaa2c7b80f25266ea5b5b7749c7806b63703c8f11385b6c340452a6fa5c9182d48b3395da42adc39
+AUX bug-846986.patch 774 SHA256 5aedbb6cc5d130b189a7b6957a410816848d21e390f15a4ae12085ebea5cec06 SHA512 7796b9be215c3b8e8e74c823ed88833323ca250e480682a8c773ec0031e9f8945c15e955afea47a2f191b07cab631562668792352c0e6c0609fc9379518559b2 WHIRLPOOL a743f65cfb6f42a8596d50be26e0e8d47ba10fa8226d1b91c4f7f30d8a7c2d313f56577f2bb4ff7b4505520056ac5e057324da116388739cc4a8579610908e98
 AUX firefox-14.0_beta7-gst-aac-mp3.patch 2454 SHA256 ef3e6539d292629a52a592cecd90a23562480d7280cfd3883d4407ad06e418a7 SHA512 ecd4b594371b6ff00980fd79959805e87e2f54deb5b790c246c7e592b5c29e7e847c3a9863730c891532a5180c67937e73f8474aa3e4a16b94a35ba4e29624ad WHIRLPOOL cc977bd7cc1b48162e906ad4541592b153d9a0434c8d608fdb2b281ba143385a95808135e967876813435a31caf323f4f0b28bc6751d5285969d7c6dfe46874e
 AUX firefox-14.0_beta7-gst-youtube-h264.patch 1437 SHA256 9b871769727e6d16939c55695b4f08c6b460c3f6cf5bce46ce429f40c4801669 SHA512 b5964f9e569281209db492d27f6f1c12fb316fd52bb67e624ed438a3c005018f1c5554f6c976ab226541dc86a3ac47e26a07146c1cf9f549685d03605e217909 WHIRLPOOL 928bb7abe481188ad229fd833fd282e388cbf65166477c65e166f0af83784e4d3219cc4d2b8127df2cad13213d1cecfbb26afe9f6dc2059618c7f7c39c52fd6a
 AUX firefox-15.0-fix-gstreamer-html5-crash.patch 1094 SHA256 1fa2a1963ef3146ef71a51affc46179fdae5fcd5a4bfdf5acb3da0f035b482f2 SHA512 42b8fc013ee061f9b7c00d347fe2712c2a1110574f578ae815dd4b5287dfa27b5643c74d41f2e2913d147017026d61f8b7a3603b2a40586f30f0e70c41f6af74 WHIRLPOOL dae601e40e1e9cfcb9775313ef5f5b57af40124a64e204261ef6de05b01533df36e28e333356ba2d09ada996e82a882ef492fa0efbd4c7cc06572dde16d83346

diff --git a/www-client/firefox/files/bug-846986.patch b/www-client/firefox/files/bug-846986.patch
index df4f1a5..7969f65 100644
--- a/www-client/firefox/files/bug-846986.patch
+++ b/www-client/firefox/files/bug-846986.patch
@@ -1,13 +1,14 @@
 # HG changeset patch
-# Parent fd0973ef9744d3a0e4f6febf7e83c3b7f94de899
-# User Steve Singer <steve@ssinger.info>
-Bug 846986 - Include inline member functions in SPSProfiler to avoid undefined symbols at link time
+# 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
-@@ -10,16 +10,19 @@
- #include "jsnum.h"
+@@ -11,16 +11,18 @@
  #include "jsscript.h"
  
  #include "methodjit/MethodJIT.h"
@@ -15,10 +16,9 @@ diff --git a/js/src/vm/SPSProfiler.cpp b/js/src/vm/SPSProfiler.cpp
  
  #include "vm/SPSProfiler.h"
  #include "vm/StringBuffer.h"
-+#include "jsatominlines.h"
-+#include "jscntxtinlines.h"
-+#include "jsobjinlines.h"
  
++#include "jsscriptinlines.h"
++
  using namespace js;
  
  using mozilla::DebugOnly;
@@ -26,4 +26,4 @@ diff --git a/js/src/vm/SPSProfiler.cpp b/js/src/vm/SPSProfiler.cpp
  SPSProfiler::SPSProfiler(JSRuntime *rt)
    : rt(rt),
      stack_(NULL),
-
+     size_(NULL),