From dca2b43ecda3e28c174251ead4fe3f6df4fb7d68 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 22 Aug 2022 11:33:42 -0500
Subject: [PATCH] Adapt CMake to use Boost-1.80.0 with FindBoost. Tags

---
 general/genlib/libidn.xml          |  2 +-
 general/genlib/libidn2.xml         |  2 +-
 general/genlib/libuv.xml           |  2 +-
 general/genlib/popt.xml            |  2 +-
 general/prog/cmake.xml             | 16 +++++++---------
 general/sysutils/zip.xml           |  2 +-
 introduction/welcome/changelog.xml | 10 ++++++++++
 networking/netlibs/c-ares.xml      |  2 +-
 networking/netlibs/curl.xml        |  2 +-
 networking/netlibs/libpsl.xml      |  2 +-
 networking/netprogs/rsync.xml      |  2 +-
 11 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/general/genlib/libidn.xml b/general/genlib/libidn.xml
index b4cd555bf4..97dc3bd899 100644
--- a/general/genlib/libidn.xml
+++ b/general/genlib/libidn.xml
@@ -44,7 +44,7 @@
       (ACE) form.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/libidn2.xml b/general/genlib/libidn2.xml
index f93e4ba0dd..e35649ab30 100644
--- a/general/genlib/libidn2.xml
+++ b/general/genlib/libidn2.xml
@@ -36,7 +36,7 @@
       internationalized domain names.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/libuv.xml b/general/genlib/libuv.xml
index ceeb49a68a..ad97076f41 100644
--- a/general/genlib/libuv.xml
+++ b/general/genlib/libuv.xml
@@ -33,7 +33,7 @@
       multi-platform support library with a focus on asynchronous I/O.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/genlib/popt.xml b/general/genlib/popt.xml
index 2f12171c54..e3b1897eef 100644
--- a/general/genlib/popt.xml
+++ b/general/genlib/popt.xml
@@ -34,7 +34,7 @@
       some programs to parse command-line options.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/general/prog/cmake.xml b/general/prog/cmake.xml
index d613cbfc68..9fdd61d725 100644
--- a/general/prog/cmake.xml
+++ b/general/prog/cmake.xml
@@ -37,7 +37,7 @@
       since version 4.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -73,17 +73,16 @@
       </listitem>
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/cmake-&cmake-version;-src_property_fix-1.patch"/>
+          <ulink url="&patch-root;/cmake-&cmake-version;-upstream_fix-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
 
     <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
 
@@ -118,13 +117,11 @@
   <sect2 role="installation">
     <title>Installation of CMake</title>
 
- <!-- This patch might be included in 3.19.1 and higher
     <para>
-      First, fix a regression that was discovered after the release of 3.19.0:
+      First, adapt the FindBoost module to use Boost-1.80.0:
     </para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-src_property_fix-1.patch</userinput></screen>
--->
+<screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-upstream_fix-1.patch</userinput></screen>
 
     <para>
       Install <application>CMake</application> by running the following
@@ -148,7 +145,8 @@ make</userinput></screen>
       <replaceable>&lt;N&gt;</replaceable> is an integer between 1 and the
       number of system cores. Setting <envar>LC_ALL</envar> is needed to
       prevent some test failures when some of the locale variables are
-      set to non English locales. One test, RunCMake.FindBoost, is known to fail.
+      set to non English locales. Two tests, RunCMake.FindBoost and
+      BundleUtilities, are known to fail.
     </para>
 
     <para>
diff --git a/general/sysutils/zip.xml b/general/sysutils/zip.xml
index 489902e4d1..494a578dd2 100644
--- a/general/sysutils/zip.xml
+++ b/general/sysutils/zip.xml
@@ -35,7 +35,7 @@
       archives.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 793604af14..01654b3d4b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>August 22nd, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt CMake's FindBoost module to understand
+          Boost-1.80.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 21st, 2022</para>
       <itemizedlist>
diff --git a/networking/netlibs/c-ares.xml b/networking/netlibs/c-ares.xml
index 011126b3f8..c629f8bf7b 100644
--- a/networking/netlibs/c-ares.xml
+++ b/networking/netlibs/c-ares.xml
@@ -33,7 +33,7 @@
       requests.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/networking/netlibs/curl.xml b/networking/netlibs/curl.xml
index 58bc97277f..18da0ecba3 100644
--- a/networking/netlibs/curl.xml
+++ b/networking/netlibs/curl.xml
@@ -37,7 +37,7 @@
       functions like streaming media.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/networking/netlibs/libpsl.xml b/networking/netlibs/libpsl.xml
index ad42da28e0..226fe6da25 100644
--- a/networking/netlibs/libpsl.xml
+++ b/networking/netlibs/libpsl.xml
@@ -34,7 +34,7 @@
       is a set of domain names beyond the standard suffixes, such as .com.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/networking/netprogs/rsync.xml b/networking/netprogs/rsync.xml
index 73b5eae02c..c4286fd540 100644
--- a/networking/netprogs/rsync.xml
+++ b/networking/netprogs/rsync.xml
@@ -34,7 +34,7 @@
       file archives over a network.
     </para>
 
-    &lfs111_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">