From 4e5920a5ee873700bc71dbe867eb84a26c1c2582 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Thu, 4 Apr 2024 16:18:23 -0500
Subject: [PATCH] Firefox: Use the Google API key and discontinue the MLS one.

---
 introduction/welcome/changelog.xml |  5 +++++
 xsoft/graphweb/firefox.xml         | 18 ++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 67b83b81cc..a4c56ec9c2 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,11 @@
     <listitem>
       <para>April 4th, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt Firefox to use Google's Location Service by
+          removing our MLS API key. Fixes
+          <ulink url="&blfs-ticket-root;19541">#19541</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Adapt Geoclue to use Google's Location Service due
           to the Mozilla Location Service shutdown. Fixes
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index 01bc461c82..0ff4e770a1 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -209,11 +209,7 @@ tar: Exiting with failure status due to previous errors
 # to use geolocation web services, comment out this line
 ac_add_options --disable-necko-wifi
 
-# API Keys for geolocation APIs - necko-wifi (above) is required for MLS
-# Uncomment the following line if you wish to use Mozilla Location Service
-#ac_add_options --with-mozilla-api-keyfile=$PWD/mozilla-key
-
-# Uncomment the following line if you wish to use Google's geolocation API
+# Uncomment the following line if you wish to use Google's Geolocation API
 # (needed for use with saved maps with Google Maps)
 #ac_add_options --with-google-location-service-api-keyfile=$PWD/google-key
 
@@ -339,12 +335,11 @@ esac</userinput></screen>
     <note>
       <para>
         <!-- Taken from Arch Linux - an immensely helpful link - Thanks -->
-        The Google and Mozilla API Keys below are specific to LFS. If using
-        these instructions for another distro, or if you intend to distribute
+        The Google API Key below is specific to LFS. If using these
+        instructions for another distro, or if you intend to distribute
         binary copies of the software using these instructions, please obtain
-        your own keys following the instructions located at
-        <ulink url="https://www.chromium.org/developers/how-tos/api-keys"/> and
-        <ulink url="https://location.services.mozilla.com/api"/> respectively.
+        your own key following the instructions located at
+        <ulink url="https://www.chromium.org/developers/how-tos/api-keys"/>.
         <!-- BLFS Devs, register an account at Google with your
         @linuxfromscratch.org email address, and I'll make you an administrator
         for the 'Google APIs for LFS' project (where the API and OAuth keys
@@ -352,8 +347,7 @@ esac</userinput></screen>
       </para>
     </note>
 
-<screen><userinput>echo "AIzaSyDxKL42zsPjbke5O8_rPVpVrLrJ8aeE9rQ" > google-key
-echo "613364a7-9418-4c86-bcee-57e32fd70c23" > mozilla-key</userinput></screen>
+<screen><userinput>echo "AIzaSyDxKL42zsPjbke5O8_rPVpVrLrJ8aeE9rQ" > google-key</userinput></screen>
 
     <note>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"