From a2bf93ed01202f370ea43adc13f0bbcb3d08d47a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 3 Jul 2015 01:23:30 +0000
Subject: [PATCH] extra/firefox to 39.0-1

---
 extra/firefox/PKGBUILD  | 27 +++++++++++++++++++++++----
 extra/firefox/mozconfig |  1 +
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index 00331c745..ac401f851 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -5,7 +5,7 @@
 # remove when bumped upstream
 
 pkgname=firefox
-pkgver=38.0.5
+pkgver=39.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -24,10 +24,13 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 install=firefox.install
 options=('!emptydirs' '!makeflags')
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-        mozconfig firefox.desktop firefox-install-dir.patch vendor.js
+        mozconfig
+        firefox.desktop
+        firefox-install-dir.patch
+        vendor.js
         firefox-fixed-loading-icon.png)
-sha256sums=('4f53506d1e8a724a165ee509d9448fa7c9b7203183f53ae313063eb144a403b6'
-            'ffcb2a0ba2ed08f74931a11043717391ef380234cadccc6f0c13f1186ad80e8b'
+sha256sums=('7e25014deb926df9220c3ab40ac6816c13a04c4cf7bd89b08fc1743307df1096'
+            '4704798b46be00712a87443be8ed6184dfb5d337e8cc74dbe029c0a25a47add6'
             'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
@@ -38,7 +41,17 @@ validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
 # get your own set of keys. Feel free to contact foutrelis@archlinux.org for
 # more information.
+#  - Arch Linux ARM has obtained permission to use the Arch Linux keys.
 _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
+_google_default_client_id=413772536636.apps.googleusercontent.com
+_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
+
+# Mozilla API keys (see https://location.services.mozilla.com/api)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys. Feel free to contact heftig@archlinux.org for
+# more information.
+_mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
+
 
 prepare() {
   cd mozilla-release
@@ -49,6 +62,12 @@ prepare() {
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 
+  echo -n "$_google_default_client_id $_google_default_client_secret" >google-oauth-api-key
+  echo "ac_add_options --with-google-oauth-api-keyfile=\"$PWD/google-oauth-api-key\"" >>.mozconfig
+
+  echo -n "$_mozilla_api_key" >mozilla-api-key
+  echo "ac_add_options --with-mozilla-api-keyfile=\"$PWD/mozilla-api-key\"" >>.mozconfig
+
   mkdir "$srcdir/path"
 
   # WebRTC build tries to execute "python" and expects Python 2
diff --git a/extra/firefox/mozconfig b/extra/firefox/mozconfig
index 7f3d3bfe0..579e7ce18 100644
--- a/extra/firefox/mozconfig
+++ b/extra/firefox/mozconfig
@@ -2,6 +2,7 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+ac_add_options --enable-pie
 
 ac_add_options --enable-official-branding