Translate r11436

Fix failures in texinfo regression tests.
Update to linux-4.17.5.
Update to meson-0.47.0.

chapter01/changelog.xml

@@ -41,6 +41,23 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-07-08</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - 修复 texinfo 退化测试中的失败结果。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 linux-4.17.5。修复
+           <ulink url="&lfs-ticket-root;4300">#4300</ulink>。</para>
+        </listitem>
+        <listitem>
+           <para>[bdubbs] - 更新到 meson-0.47.0。修复
+           <ulink url="&lfs-ticket-root;4306">#4306</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-07-07</para>
       <itemizedlist>

chapter06/meson.xml

@@ -40,6 +40,10 @@
   <sect2 role="installation">
     <title>安装 Meson</title>
 
+    <para>应用一个来自上游的修补：</para>
+
+<screen><userinput remap="pre">sed -i '309 s/os.getcwd/-C, &amp;/' mesonbuild/minstall.py</userinput></screen>
+
     <para>执行以下命令编译 Meson：</para>
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
@@ -48,16 +52,33 @@
 
     <para>安装该软件包：</para>
 
-<screen><userinput remap="install">python3 setup.py install</userinput></screen>
-
-    <para>最后，将 Meson man 页面移动到正确位置：</para>
+<screen><userinput remap="install">python3 setup.py install --root=dest
+cp -rv dest/* /</userinput></screen>
+<!--
+    <para>At last, move Meson man pages to correct location:</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share/man/man1/*.1 \
       /usr/share/man/man1
 rm -r /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share</userinput></screen>
+-->
 
-  </sect2>
+    <variablelist>
+      <title>安装选项的含义：</title>
+      
+      <varlistentry>
+        <term><parameter>--root=dest</parameter></term>
+        <listitem>
+          <para>默认情况下 <command>python3 setup.py install</command>
+          将若干文件（如 man 页面）安装到 Python Eggs 中。
+          在指定了根目录位置时，<command>setup.py</command>
+		  将这些文件安装到符合标准的目录树中。
+		  我们即可直接复制该目录树，使得这些文件位于标准指定的位置。
+          </para>
+        </listitem>
+      </varlistentry>
 
+    </variablelist>
+  </sect2>
 
   <sect2 id="contents-meson" role="content">
     <title>Meson 的内容</title>
@@ -67,7 +88,7 @@ rm -r /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&pytho
       <segtitle>安装的目录</segtitle>
 
       <seglistitem>
-        <seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg>
+        <seg>meson, mesonconf, mesonintrospect, mesontest, 以及 wraptool</seg>
 		<seg>/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg</seg>
       </seglistitem>
     </segmentedlist>

chapter06/texinfo.xml

@@ -40,6 +40,10 @@
   <sect2 role="installation">
     <title>安装 Texinfo</title>
 
+    <para>修复一个在退化测试中产生大量失败的文件：</para>
+
+<screen><userinput remap="pre">sed -i '5481,5485 s/({/(\\{/' tp/Texinfo/Parser.pm</userinput></screen>
+
     <para>准备安装 Texinfo：</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>

general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180707">
+<!ENTITY version         "SVN-20180708">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180707-systemd">
+<!ENTITY versiond        "20180708-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2018 年 7 月 7 日">
+<!ENTITY releasedate     "2018 年 7 月 8 日">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">

packages.ent

@@ -416,12 +416,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "17">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "5">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> 
-<!ENTITY linux-size "99,783 KB">
+<!ENTITY linux-size "99,780 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "a5899b46a3d146c65bc2ba724db2f4ca">
+<!ENTITY linux-md5 "1677d884b0e39f217afc9e23e088e330">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -470,10 +470,10 @@
 <!ENTITY man-pages-ch6-du "27 MB">
 <!ENTITY man-pages-ch6-sbu "不到 0.1 SBU">
 
-<!ENTITY meson-version "0.46.1">
-<!ENTITY meson-size "1,176 KB">
+<!ENTITY meson-version "0.47.0">
+<!ENTITY meson-size "1,218 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "1698f6526574839de5dcdc45e3f7d582">
+<!ENTITY meson-md5 "5ec10121fcd1e130fdc7e9a10d762a4c">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "16 MB">
 <!ENTITY meson-ch6-sbu "0.1 SBU">