stransky pushed to firefox (f21). "Merge branch 'master' into f21"

Tue Apr 7 09:15:03 UTC 2015

>From d4be59b85067744001ff2d7ebfac6c5f017062be Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
Date: Tue, 31 Mar 2015 14:18:06 +0200
Subject: Fix build on AArch64 (based on upstream skia changes)

diff --git a/aarch64-fix-skia.patch b/aarch64-fix-skia.patch
new file mode 100644
index 0000000..4b9958d
--- /dev/null
+++ b/aarch64-fix-skia.patch
@@ -0,0 +1,18 @@
+Based on https://github.com/google/skia/commit/b79ff56de23fef680ae7187040f2d6a9516b553d
+
+Index: mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h
+===================================================================
+--- mozilla-release.orig/gfx/skia/trunk/src/core/SkUtilsArm.h
++++ mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h
+@@ -21,9 +21,9 @@
+ #define SK_ARM_NEON_MODE_ALWAYS   1
+ #define SK_ARM_NEON_MODE_DYNAMIC  2
+ 
+-#if defined(SK_CPU_ARM32) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT)
++#if defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT)
+ #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_DYNAMIC
+-#elif defined(SK_CPU_ARM32) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64)
++#elif defined(__ARM_HAVE_NEON)
+ #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_ALWAYS
+ #else
+ #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_NONE
diff --git a/firefox.spec b/firefox.spec
index 041ac7a..3114b83 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        37.0
-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
@@ -154,6 +154,9 @@ Patch413:        mozilla-975919-gtk3-hidpi.patch
 Patch414:        mozilla-1143686.patch
 Patch415:        mozilla-1144643.patch
 
+# Fix Skia Neon stuff on AArch64
+Patch500:        aarch64-fix-skia.patch
+
 %if %{official_branding}
 # Required by Mozilla Corporation
 
@@ -305,6 +308,8 @@ cd %{tarballdir}
 %patch415 -p1 -b .1144643
 %endif
 
+%patch500 -p1
+
 %if %{official_branding}
 # Required by Mozilla Corporation
 
@@ -798,6 +803,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Mar 31 2015 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 37.0-3
+- Fix build on AArch64 (based on upstream skia changes)
+
 * Fri Mar 27 2015 Martin Stransky <stransky at redhat.com> - 37.0-2
 - Added tooltip patch (mozbz#1144643)
 
-- 
cgit v0.10.2


>From 767c3940df6c3ed5879ece5c1089445069066b7a Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 6 Apr 2015 15:31:46 -0400
Subject: rebuild for libvpx 1.4.0


diff --git a/firefox.spec b/firefox.spec
index 3114b83..1c4d2c7 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        37.0
-Release:        3%{?pre_tag}%{?dist}
+Release:        4%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -803,6 +803,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr  6 2015 Tom Callaway <spot at fedoraproject.org> - 37.0-4
+- rebuild for libvpx 1.4.0
+
 * Tue Mar 31 2015 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 37.0-3
 - Fix build on AArch64 (based on upstream skia changes)
 
-- 
cgit v0.10.2


>From bf589ec03d3934330ea22d768ba8c0d2726d9b90 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky at anakreon.cz>
Date: Tue, 7 Apr 2015 11:12:55 +0200
Subject: Update to 37.0.1


diff --git a/.gitignore b/.gitignore
index dd01607..10b1b06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-36.0.4-20150321.tar.xz
 /firefox-langpacks-37.0-20150327.tar.xz
 /firefox-37.0.source.tar.bz2
+/firefox-langpacks-37.0.1-20150407.tar.xz
+/firefox-37.0.1.source.tar.bz2
diff --git a/firefox.spec b/firefox.spec
index 1c4d2c7..4bd9edb 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -106,14 +106,14 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        37.0
-Release:        4%{?pre_tag}%{?dist}
+Version:        37.0.1
+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}-20150327.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20150407.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -803,6 +803,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 7 2015 Martin Stransky <stransky at redhat.com> - 37.0.1-1
+- Update to 37.0.1
+
 * Mon Apr  6 2015 Tom Callaway <spot at fedoraproject.org> - 37.0-4
 - rebuild for libvpx 1.4.0
 
diff --git a/sources b/sources
index d85fd4c..1ff4cf7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1da9fa09bda70c1d77607c38427f143a  firefox-langpacks-37.0-20150327.tar.xz
-ccdec2d8f362a3782fe74e0ca7f79724  firefox-37.0.source.tar.bz2
+d08e8b73240bef4e4302093cfc0d540c  firefox-langpacks-37.0.1-20150407.tar.xz
+2d466d850ef9b0a71bce3b208f5f884c  firefox-37.0.1.source.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/firefox.git/commit/?h=f21&id=c7a1f10aa8c17193e003639d4cc5c0e0956d1b2d
