From 61c95bfa2aa30909de41811d836a86911f220062 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Wed, 13 Jul 2022 20:17:06 -0500
Subject: [PATCH] Xorg Font Updates:

Update to font-util-1.3.3 (Xorg Font)
Update to encodings-1.0.6 (Xorg Font)
---
 introduction/welcome/changelog.xml | 12 ++++++++++++
 x/installing/x7font.xml            | 14 +++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bed2a0e704..311ff2e94d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,18 @@
     <listitem>
       <para>July 13th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to encodings-1.0.6 (Xorg Font). Fixes
+          <ulink url="&blfs-ticket-root;16785">#16785</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to font-util-1.3.3 (Xorg Font). Fixes
+          <ulink url="&blfs-ticket-root;16786">#16786</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Adapt Xorg Fonts instructions to look for any
+          tarball by a given name, instead of locking to bz2.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to xmessage-1.0.6 (Xorg App). Fixes
           <ulink url="&blfs-ticket-root;16784">#16784</ulink>.</para>
diff --git a/x/installing/x7font.xml b/x/installing/x7font.xml
index ff218fa71b..27074cd1e4 100644
--- a/x/installing/x7font.xml
+++ b/x/installing/x7font.xml
@@ -10,8 +10,8 @@
   <!ENTITY x7fonts-buildsize     "8.8 MB">
   <!ENTITY x7fonts-time          "0.1 SBU">
 
-  <!ENTITY encodings-version               "1.0.5">
-  <!ENTITY encodings-md5sum                "bbae4f247b88ccde0e85ed6a403da22a">
+  <!ENTITY encodings-version               "1.0.6">
+  <!ENTITY encodings-md5sum                "c2bcfdc52b8b6462228342cedae2fed9">
 
   <!ENTITY font-adobe-utopia-type1-version "1.0.4">
   <!ENTITY font-adobe-utopia-type1-md5sum  "fcf24554c348df3c689b91596d7f9971">
@@ -31,8 +31,8 @@
   <!ENTITY font-misc-ethiopic-version      "1.0.4">
   <!ENTITY font-misc-ethiopic-md5sum       "4ee18ab6c1edf636b8e75b73e6037371">
 
-  <!ENTITY font-util-version               "1.3.2">
-  <!ENTITY font-util-md5sum                "3d6adb76fdd072db8c8fae41b40855e8">
+  <!ENTITY font-util-version               "1.3.3">
+  <!ENTITY font-util-md5sum                "d92913afdcd8ac008225a8bd06488702">
 
   <!ENTITY font-xfree86-type1-version      "1.0.4">
   <!ENTITY font-xfree86-type1-md5sum       "3eeb3fb44690b477d510bbd8f86cf5aa">
@@ -115,8 +115,8 @@
     </para>
 
 <screen><userinput>cat &gt; font-&xorg-version;.md5 &lt;&lt; "EOF"
-<literal>&font-util-md5sum;  font-util-&font-util-version;.tar.bz2
-&encodings-md5sum;  encodings-&encodings-version;.tar.bz2
+<literal>&font-util-md5sum;  font-util-&font-util-version;.tar.xz
+&encodings-md5sum;  encodings-&encodings-version;.tar.xz
 &font-alias-md5sum;  font-alias-&font-alias-version;.tar.bz2
 &font-adobe-utopia-type1-md5sum;  font-adobe-utopia-type1-&font-adobe-utopia-type1-version;.tar.bz2
 &font-bh-ttf-md5sum;  font-bh-ttf-&font-bh-ttf-version;.tar.bz2
@@ -156,7 +156,7 @@ md5sum -c ../font-&xorg-version;.md5</userinput></screen>
 
 <screen><userinput>for package in $(grep -v '^#' ../font-&xorg-version;.md5 | awk '{print $2}')
 do
-  packagedir=${package%.tar.bz2}
+  packagedir=${package%.tar.?z*}
   tar -xf $package
   pushd $packagedir
     ./configure $XORG_CONFIG