From 5c2571e3812da23706b44ef29bd3e8267856982c Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 10 Jun 2021 15:34:09 -0500
Subject: [PATCH] Update packages.

Update to gptfdisk-1.0.8.
Update to pipewire-0.3.30.
Update to xscreensaver-6.01.
Update to fuse3-3.10.4.
---
 introduction/welcome/changelog.xml | 22 +++++++++++++++++
 multimedia/libdriv/pipewire.xml    |  6 ++---
 packages.ent                       |  8 +++---
 postlfs/filesystems/fuse3.xml      | 39 ++++++------------------------
 postlfs/filesystems/gptfdisk.xml   |  6 ++---
 xsoft/other/xscreensaver.xml       |  6 ++---
 6 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e5cf8c45cb..f19546bf48 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,28 @@
     </listitem>
     -->
 
+    <listitem>
+      <para>June 10th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gptfdisk-1.0.8. Fixes
+          <ulink url="&blfs-ticket-root;15158">#15158</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pipewire-0.3.30. Fixes
+          <ulink url="&blfs-ticket-root;15157">#15157</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xscreensaver-6.01. Fixes
+          <ulink url="&blfs-ticket-root;15156">#15156</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to fuse3-3.10.4. Fixes
+          <ulink url="&blfs-ticket-root;15155">#15155</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 9th, 2021</para>
       <itemizedlist>
diff --git a/multimedia/libdriv/pipewire.xml b/multimedia/libdriv/pipewire.xml
index 972415fd4e..ca3415b626 100644
--- a/multimedia/libdriv/pipewire.xml
+++ b/multimedia/libdriv/pipewire.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY pipewire-download-http "https://github.com/PipeWire/pipewire/archive/&pipewire-version;/pipewire-&pipewire-version;.tar.gz">
   <!ENTITY pipewire-download-ftp  " ">
-  <!ENTITY pipewire-md5sum        "fdd4147e8a131f506ba0072093425d0f">
-  <!ENTITY pipewire-size          "1.4 MB">
-  <!ENTITY pipewire-buildsize     "117 MB (with tests)">
+  <!ENTITY pipewire-md5sum        "239da8b7273bd4c6d0138ab7513f927f">
+  <!ENTITY pipewire-size          "1.5 MB">
+  <!ENTITY pipewire-buildsize     "57 MB (with tests)">
   <!ENTITY pipewire-time          "0.4 SBU (Using parallelism=4; with tests)">
 ]>
 
diff --git a/packages.ent b/packages.ent
index 58627bae28..b1e1067b43 100644
--- a/packages.ent
+++ b/packages.ent
@@ -42,12 +42,12 @@
 <!-- Chapter 5 -->
 <!ENTITY btrfs-progs-version          "5.12.1">
 <!ENTITY dosfstools-version           "4.2">
-<!ENTITY fuse3-version                "3.10.3">
+<!ENTITY fuse3-version                "3.10.4">
 <!ENTITY jfsutils-version             "1.1.15">
 <!ENTITY lvm2-version                 "2.03.12">
 <!ENTITY mdadm-version                "4.1">
 <!ENTITY ntfs-3g-version              "2017.3.23">
-<!ENTITY gptfdisk-version             "1.0.7">
+<!ENTITY gptfdisk-version             "1.0.8">
 <!ENTITY parted-version               "3.4">
 <!ENTITY reiser-version               "3.6.27">
 <!ENTITY smartmontools-version        "7.2">
@@ -953,7 +953,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xarchiver-version            "0.5.4.17">
 <!ENTITY xchat-version                "2.8.8">
 <!ENTITY xdg-utils-version            "1.1.3">
-<!ENTITY xscreensaver-version         "6.00">
+<!ENTITY xscreensaver-version         "6.01">
 
 <!-- Part XI -->
 <!-- Chapter 42 -->
@@ -1008,7 +1008,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY mlt-version                  "6.24.0">
 <!ENTITY opal-version                 "3.10.10">
 <!ENTITY opus-version                 "1.3.1">
-<!ENTITY pipewire-version             "0.3.29">
+<!ENTITY pipewire-version             "0.3.30">
 <!ENTITY pulseaudio-major-version     "14.2">
 <!ENTITY pulseaudio-version           "&pulseaudio-major-version;">
 <!ENTITY sdl-version                  "1.2.15">
diff --git a/postlfs/filesystems/fuse3.xml b/postlfs/filesystems/fuse3.xml
index f9194baf5b..48ff715a6b 100644
--- a/postlfs/filesystems/fuse3.xml
+++ b/postlfs/filesystems/fuse3.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY fuse3-download-http "https://github.com/libfuse/libfuse/releases/download/fuse-&fuse3-version;/fuse-&fuse3-version;.tar.xz">
   <!ENTITY fuse3-download-ftp  " ">
