From c6ed3d01268264460a327d2f7d96b45a6a6480da Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 15 Mar 2022 10:55:25 -0500
Subject: [PATCH 1/4] Update to meson-0.61.3.

---
 chapter01/changelog.xml | 4 ++++
 packages.ent            | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4e7715d51..60943c051 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,10 @@
     <listitem>
       <para>2022-03-15</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.61.3. Fixes
+          <ulink url="&lfs-ticket-root;5023">#5023</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Update to expat-2.4.7. Fixes
           <ulink url="&lfs-ticket-root;5019">#5019</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 70d6198d7..655646889 100644
--- a/packages.ent
+++ b/packages.ent
@@ -490,10 +490,10 @@
 <!ENTITY markupsafe-fin-du "520 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.61.2">
-<!ENTITY meson-size "1,968 KB">
+<!ENTITY meson-version "0.61.3">
+<!ENTITY meson-size "1,965 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c">
+<!ENTITY meson-md5 "8998d77313d753a0c474d9bdf1738b2e">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "41 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">

From 9c7e6ff8533136b4c24b3e6ab062a0590973920e Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 16 Mar 2022 00:11:15 +0800
Subject: [PATCH 2/4] systemd: remove --strip-compoents=1 from man page
 installation command

systemd-man-pages-250.tar.xz has no additional leading components.

An errata is required.
---
 chapter08/systemd.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 22d067ad6..2ce2b1b83 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -180,7 +180,7 @@ meson --prefix=/usr                 \
 
     <para>Install the man pages:</para>
 
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz -C /usr/share/man</userinput></screen>
 
     <para>Remove a useless directory:</para>
 

From ce6088a1c17005e8db5e0f1b7260bc3ff2abf922 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 16 Mar 2022 00:14:14 +0800
Subject: [PATCH 3/4] changelog: dbus is systemd revision only

---
 chapter01/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 60943c051..cae05e442 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -100,7 +100,7 @@
           <para>[xry111] - Update to MarkupSafe-2.1.0. Fixes
           <ulink url="&lfs-ticket-root;5015">#5015</ulink>.</para>
         </listitem>
-        <listitem>
+        <listitem revision="systemd">
           <para>[xry111] - Update to dbus-1.14.0. Fixes
           <ulink url="&lfs-ticket-root;5017">#5017</ulink>.</para>
         </listitem>

From 4ce4f65526eaec8d758381c52b5efcb3ffae8368 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 15 Mar 2022 11:17:36 -0500
Subject: [PATCH 4/4] Ignore fop.log

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9e932c78f..f2a347215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ conditional.ent
 version.ent
 appendices/*.script
 *.swp
-
+fop.log