From d5099eac6a10723fc5ec0110468cd68183bed945 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 21 Jun 2010 14:56:47 +0000
Subject: [PATCH] Upgrade to Gettext-0.18.1.1. Fixes #2686.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9307 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 4 ----
 chapter03/patches.xml   | 8 --------
 chapter06/gettext.xml   | 4 ----
 packages.ent            | 6 +++---
 patches.ent             | 5 -----
 6 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8203bbf26..ab0cbb465 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2010-06-21</para>
       <itemizedlist>
+         <listitem>
+           <para>[matthew] - Upgrade to Gettext-0.18.1.1.  Fixes
+           <ulink url="&lfs-ticket-root;2686">#2686</ulink>.</para>
+         </listitem>
          <listitem>
            <para>[matthew] - Upgrade to Libtool-2.2.10.  Fixes
            <ulink url="&lfs-ticket-root;2690">#2690</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index fd7cdfd7f..ee0efffa7 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -228,10 +228,6 @@
       <para>expect-&expect-version;-no_tk-1.patch</para>
     </listitem>
 
-    <listitem>
-      <para>gettext-0.18-skip_test-1.patch</para>
-    </listitem>
-
     <listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index cccdbf8b0..2be236344 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -98,14 +98,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Gettext Skip Test Patch - <token>&gettext-skip_test-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gettext-skip_test-patch;"/></para>
-        <para>MD5 sum: <literal>&gettext-skip_test-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Glibc GCC Build Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index b690debfe..684cd3060 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -43,10 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-    <para>Apply a patch that skips a test that otherwise fails due to the absence of an XML parsing library:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&gettext-skip_test-patch;</userinput></screen>
-
     <para>Prepare Gettext for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/packages.ent b/packages.ent
index 06fb044f1..3d2b775f6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -182,10 +182,10 @@
 <!ENTITY gdbm-ch6-du "2.7 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.18">
-<!ENTITY gettext-size "11,730 KB">
+<!ENTITY gettext-version "0.18.1.1">
+<!ENTITY gettext-size "14,785 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "d52a3e061032a1ed13856d42fc86f0fd">
+<!ENTITY gettext-md5 "3dd55b952826d2b32f51308f2f91aa89">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "82 MB">
 <!ENTITY gettext-ch5-sbu "0.8 SBU">
diff --git a/patches.ent b/patches.ent
index bddace584..cf1ddda13 100644
--- a/patches.ent
+++ b/patches.ent
@@ -54,11 +54,6 @@
 <!ENTITY gcc-startfiles-patch-size "1.5 KB">
 
 
-<!ENTITY gettext-skip_test-patch "gettext-&gettext-version;-skip_test-1.patch">
-<!ENTITY gettext-skip_test-patch-md5 "9cec8b957ff96a3028897b2910a0d3e8">
-<!ENTITY gettext-skip_test-patch-size "1.2 KB">
-
-
 <!ENTITY glibc-gcc_fix-patch "glibc-&glibc-version;-gcc_fix-1.patch">
 <!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd">
 <!ENTITY glibc-gcc_fix-patch-size "2.5 KB">