From ad240ea0050c2f8b51d27b95c01a37e93c8cbf25 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 11 May 2021 14:03:27 -0500
Subject: [PATCH 1/3] Update to glib-2.68.2

---
 general/genlib/glib2.xml           | 8 ++++----
 introduction/welcome/changelog.xml | 4 ++++
 packages.ent                       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/general/genlib/glib2.xml b/general/genlib/glib2.xml
index 34260b4758..f863b4e0d8 100644
--- a/general/genlib/glib2.xml
+++ b/general/genlib/glib2.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
   <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-md5sum        "bc9f2250be1f773bb17747d3b2e6a3ae">
-  <!ENTITY glib2-size          "4.8 MB">
-  <!ENTITY glib2-buildsize     "178 MB (add 5 MB for tests)">
-  <!ENTITY glib2-time          "0.5 SBU (add 1.0 SBU for tests; both using parallelism=4)">
+  <!ENTITY glib2-md5sum        "8d288416da38476c71998e5c2d3602ed">
+  <!ENTITY glib2-size          "4.7 MB">
+  <!ENTITY glib2-buildsize     "209 MB (add 6 MB for tests)">
+  <!ENTITY glib2-time          "0.5 SBU (add 0.5 SBU for tests; both using parallelism=4)">
 ]>
 
 <sect1 id="glib2" xreflabel="GLib-&glib2-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index fa5e79340f..5b84912220 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,10 @@
    <listitem>
      <para>May 11th, 2021</para>
      <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to glib-2.68.2. Fixes
+         <ulink url="&blfs-ticket-root;15027">#15027</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[bdubbs] - Update to hdparm-9.62. Fixes
          <ulink url="&blfs-ticket-root;15023">#15023</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index b1eff90947..2a0e7e3f1b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -98,7 +98,7 @@
 <!ENTITY fftw-version                 "3.3.9">
 <!ENTITY gcab-version                 "0.7">
 <!ENTITY glib2-minor                  "2.68">
-<!ENTITY glib2-version                "&glib2-minor;.1">
+<!ENTITY glib2-version                "&glib2-minor;.2">
 <!ENTITY glibmm-version               "2.66.0">
 <!ENTITY gmime-version                "2.6.23">
 <!ENTITY gmime3-version               "3.2.7">

From c09f869642d400775f7a7c1060ececf2d22f9eec Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 11 May 2021 14:43:27 -0500
Subject: [PATCH 2/3] Update to gtk-4.2.1

---
 introduction/welcome/changelog.xml | 4 ++++
 packages.ent                       | 2 +-
 x/lib/gtk4.xml                     | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5b84912220..28bd7f3573 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,10 @@
    <listitem>
      <para>May 11th, 2021</para>
      <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to gtk-4.2.1. Fixes
+         <ulink url="&blfs-ticket-root;15013">#15013</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[bdubbs] - Update to glib-2.68.2. Fixes
          <ulink url="&blfs-ticket-root;15027">#15027</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 2a0e7e3f1b..d37b53b2fd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -743,7 +743,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY graphene-version             "1.10.6">
 <!ENTITY gtk2-version                 "2.24.33">
 <!ENTITY gtk3-version                 "3.24.29">
-<!ENTITY gtk4-version                 "4.2.0">
+<!ENTITY gtk4-version                 "4.2.1">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.5">
 <!ENTITY gtkmm3-version               "3.24.4">
diff --git a/x/lib/gtk4.xml b/x/lib/gtk4.xml
index a139d3ab75..7ce2cbed00 100644
--- a/x/lib/gtk4.xml
+++ b/x/lib/gtk4.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY gtk4-download-http "&gnome-download-http;/gtk/4.2/gtk-&gtk4-version;.tar.xz">
   <!ENTITY gtk4-download-ftp  "&gnome-download-ftp;/gtk/4.2/gtk-&gtk4-version;.tar.xz">
-  <!ENTITY gtk4-md5sum        "656c54a43b252ef1955d0787bab1a7aa">
+  <!ENTITY gtk4-md5sum        "7854bd017e0016db76d17be9d4deb02e">
   <!ENTITY gtk4-size          "25 MB">
-  <!ENTITY gtk4-buildsize     "1.0 GB (138 MB installed, add 58 MB for tests)">
-  <!ENTITY gtk4-time          "1.2 SBU (using parallelism=4, add 0.3 SBU for tests)">
+  <!ENTITY gtk4-buildsize     "892 MB (138 MB installed, add 58 MB for tests)">
+  <!ENTITY gtk4-time          "1.1 SBU (using parallelism=4, add 0.3 SBU for tests)">
 ]>
 
 <sect1 id="gtk4" xreflabel="GTK-&gtk4-version;">

From 7c934e695b3b3d773f143a02d35ec4b4e9bdd930 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 11 May 2021 15:44:40 -0500
Subject: [PATCH 3/3] Update to btrfs-progs-v5.12

---
 introduction/welcome/changelog.xml  | 4 ++++
 packages.ent                        | 2 +-
 postlfs/filesystems/btrfs-progs.xml | 4 ++--
 x/lib/gtk4.xml                      | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 28bd7f3573..d9e6fa3c5d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,10 @@
    <listitem>
      <para>May 11th, 2021</para>
      <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to btrfs-progs-5.12. Fixes
+         <ulink url="&blfs-ticket-root;15021">#15021</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[bdubbs] - Update to gtk-4.2.1. Fixes
          <ulink url="&blfs-ticket-root;15013">#15013</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index d37b53b2fd..0d6557190d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -43,7 +43,7 @@
 <!ENTITY volume_key-version           "0.3.12">
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "5.11.1">
+<!ENTITY btrfs-progs-version          "5.12">
 <!ENTITY dosfstools-version           "4.2">
 <!ENTITY fuse3-version                "3.10.2">
 <!ENTITY jfsutils-version             "1.1.15">
diff --git a/postlfs/filesystems/btrfs-progs.xml b/postlfs/filesystems/btrfs-progs.xml
index e98e437a4c..1191746a1b 100644
--- a/postlfs/filesystems/btrfs-progs.xml
+++ b/postlfs/filesystems/btrfs-progs.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "7a8d0201da222c838a89fb31511f8d86">
+  <!ENTITY btrfs-progs-md5sum        "e3de33b782142dd21a74e6adfb17627a">
   <!ENTITY btrfs-progs-size          "2.1 MB">
-  <!ENTITY btrfs-progs-buildsize     "93 MB (up to 2.7 GB are used during tests)">
+  <!ENTITY btrfs-progs-buildsize     "63 MB (up to 2.7 GB are used during tests)">
   <!ENTITY btrfs-progs-time          "0.2 SBU (add 50-100 SBU for tests, depending on disk speed)">
 ]>
 
diff --git a/x/lib/gtk4.xml b/x/lib/gtk4.xml
index 7ce2cbed00..af0890e460 100644
--- a/x/lib/gtk4.xml
+++ b/x/lib/gtk4.xml
@@ -136,7 +136,7 @@ ninja</userinput></screen>
     <para>
       Running the test suite is not recommended unless you are in a Wayland
       session. If you are not in a Wayland session, around 625 tests will fail.
-      Under a Wayland session, the number decreases to around 25. If you are
+      Under a Wayland session, the number decreases to around 70. If you are
       in a Wayland session and wish to run the tests, issue:
       <command>ninja test</command>.
     </para>