From a764b19f5d35b806ffa0a5fa50314852136cb90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 22 Aug 2012 10:11:08 +0200 Subject: [PATCH 1/2] add fix for secondary arches from xulrunner --- firefox.spec | 7 ++++++- mozilla-750620.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 mozilla-750620.patch 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 - 14.0.1-3 +- add fix for secondary arches from xulrunner + * Wed Aug 1 2012 Martin Stransky - 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 +# 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 From b5a3a297c03f9d04527fff7b15b90178d7a02d61 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 27 Aug 2012 14:38:21 +0200 Subject: [PATCH 2/2] Update to 15.0 --- .gitignore | 2 ++ firefox.spec | 11 +++++++---- sources | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a06382c..e44b7da 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-13.0.1-20120616.tar.xz /firefox-14.0.1.source.tar.bz2 /firefox-langpacks-14.0.1-20120716.tar.xz +/firefox-15.0.source.tar.bz2 +/firefox-langpacks-15.0-20120827.tar.xz diff --git a/firefox.spec b/firefox.spec index b264999..0514463 100644 --- a/firefox.spec +++ b/firefox.spec @@ -16,7 +16,7 @@ %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -%global xulrunner_version 14.0.1 +%global xulrunner_version 15.0 %global xulrunner_release 1 %global alpha_version 0 %global beta_version 0 @@ -51,14 +51,14 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 14.0.1 -Release: 3%{?pre_tag}%{?dist} +Version: 15.0 +Release: 1%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20120716.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20120827.tar.xz %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -393,6 +393,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Aug 27 2012 Martin Stransky - 15.0-1 +- update 15.0 + * Wed Aug 22 2012 Dan Horák - 14.0.1-3 - add fix for secondary arches from xulrunner diff --git a/sources b/sources index 5f04ddb..2e13308 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c2f884f0f6c41c65cf20f678a1ee7191 firefox-14.0.1.source.tar.bz2 -5b9d27ba6054b9c81e41572898fb813d firefox-langpacks-14.0.1-20120716.tar.xz +64220887a349515f16e5aa990acb4db3 firefox-15.0.source.tar.bz2 +8b93954aa49bff344386b03977b81409 firefox-langpacks-15.0-20120827.tar.xz