diff options
| author | Dan Horák <dan@danny.cz> | 2012-08-22 10:11:08 +0200 |
|---|---|---|
| committer | Dan Horák <dan@danny.cz> | 2012-08-22 10:11:08 +0200 |
| commit | a764b19f5d35b806ffa0a5fa50314852136cb90e (patch) | |
| tree | 7bdb5aebac42ad93dad6a298827a6e13ddd92ef7 | |
| parent | removed StartupWMClass (rhbz#844860) (diff) | |
| download | librewolf-fedora-ff-a764b19f5d35b806ffa0a5fa50314852136cb90e.tar.gz librewolf-fedora-ff-a764b19f5d35b806ffa0a5fa50314852136cb90e.tar.bz2 librewolf-fedora-ff-a764b19f5d35b806ffa0a5fa50314852136cb90e.zip | |
add fix for secondary arches from xulrunner
| -rw-r--r-- | firefox.spec | 7 | ||||
| -rw-r--r-- | mozilla-750620.patch | 33 |
2 files changed, 39 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec index 32634f2..b264999 100644 --- a/firefox.spec +++ b/firefox.spec @@ -52,7 +52,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 14.0.1 -Release: 2%{?pre_tag}%{?dist} +Release: 3%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -76,6 +76,7 @@ Patch14: firefox-5.0-asciidel.patch Patch15: firefox-8.0-enable-addons.patch # Upstream patches +Patch20: mozilla-750620.patch %if %{official_branding} # Required by Mozilla Corporation @@ -120,6 +121,7 @@ cd %{tarballdir} %patch15 -p2 -b .addons # Upstream patches +%patch20 -p1 -b .750620 %if %{official_branding} # Required by Mozilla Corporation @@ -391,6 +393,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Aug 22 2012 Dan Horák <dan[at]danny.cz> - 14.0.1-3 +- add fix for secondary arches from xulrunner + * Wed Aug 1 2012 Martin Stransky <stransky@redhat.com> - 14.0.1-2 - removed StartupWMClass (rhbz#844860) diff --git a/mozilla-750620.patch b/mozilla-750620.patch new file mode 100644 index 0000000..c8c6d10 --- /dev/null +++ b/mozilla-750620.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User Mike Hommey <mh+mozilla@glandium.org> +# Date 1337607752 -7200 +# Node ID 93093285af6065c441a806e97ca8f79225a158c6 +# Parent 87c452c6444eecd226a30458e735d0cfaad714fd +Bug 750620 - Declare double conversion correctness for more architectures + +diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h +--- a/mfbt/double-conversion/utils.h ++++ b/mfbt/double-conversion/utils.h +@@ -48,17 +48,21 @@ + // An easy way to test if the floating-point operations are correct is to + // evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then + // the result is equal to 89255e-22. + // The best way to test this, is to create a division-function and to compare + // the output of the division with the expected result. (Inlining must be + // disabled.) + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + #if defined(_M_X64) || defined(__x86_64__) || \ +- defined(__ARMEL__) || \ ++ defined(__ARMEL__) || defined(__avr32__) || \ ++ defined(__hppa__) || defined(__ia64__) || \ ++ defined(__mips__) || defined(__powerpc__) || \ ++ defined(__sparc__) || defined(__s390__) || \ ++ defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) + // Windows uses a 64bit wide floating point stack. + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #else + #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS |