From 23001f84c77daa8d80f76e2772a41730bb2d19d7 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 17 May 2018 02:03:27 +0000
Subject: [PATCH] extra/firefox: fixes

---
 extra/firefox/PKGBUILD | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index d5fed081e..7aeeabf9b 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -8,10 +8,10 @@
 #  - use tarball source
 #  - patch for skia from chromium
 #  - revert change for clang that breaks gcc build on ARM
+#  - upstream patch for AArch64
 
 buildarch=12
 highmem=1
-noautobuild=1
 
 pkgname=firefox
 pkgver=60.0
@@ -35,7 +35,8 @@ source=("https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${pkgve
         $pkgname.desktop firefox-symbolic.svg
         no-crmf.diff
         skia_buildfix.patch
-        https://hg.mozilla.org/mozilla-central/raw-rev/537f4d1d837a)
+        https://hg.mozilla.org/mozilla-central/raw-rev/537f4d1d837a
+        https://hg.mozilla.org/mozilla-unified/raw-rev/800abe66894d)
 sha256sums=('fc2660c018af79d028c4418c6798020933ee106e19849ca7014f8403ad759eaa'
             'a3fb3c3b6fb775c99afdbad507848b77c5e4bbaac2e8ceeb1bfb47699c4b6268'
             '8422030440032535d918844263fbd92d39bff207acb5fff55ed0afee38bcf582'
@@ -43,7 +44,8 @@ sha256sums=('fc2660c018af79d028c4418c6798020933ee106e19849ca7014f8403ad759eaa'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
             '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
             '3da0ab55bf92307fe80ed7c9cce6443f5bebc96ba50e751d24f7302786a0406e'
-            '9fa42f3a4ccd255b56f4157119c08ff19df9f972aa25af4cbb685e3683139c24')
+            '9fa42f3a4ccd255b56f4157119c08ff19df9f972aa25af4cbb685e3683139c24'
+            '23df437b04279e6abac8ee53df9e191dfa93f0079e9d73389f7a460604d749c1')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -132,6 +134,8 @@ END
 
   patch -p2 -d gfx/skia -i "${srcdir}/skia_buildfix.patch"
   patch -Rp1 -i ../537f4d1d837a
+  patch -p1 -i ../800abe66894d
+  export MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 }
 
 build() {