summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2016-07-27 09:48:07 +0200
committerMartin Stransky <stransky@redhat.com>2016-07-27 09:48:07 +0200
commit2737b839e244aa523813a5c21d7782618e332ead (patch)
tree87541b34f3815fd34773db93507e171f91220c6b
parentMerge branch 'master' into f24 (diff)
parentAdded arm build fix (diff)
downloadlibrewolf-fedora-ff-2737b839e244aa523813a5c21d7782618e332ead.tar.gz
librewolf-fedora-ff-2737b839e244aa523813a5c21d7782618e332ead.tar.bz2
librewolf-fedora-ff-2737b839e244aa523813a5c21d7782618e332ead.zip
Merge branch 'master' into f24
-rw-r--r--firefox.spec2
-rw-r--r--mozilla-1253216.patch20
2 files changed, 11 insertions, 11 deletions
diff --git a/firefox.spec b/firefox.spec
index cbc89d0..021c300 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -264,7 +264,7 @@ cd %{tarballdir}
%endif
%patch224 -p1 -b .1170092
%if 0%{?fedora} > 23
-#%patch304 -p2 -b .1253216
+%patch304 -p2 -b .1253216
#%patch222 -p1 -b .gtk3-20
%endif
%patch402 -p1 -b .1196777
diff --git a/mozilla-1253216.patch b/mozilla-1253216.patch
index 6de0720..c9252da 100644
--- a/mozilla-1253216.patch
+++ b/mozilla-1253216.patch
@@ -1,12 +1,12 @@
-diff -up firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h.old firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h
---- firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h.old 2016-03-01 09:45:01.000000000 +0100
-+++ firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h 2016-03-03 13:13:34.915015391 +0100
-@@ -305,7 +305,7 @@ AtomicOperations::isLockfree(int32_t siz
- || defined(__ppc__) || defined(__PPC__)
- # include "jit/none/AtomicOperations-ppc.h"
- #elif defined(JS_CODEGEN_NONE)
--# include "jit/none/AtomicOperations-none.h"
-+# include "jit/none/AtomicOperations-ppc.h"
+diff -up firefox-48.0/js/src/jit/AtomicOperations.h.old firefox-48.0/js/src/jit/AtomicOperations.h
+--- firefox-48.0/js/src/jit/AtomicOperations.h.old 2016-07-27 09:42:43.148175449 +0200
++++ firefox-48.0/js/src/jit/AtomicOperations.h 2016-07-27 09:41:13.000000000 +0200
+@@ -340,7 +340,7 @@ AtomicOperations::isLockfree(int32_t siz
+ # elif defined(__aarch64__)
+ # include "jit/arm64/AtomicOperations-arm64.h"
+ # else
+-# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always
++# include "jit/none/AtomicOperations-ppc.h"
+ # endif
#elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
# include "jit/x86-shared/AtomicOperations-x86-shared.h"
- #else
bgstack15