aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml11
-rw-r--r--chapter03/patches.xml6
-rw-r--r--chapter06/gettext.xml4
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
-rw-r--r--patches.ent7
7 files changed, 33 insertions, 15 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d8e59837c..3ad9d4f6f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2010-05-29</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgrade to Gettext-0.18. Fixes
+ <ulink url="&lfs-ticket-root;2660">#2660</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2010-05-26</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 21ac6e333..e84009f5d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -76,9 +76,9 @@
<!--<listitem>
<para>GDBM &gdbm-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Gettext &gettext-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Glibc &glibc-version;</para>
</listitem>-->
@@ -222,6 +222,10 @@
</listitem>
<listitem>
+ <para>gettext-0.18-skip_test-1.patch</para>
+ </listitem>
+
+ <listitem>
<para>MPC-&mpc-version;</para>
</listitem>
@@ -231,6 +235,9 @@
<title>Removed:</title>
<listitem>
+ <para>gettext-0.17-upstream_fixes-2.patch</para>
+ </listitem>
+ <listitem>
<para>grep-2.5.4-debian_fixes-1.patch</para>
</listitem>
<listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index eecc54e01..a3a60dd45 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -99,10 +99,10 @@
</varlistentry>
<varlistentry>
- <term>Gettext Upstream Fix Patch - <token>&gettext-upstream_fixes-patch-size;</token>:</term>
+ <term>Gettext Skip Test Patch - <token>&gettext-skip_test-patch-size;</token>:</term>
<listitem>
- <para>Download: <ulink url="&patches-root;&gettext-upstream_fixes-patch;"/></para>
- <para>MD5 sum: <literal>&gettext-upstream_fixes-patch-md5;</literal></para>
+ <para>Download: <ulink url="&patches-root;&gettext-skip_test-patch;"/></para>
+ <para>MD5 sum: <literal>&gettext-skip_test-patch-md5;</literal></para>
</listitem>
</varlistentry>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index e4dd351c6..b690debfe 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -43,9 +43,9 @@
<sect2 role="installation">
<title>Installation of Gettext</title>
- <para>Apply a patch that fixes file permissions and ownership and an internal bug:</para>
+ <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-upstream_fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&gettext-skip_test-patch;</userinput></screen>
<para>Prepare Gettext for compilation:</para>
diff --git a/general.ent b/general.ent
index fa65cc578..6d6a06918 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100526">
-<!ENTITY releasedate "May 26, 2010">
+<!ENTITY version "SVN-20100529">
+<!ENTITY releasedate "May 29, 2010">
<!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.7">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 9b5183240..e4f82c9bb 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.17">
-<!ENTITY gettext-size "11,368 KB">
+<!ENTITY gettext-version "0.18">
+<!ENTITY gettext-size "11,730 KB">
<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "58a2bc6d39c0ba57823034d55d65d606">
+<!ENTITY gettext-md5 "d52a3e061032a1ed13856d42fc86f0fd">
<!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 315cd4b71..514f1361c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -54,9 +54,10 @@
<!ENTITY gcc-startfiles-patch-md5 "799ef1971350d2e3c794f2123f247cc6">
<!ENTITY gcc-startfiles-patch-size "1.5 KB">
-<!ENTITY gettext-upstream_fixes-patch "gettext-&gettext-version;-upstream_fixes-2.patch">
-<!ENTITY gettext-upstream_fixes-patch-md5 "ae64b6399ed6536e148e8386bcb91689">
-<!ENTITY gettext-upstream_fixes-patch-size "2.9 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">