-  <!ENTITY fuse3-md5sum        "75546f9070323b8ce69c2ed8ffff20c4">
-  <!ENTITY fuse3-size          "2.4 MB">
-  <!ENTITY fuse3-buildsize     "156 MB">
+  <!ENTITY fuse3-md5sum        "55b87e9ed691c2fa698e491241985b4a">
+  <!ENTITY fuse3-size          "2.7 MB">
+  <!ENTITY fuse3-buildsize     "150 MB">
   <!ENTITY fuse3-time          "0.1 SBU (add 0.4 SBU for tests)">
 ]>
 
@@ -76,7 +76,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="doxygen"/> (to rebuild the API documentation) and
-      <ulink url="https://pypi.org/project/pytest/">pytest</ulink> (for tests)
+      <ulink url="https://pypi.org/project/pytest/">pytest</ulink> (required for tests)
     </para>
 
     <para condition="html" role="usernotes">
@@ -112,12 +112,6 @@
   <sect2 role="installation">
     <title>Installation of Fuse</title>
 
-    <para>
-      First, fix a build issue caused by GCC-11.1:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/iostream/a #include &lt;limits&gt;' example/cxxopts.hpp</userinput></screen>
-
     <para>
       Install <application>Fuse</application> by running the following
       commands:
@@ -137,13 +131,9 @@ ninja</userinput></screen>
       it, issue:
     </para> 
 
-<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
-
-<!--
-    <para>
-      This package does not come with a test suite.
-    </para>
--->
+<screen remap="doc"><userinput>pushd .. &amp;&amp;
+  doxygen doc/Doxyfile &amp;&amp;
+popd</userinput></screen>
 
     <para>
       To test the results, run (as the <systemitem
@@ -155,7 +145,7 @@ ninja</userinput></screen>
 
     <para>
       The <ulink url="https://pypi.org/project/pytest/">pytest</ulink>
-       Python module is needed for the tests.
+       Python module is required for the tests.
     </para>
 
     <para>
@@ -184,19 +174,6 @@ cp -Rv ../doc/html  /usr/share/doc/fuse-&fuse3-version;</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/meson-buildtype-release.xml"/>
 
-<!-- FIXME: Removed with merged-/usr changes
-    <para>
-      <command>mv ... libfuse3.so.3*; ln ... libfuse3.so</command>: 
-      These commands install the libraries in the /lib directory.
-    </para>
--->
-
-<!--
-    <para>
-      <command>unzip ...</command>: This uncompresses the installed man pages
-      to be consistent with the rest of the man pages.
-    </para>
--->
   </sect2>
 
   <sect2 role="configuration" id="fuse-configuration">
diff --git a/postlfs/filesystems/gptfdisk.xml b/postlfs/filesystems/gptfdisk.xml
index a31b580069..abeacdc13f 100644
--- a/postlfs/filesystems/gptfdisk.xml
+++ b/postlfs/filesystems/gptfdisk.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY gptfdisk-download-http "&sourceforge-dl;/gptfdisk/gptfdisk-&gptfdisk-version;.tar.gz">
   <!ENTITY gptfdisk-download-ftp  " ">
-  <!ENTITY gptfdisk-md5sum        "9ce09147b75866ac1877d417092d21e4">
-  <!ENTITY gptfdisk-size          "204 KB">
-  <!ENTITY gptfdisk-buildsize     "3.3 MB">
+  <!ENTITY gptfdisk-md5sum        "74684c4eb0e6d5a1839e4bb0bba36fa2">
+  <!ENTITY gptfdisk-size          "208 KB">
+  <!ENTITY gptfdisk-buildsize     "2.5 MB">
   <!ENTITY gptfdisk-time          "less than 0.1 SBU (0.2 SBU for tests)">
 ]>
 
diff --git a/xsoft/other/xscreensaver.xml b/xsoft/other/xscreensaver.xml
index e4eef1290b..b48a9a3ae4 100644
--- a/xsoft/other/xscreensaver.xml
+++ b/xsoft/other/xscreensaver.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xscreensaver-download-http "https://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
   <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "0c77c3d46a4b4d11fdef1d368349ed7a">
+  <!ENTITY xscreensaver-md5sum        "a78738a034c7dc1c7960048c8a670588">
   <!ENTITY xscreensaver-size          "27 MB">
-  <!ENTITY xscreensaver-buildsize     "265 MB">
-  <!ENTITY xscreensaver-time          "1.0 SBU">
+  <!ENTITY xscreensaver-buildsize     "244 MB">
+  <!ENTITY xscreensaver-time          "o.3 SBU (Using parallelism=4)">
 ]>
 
 <sect1 id="xscreensaver" xreflabel="XScreenSaver-&xscreensaver-version;">