diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 7 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter06/groff.xml | 18 | ||||
| -rw-r--r-- | chapter06/man-db.xml | 4 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 4 |
7 files changed, 21 insertions, 30 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e1dcdf359..396c207f4 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,6 +41,10 @@ <para>2009-02-01</para> <itemizedlist> <listitem> + <para>[matthew] - Upgraded to Groff-1.20.1. Fixes + <ulink url="&lfs-ticket-root;2322">#2322</ulink>.</para> + </listitem> + <listitem> <para>[matthew] - Upgraded to GCC-4.3.3. Fixes <ulink url="&lfs-ticket-root;2334">#2334</ulink>.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index de1fe9858..32cc0d24b 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -86,9 +86,9 @@ <!--<listitem> <para>Grep &grep-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Groff &groff-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>GRUB &grub-version;</para> </listitem>--> @@ -242,6 +242,9 @@ <para>binutils-2.18-configure-1.patch</para> </listitem> <listitem> + <para>groff-1.18.1.4-debian_fixes-1.patch</para> + </listitem> + <listitem> <para>module-init-tools-3.4.1-manpages-1.patch</para> </listitem> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 0fc31f99f..20fa8625a 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -123,14 +123,6 @@ </varlistentry> <varlistentry> - <term>Groff Debian Patch - <token>&groff-debian-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&groff-debian-patch;"/></para> - <para>MD5 sum: <literal>&groff-debian-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&grub-geometry-patch;"/></para> diff --git a/chapter06/groff.xml b/chapter06/groff.xml index a2507f45b..0c52ab5d0 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -41,23 +41,15 @@ <sect2 role="installation"> <title>Installation of Groff</title> - <para>Apply the patch that adds the <quote>ascii8</quote> and - <quote>nippon</quote> devices to Groff:</para> + <!-- It looks like many screen fonts still don't have Unicode single quotes + and dashes in them, but the sed below no longer makes any changes as the + format has changed in Groff-1.20.1 --> -<screen><userinput remap="pre">patch -Np1 -i ../&groff-debian-patch;</userinput></screen> - - <note> - <para>These devices are used by Man-DB when formatting non-English manual - pages that are not in the ISO-8859-1 encoding. Currently, there is no - working patch for Groff-1.19.x that adds this functionality.</para> - <!-- Details: http://bugs.debian.org/196762 --> - </note> - - <para>Many screen fonts don't have Unicode single quotes and dashes in them. +<!-- <para>Many screen fonts don't have Unicode single quotes and dashes in them. Tell Groff to use the ASCII equivalents instead:</para> <screen><userinput remap="pre">sed -i -e 's/2010/002D/' -e 's/2212/002D/' \ - -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto</userinput></screen> + -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto</userinput></screen> --> <para>Groff expects the environment variable <envar>PAGE</envar> to contain the default paper size. For users in the United States, diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 889a476da..8e9094517 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -50,6 +50,10 @@ <para>Prepare Man-DB for compilation:</para> + <!-- Note that the enable-mb-groff switch is a temporary workaround for the + fact that the configure test doesn't automatically detect that Groff-1.20.1 + is multibyte capable --> + <screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \ --sysconfdir=/etc --disable-setuid \ --enable-mb-groff --with-browser=/usr/bin/lynx \ diff --git a/packages.ent b/packages.ent index 7cbcc8d3e..3340f81e6 100644 --- a/packages.ent +++ b/packages.ent @@ -227,10 +227,10 @@ <!ENTITY grep-ch6-du "7.2 MB"> <!ENTITY grep-ch6-sbu "0.1 SBU"> -<!ENTITY groff-version "1.18.1.4"> -<!ENTITY groff-size "2,265 KB"> +<!ENTITY groff-version "1.20.1"> +<!ENTITY groff-size "3,510 KB"> <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz"> -<!ENTITY groff-md5 "ceecb81533936d251ed015f40e5f7287"> +<!ENTITY groff-md5 "48fa768dd6fdeb7968041dd5ae8e2b02"> <!ENTITY groff-home "&gnu-software;groff/"> <!ENTITY groff-ch6-du "39.2 MB"> <!ENTITY groff-ch6-sbu "0.4 SBU"> diff --git a/patches.ent b/patches.ent index 02db81c36..1b92094c3 100644 --- a/patches.ent +++ b/patches.ent @@ -65,10 +65,6 @@ <!ENTITY grep-fixes-patch-size "5.8 KB"> -<!ENTITY groff-debian-patch "groff-&groff-version;-debian_fixes-1.patch"> -<!ENTITY groff-debian-patch-md5 "05607e7fcfd6e5091f020bf44ddca10b"> -<!ENTITY groff-debian-patch-size "379 KB"> - <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch"> <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673"> <!ENTITY grub-inode-patch-size "4.8 KB"> |