From 8442e2e0e0080c5d722ead89aaaea13bb42f2887 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 25 Aug 2009 15:02:53 +0000 Subject: [PATCH] - include patch 004 - suppress install-info errors (#515910) - remove dir* in infodir after install (#492097) --- readline.spec | 23 +++++++++++------- readline60-004 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 readline60-004 diff --git a/readline.spec b/readline.spec index cdaf46f..da87c2f 100644 --- a/readline.spec +++ b/readline.spec @@ -1,7 +1,7 @@ Summary: A library for editing typed command lines Name: readline Version: 6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Group: System Environment/Libraries URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html @@ -9,6 +9,7 @@ Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz Patch1: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-001 Patch2: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-002 Patch3: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-003 +Patch4: ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-004 # fix file permissions, remove RPATH, use CFLAGS Patch20: readline-6.0-shlib.patch Requires(post): /sbin/install-info @@ -52,6 +53,7 @@ library. %patch1 -p0 -b .001 %patch2 -p0 -b .002 %patch3 -p0 -b .003 +%patch4 -p0 -b .004 %patch20 -p1 -b .shlib pushd examples @@ -79,33 +81,33 @@ for l in $RPM_BUILD_ROOT%{_libdir}/libreadline.so; do done rm -rf $RPM_BUILD_ROOT%{_datadir}/readline -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f $RPM_BUILD_ROOT%{_infodir}/dir* %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info %{_infodir}/history.info.gz %{_infodir}/dir -/sbin/install-info %{_infodir}/rluserman.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/history.info.gz %{_infodir}/dir &> /dev/null +/sbin/install-info %{_infodir}/rluserman.info.gz %{_infodir}/dir &> /dev/null : %postun -p /sbin/ldconfig %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir - /sbin/install-info --delete %{_infodir}/rluserman.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/history.info.gz %{_infodir}/dir &> /dev/null + /sbin/install-info --delete %{_infodir}/rluserman.info.gz %{_infodir}/dir &> /dev/null fi : %post devel -/sbin/install-info %{_infodir}/readline.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/readline.info.gz %{_infodir}/dir &> /dev/null : %preun devel if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/readline.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/readline.info.gz %{_infodir}/dir &> /dev/null fi : @@ -130,6 +132,11 @@ fi %{_libdir}/lib*.a %changelog +* Tue Aug 25 2009 Miroslav Lichvar 6.0-3 +- include patch 004 +- suppress install-info errors (#515910) +- remove dir* in infodir after install (#492097) + * Sun Jul 26 2009 Fedora Release Engineering - 6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/readline60-004 b/readline60-004 new file mode 100644 index 0000000..ced0e3c --- /dev/null +++ b/readline60-004 @@ -0,0 +1,63 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.0 +Patch-ID: readline60-004 + +Bug-Reported-by: jim@jim.sh +Bug-Reference-ID: <200905262140.n4QLeO4X030664@psychosis.jim.sh> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00074.html + +Bug-Description: + +There are occasional cursor positioning errors when using readline's +horizontal scroll mode. + +Patch: + +*** ../readline-6.0-patched/display.c 2009-05-22 12:32:25.000000000 -0400 +--- display.c 2009-05-29 23:32:20.000000000 -0400 +*************** +*** 1190,1196 **** + line[t - 1] = '>'; + +! if (!rl_display_fixed || forced_display || lmargin != last_lmargin) + { + forced_display = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +--- 1192,1200 ---- + line[t - 1] = '>'; + +! if (rl_display_fixed == 0 || forced_display || lmargin != last_lmargin) + { + forced_display = 0; ++ o_cpos = _rl_last_c_pos; ++ cpos_adjusted = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +*************** +*** 1200,1203 **** +--- 1204,1214 ---- + 0); + ++ if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) && ++ cpos_adjusted == 0 && ++ _rl_last_c_pos != o_cpos && ++ _rl_last_c_pos > wrap_offset && ++ o_cpos < prompt_last_invisible) ++ _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */ ++ + /* If the visible new line is shorter than the old, but the number + of invisible characters is greater, and we are at the end of +*** ../readline-6.0/patchlevel 2008-11-18 11:01:14.000000000 -0500 +--- patchlevel 2009-05-09 12:01:06.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 3 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 4