rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f23

Browse Source
This commit is contained in:
Martin Stransky 2016-07-27 09:48:01 +02:00
commit b5d279664f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firefox.spec
View File

@ -264,7 +264,7 @@ cd %{tarballdir}
%endif %endif
%patch224 -p1 -b .1170092 %patch224 -p1 -b .1170092
%if 0%{?fedora} > 23 %if 0%{?fedora} > 23
#%patch304 -p2 -b .1253216 %patch304 -p2 -b .1253216
#%patch222 -p1 -b .gtk3-20 #%patch222 -p1 -b .gtk3-20
%endif %endif
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777

20
mozilla-1253216.patch
View File

@ -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 diff -up firefox-48.0/js/src/jit/AtomicOperations.h.old firefox-48.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-48.0/js/src/jit/AtomicOperations.h.old 2016-07-27 09:42:43.148175449 +0200
+++ firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h 2016-03-03 13:13:34.915015391 +0100 +++ firefox-48.0/js/src/jit/AtomicOperations.h 2016-07-27 09:41:13.000000000 +0200
@@ -305,7 +305,7 @@ AtomicOperations::isLockfree(int32_t siz @@ -340,7 +340,7 @@ AtomicOperations::isLockfree(int32_t siz
|| defined(__ppc__) || defined(__PPC__) # elif defined(__aarch64__)
# include "jit/none/AtomicOperations-ppc.h" # include "jit/arm64/AtomicOperations-arm64.h"
#elif defined(JS_CODEGEN_NONE) # else
-# include "jit/none/AtomicOperations-none.h" -# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always
+# include "jit/none/AtomicOperations-ppc.h" +# include "jit/none/AtomicOperations-ppc.h"
# endif
#elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
# include "jit/x86-shared/AtomicOperations-x86-shared.h" # include "jit/x86-shared/AtomicOperations-x86-shared.h"
#else