From 8b88eca0eee11d3d8a386f2e60dd5b42c54c9424 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 11 Mar 2009 21:37:07 +0000
Subject: Upgrade to Readline-6.0. Fixes #2353.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8829 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/readline.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'chapter06/readline.xml')

diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 3f3279257..8f852df30 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -49,13 +49,6 @@
 <screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in
 sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
-    <para>Readline contains a bug in its handling of non-multibyte characters,
-    which can lead to incorrect display calculations and incorrect redisplay.
-    Fix this issue by applying the following patch from the upstream maintainer:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
     <para>Prepare Readline for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib</userinput></screen>
@@ -93,8 +86,8 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
     class="directory">/usr/lib</filename>:</para>
 
 <screen><userinput remap="install">rm -v /lib/lib{readline,history}.so
-ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so
-ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
+ln -sfv ../../lib/libreadline.so.6 /usr/lib/libreadline.so
+ln -sfv ../../lib/libhistory.so.6 /usr/lib/libhistory.so</userinput></screen>
 
     <para>If desired, install the documentation:</para>
 
-- 
cgit v1.2.3-54-g00ecf