From d4be59b85067744001ff2d7ebfac6c5f017062be Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
Date: Mar 31 2015 12:18:06 +0000
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@redhat.com> - 37.0-3
+- Fix build on AArch64 (based on upstream skia changes)
+
 * Fri Mar 27 2015 Martin Stransky <stransky@redhat.com> - 37.0-2
 - Added tooltip patch (mozbz#1144643)