Changeset f6308e8

Timestamp:

08/01/2020 04:29:16 PM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

6afd5cb

Parents:

fed4605f

Message:

Update to cmake-3.18.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23448 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/cmake.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

general/prog/cmake.xml

@@ -7 +7 @@
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "94a7befd2ff39721a3de844d94bd7c62">
+  <!ENTITY cmake-md5sum        "bc0d668dba6ec081c664ae95b75540d6">
   <!ENTITY cmake-size          "8.6 MB">
-  <!ENTITY cmake-buildsize     "348 MB (add 584 MB for tests)">
+  <!ENTITY cmake-buildsize     "348 MB (add 634 MB for tests)">
   <!ENTITY cmake-time          "3.2 SBU (add 3.3 SBU for tests, both using parallelism=4)">
 ]>
@@ -75 +75 @@
     </itemizedlist>
 
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -84 +85 @@
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
@@ -101 +103 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="git"/> (for use during tests),
       <xref linkend="qt5"/> (for the Qt-based GUI),
       <xref linkend="subversion"/> (for testing), and
@@ -114 +117 @@
     <title>Installation of CMake</title>
 
+ <!-- This patch was applied in 3.18.1!
     <para>
       First, fix a regression that was discovered after the release of 3.18.0:
@@ -119 +123 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-regression_fix-1.patch</userinput></screen>
+-->
 
     <para>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to cmake-3.18.1. Fixes
+          <ulink url="&blfs-ticket-root;13866">#13866</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to mlt-6.22.0. Fixes
           <ulink url="&blfs-ticket-root;13868">#13868</ulink>.</para>

packages.ent

@@ -323 +323 @@
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.18">
-<!ENTITY cmake-minor-version          "0">
+<!ENTITY cmake-minor-version          "1">
 <!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
 <!ENTITY dejagnu-version              "1.6.2">