diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter03/patches.xml | 4 | ||||
| -rw-r--r-- | chapter08/meson.xml | 4 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 2 |
5 files changed, 17 insertions, 9 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d806cc721..5fe0564fc 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,16 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2022-01-20</para> + <itemizedlist> + <listitem> + <para>[pierre] - Update to meson-0.61.1. Fixes + <ulink url="&lfs-ticket-root;4985">#4985</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2022-01-17</para> <itemizedlist> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 0986e663d..30107c6ee 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -83,7 +83,7 @@ <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para> </listitem> </varlistentry> - +<!-- <varlistentry> <term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term> <listitem> @@ -91,7 +91,7 @@ <para>MD5 sum: <literal>&meson-fix-patch-md5;</literal></para> </listitem> </varlistentry> -<!-- + <varlistentry> <term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term> <listitem> diff --git a/chapter08/meson.xml b/chapter08/meson.xml index 70c1c1e92..36d787185 100644 --- a/chapter08/meson.xml +++ b/chapter08/meson.xml @@ -47,13 +47,13 @@ <sect2 role="installation"> <title>Installation of Meson</title> - +<!-- <para>First, apply a patch that fixes an issue identified upstream:</para> <screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen> +--> <para>Compile Meson with the following command:</para> - <screen><userinput remap="make">python3 setup.py build</userinput></screen> <para>This package does not come with a test suite.</para> diff --git a/packages.ent b/packages.ent index 60a458435..8cb11f3fc 100644 --- a/packages.ent +++ b/packages.ent @@ -491,10 +491,10 @@ <!ENTITY markupsafe-fin-du "516 KB"> <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU"> -<!ENTITY meson-version "0.61.0"> -<!ENTITY meson-size "1,961 KB"> +<!ENTITY meson-version "0.61.1"> +<!ENTITY meson-size "1,963 KB"> <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz"> -<!ENTITY meson-md5 "cfe9f5e8ef869ba498a6a84f291f0c74"> +<!ENTITY meson-md5 "8ed66d5537275df3defffb66d1fb897f"> <!ENTITY meson-home "https://mesonbuild.com"> <!ENTITY meson-fin-du "40 MB"> <!ENTITY meson-fin-sbu "less than 0.1 SBU"> diff --git a/patches.ent b/patches.ent index 99f19cb99..d98eb0d9b 100644 --- a/patches.ent +++ b/patches.ent @@ -58,13 +58,11 @@ <!ENTITY libpipeline-checks-patch "libpipeline-&libpipeline-version;-check_fixes-3.patch"> <!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621"> <!ENTITY libpipeline-checks-patch-size "22 KB"> ---> <!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-2.patch"> <!ENTITY meson-fix-patch-md5 "dd0b2187d287abcb41c3dd7e497b7df3"> <!ENTITY meson-fix-patch-size "5.5 KB"> -<!-- <!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch"> <!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45"> <!ENTITY ninja-limit-jobs-patch-size "2.5 KB"> |