From 3bf88d0883c1b3376246b3048e92ce0f67fe618c Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 24 Jun 2020 21:06:01 +0000
Subject: [PATCH] Separate JS68 from firefox.

In preparation for firefox-78.0esr.
No intended changes to the rendered book.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23326 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/js68.xml    | 19 ++++++-------------
 packages.ent               |  3 +--
 xsoft/graphweb/firefox.xml |  1 -
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/general/genlib/js68.xml b/general/genlib/js68.xml
index 3c29973eff..aecb7441ca 100644
--- a/general/genlib/js68.xml
+++ b/general/genlib/js68.xml
@@ -6,15 +6,14 @@
 
   <!ENTITY js68-download-http "&mozilla-http;/firefox/releases/&firefox-version;esr/source/firefox-&firefox-version;esr.source.tar.xz">
   <!ENTITY js68-download-ftp  " ">
-  <!-- FIXME (that gets a highlight) - md5sum and size should match firefox -->
-  <!ENTITY firefox-md5sum     "a1156aed941b28a06115a9450a46563d">
-  <!ENTITY firefox-size       "303 MB">
+  <!ENTITY js68-md5sum        "a1156aed941b28a06115a9450a46563d">
+  <!ENTITY js68-size          "303 MB">
   <!ENTITY js68-buildsize     "2.8 GB (31 MB installed after removing 31MB static lib)">
   <!ENTITY js68-time          "2.4 SBU (with parallelism = 4)">
 ]>
 
 <!--<sect1 id="js68" xreflabel="js68-&JS68-version;">-->
-<sect1 id="js68" xreflabel="js68-&firefox-version;">
+<sect1 id="js68" xreflabel="js68-&JS68-version;">
   <?dbhtml filename="js68.html"?>
 
   <sect1info>
@@ -22,8 +21,7 @@
     <date>$Date$</date>
   </sect1info>
 
-<!--<title>JS-&JS68-version;</title>-->
-  <title>JS-&firefox-version;</title>
+  <title>JS-&JS68-version;</title>
 
   <indexterm zone="js68">
     <primary sortas="a-js68">js68</primary>
@@ -37,11 +35,6 @@
       written in C. JS68 is taken from Firefox.
     </para>
 
-    <!-- JS68 is only used by gjs at the moment -->
-
-    <!-- We'll need to remember to update js68 anytime there is a firefox
-         ESR update. -->
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -56,12 +49,12 @@
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &firefox-md5sum;
+          Download MD5 sum: &js68-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &firefox-size;
+          Download size: &js68-size;
         </para>
       </listitem>
       <listitem>
diff --git a/packages.ent b/packages.ent
index bea9915f20..f2ac7548d9 100644
--- a/packages.ent
+++ b/packages.ent
@@ -119,8 +119,7 @@
 <!ENTITY jansson-version              "2.13.1">
 <!--<!ENTITY JS52-version                 "52.2.1gnome1">-->
 <!ENTITY JS60-version                 "60.8.0">
-<!-- JS68 uses the firefox tarball
-<!ENTITY JS68-version -->
+<!ENTITY JS68-version                 "68.9.0">
 <!ENTITY json-c-version               "0.14">
 <!ENTITY json-glib-version            "1.4.4">
 <!ENTITY keyutils-version             "1.6.1">
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index 0f38fc6c75..9b29aa94a4 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -6,7 +6,6 @@
 
   <!ENTITY firefox-download-http "&mozilla-http;/firefox/releases/&firefox-version;esr/source/firefox-&firefox-version;esr.source.tar.xz">
   <!ENTITY firefox-download-ftp  " ">
-  <!-- FIXME the version, md5sum and size should be shared with js68 -->
   <!ENTITY firefox-md5sum        "a1156aed941b28a06115a9450a46563d">
   <!ENTITY firefox-size          "303 MB">
   <!-- NB with stylo, much of the build uses rust, and therefore cargo files.