rpms/readline/F-8 readline-5.2-008.patch, NONE, 1.1 readline-5.2-009.patch, NONE, 1.1 readline-5.2-010.patch, NONE, 1.1 readline-5.2-011.patch, NONE, 1.1 readline.spec, 1.35, 1.36
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Thu Jan 3 17:26:23 UTC 2008
- Previous message (by thread): rpms/CCfits/FC-6 .cvsignore, 1.4, NONE CCfits-1.6-removerpath.patch, 1.1, NONE CCfits.spec, 1.10, NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.6, NONE
- Next message (by thread): rpms/xpa/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.2, NONE xpa-2.1.6-makefile.patch, 1.2, NONE xpa.spec, 1.5, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mlichvar
Update of /cvs/pkgs/rpms/readline/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31764
Modified Files:
readline.spec
Added Files:
readline-5.2-008.patch readline-5.2-009.patch
readline-5.2-010.patch readline-5.2-011.patch
Log Message:
- include upstream patches 008-011
- merge review fixes (#226361)
- fix source URL
readline-5.2-008.patch:
--- NEW FILE readline-5.2-008.patch ---
READLINE PATCH REPORT
=====================
Readline-Release: 5.2
Patch-ID: readline52-008
Bug-Reported-by: dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID: <4702ED8A.5000503 at thequod.de>
Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938
Bug-Description:
When updating the display after displaying, for instance, a list of possible
completions, readline will place the cursor at the wrong position if the
prompt contains invisible characters and a newline.
Patch:
*** ../readline-5.2-patched/display.c Mon Aug 6 14:26:29 2007
--- display.c Wed Oct 10 22:43:58 2007
***************
*** 1049,1053 ****
else
tx = nleft;
! if (_rl_last_c_pos > tx)
{
_rl_backspace (_rl_last_c_pos - tx); /* XXX */
--- 1049,1053 ----
else
tx = nleft;
! if (tx >= 0 && _rl_last_c_pos > tx)
{
_rl_backspace (_rl_last_c_pos - tx); /* XXX */
***************
*** 1205,1209 ****
{
register char *ofd, *ols, *oe, *nfd, *nls, *ne;
! int temp, lendiff, wsatend, od, nd;
int current_invis_chars;
int col_lendiff, col_temp;
--- 1205,1209 ----
{
register char *ofd, *ols, *oe, *nfd, *nls, *ne;
! int temp, lendiff, wsatend, od, nd, o_cpos;
int current_invis_chars;
int col_lendiff, col_temp;
***************
*** 1466,1469 ****
--- 1466,1471 ----
}
+ o_cpos = _rl_last_c_pos;
+
/* When this function returns, _rl_last_c_pos is correct, and an absolute
cursor postion in multibyte mode, but a buffer index when not in a
***************
*** 1475,1479 ****
invisible characters in the prompt string. Let's see if setting this when
we make sure we're at the end of the drawn prompt string works. */
! if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
cpos_adjusted = 1;
#endif
--- 1477,1483 ----
invisible characters in the prompt string. Let's see if setting this when
we make sure we're at the end of the drawn prompt string works. */
! if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 &&
! (_rl_last_c_pos > 0 || o_cpos > 0) &&
! _rl_last_c_pos == prompt_physical_chars)
cpos_adjusted = 1;
#endif
readline-5.2-009.patch:
--- NEW FILE readline-5.2-009.patch ---
READLINE PATCH REPORT
=====================
Readline-Release: 5.2
Patch-ID: readline52-009
Bug-Reported-by: dAniel hAhler <ubuntu at thequod.de>
Bug-Reference-ID:
Bug-Reference-URL:
Bug-Description:
Under some circumstances, readline will incorrectly display a prompt string
containing invisible characters after the final newline.
Patch:
*** ../readline-5.2-patched/display.c 2007-08-25 13:47:08.000000000 -0400
--- display.c 2007-11-10 17:51:29.000000000 -0500
***************
*** 392,396 ****
local_prompt = expand_prompt (p, &prompt_visible_length,
&prompt_last_invisible,
! (int *)NULL,
&prompt_physical_chars);
c = *t; *t = '\0';
--- 420,424 ----
local_prompt = expand_prompt (p, &prompt_visible_length,
&prompt_last_invisible,
! &prompt_invis_chars_first_line,
&prompt_physical_chars);
c = *t; *t = '\0';
***************
*** 399,403 ****
local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
(int *)NULL,
! &prompt_invis_chars_first_line,
(int *)NULL);
*t = c;
--- 427,431 ----
local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
(int *)NULL,
! (int *)NULL,
(int *)NULL);
*t = c;
readline-5.2-010.patch:
--- NEW FILE readline-5.2-010.patch ---
READLINE PATCH REPORT
=====================
Readline-Release: 5.2
Patch-ID: readline52-010
Bug-Reported-by: Miroslav Lichvar <mlichvar at redhat.com>
Bug-Reference-ID: Fri, 02 Nov 2007 14:07:45 +0100
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html
Bug-Description:
In certain cases when outputting characters at the end of the line,
e.g., when displaying the prompt string, readline positions the cursor
incorrectly if the prompt string contains invisible characters and the
text being drawn begins before the last invisible character in the line.
Patch:
*** ../readline-5.2-patched/display.c 2007-08-25 13:47:08.000000000 -0400
--- display.c 2007-11-10 17:51:29.000000000 -0500
***************
*** 1566,1574 ****
else
{
- /* We have horizontal scrolling and we are not inserting at
- the end. We have invisible characters in this line. This
- is a dumb update. */
_rl_output_some_chars (nfd, temp);
_rl_last_c_pos += col_temp;
return;
}
--- 1619,1632 ----
else
{
_rl_output_some_chars (nfd, temp);
_rl_last_c_pos += col_temp;
+ /* If nfd begins before any invisible characters in the prompt,
+ adjust _rl_last_c_pos to account for wrap_offset and set
+ cpos_adjusted to let the caller know. */
+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ {
+ _rl_last_c_pos -= wrap_offset;
+ cpos_adjusted = 1;
+ }
return;
}
readline-5.2-011.patch:
--- NEW FILE readline-5.2-011.patch ---
READLINE PATCH REPORT
=====================
Readline-Release: 5.2
Patch-ID: readline52-011
Bug-Reported-by: Uwe Doering <gemini at geminix.org>
Bug-Reference-ID: <46F3DD72.2090801 at geminix.org>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html
Bug-Description:
There is an off-by-one error in the code that buffers characters received
very quickly in succession, causing characters to be dropped.
Patch:
*** ../readline-5.2-patched/input.c 2007-08-25 13:47:10.000000000 -0400
--- input.c 2007-10-12 22:55:25.000000000 -0400
***************
*** 155,159 ****
pop_index--;
if (pop_index < 0)
! pop_index = ibuffer_len - 1;
ibuffer[pop_index] = key;
return (1);
--- 155,159 ----
pop_index--;
if (pop_index < 0)
! pop_index = ibuffer_len;
ibuffer[pop_index] = key;
return (1);
Index: readline.spec
===================================================================
RCS file: /cvs/pkgs/rpms/readline/F-8/readline.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- readline.spec 27 Aug 2007 12:09:21 -0000 1.35
+++ readline.spec 3 Jan 2008 17:25:45 -0000 1.36
@@ -1,11 +1,11 @@
Summary: A library for editing typed command lines
Name: readline
Version: 5.2
-Release: 7%{?dist}
+Release: 9%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
-Source: ftp://ftp.gnu.org/gnu/readline-%{version}.tar.gz
+Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
Patch1: readline-5.2-shlib.patch
Patch2: readline-5.2-001.patch
Patch3: readline-5.2-002.patch
@@ -14,6 +14,10 @@
Patch6: readline-5.2-005.patch
Patch7: readline-5.2-006.patch
Patch8: readline-5.2-007.patch
+Patch9: readline-5.2-008.patch
+Patch10: readline-5.2-009.patch
+Patch11: readline-5.2-010.patch
+Patch12: readline-5.2-011.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires: ncurses-devel
@@ -60,11 +64,20 @@
%patch6 -p0 -b .005
%patch7 -p0 -b .006
%patch8 -p0 -b .007
-
-rm -f examples/rlfe/configure
+%patch9 -p0 -b .008
+%patch10 -p0 -b .009
+%patch11 -p0 -b .010
+%patch12 -p0 -b .011
+
+pushd examples
+rm -f rlfe/configure
+iconv -f iso8859-1 -t utf8 -o rl-fgets.c{_,}
+touch -r rl-fgets.c{,_}
+mv -f rl-fgets.c{_,}
+popd
%build
-export CPPFLAGS="-I/usr/include/ncurses"
+export CPPFLAGS="-I%{_includedir}/ncurses"
%configure
make %{?_smp_mflags}
@@ -104,14 +117,14 @@
:
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc CHANGES COPYING NEWS README USAGE
%{_libdir}/lib*.so.*
%{_infodir}/history.info*
%{_infodir}/rluserman.info*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc examples/*.c examples/*.h examples/rlfe
%{_includedir}/readline
%{_libdir}/lib*.so
@@ -119,10 +132,18 @@
%{_infodir}/readline.info*
%files static
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_libdir}/lib*.a
%changelog
+* Thu Jan 03 2008 Miroslav Lichvar <mlichvar at redhat.com> 5.2-9
+- include upstream patches 008-011
+
+* Mon Nov 05 2007 Miroslav Lichvar <mlichvar at redhat.com> 5.2-8
+- fix cursor position when prompt has one invisible character (#358231)
+- merge review fixes (#226361)
+- fix source URL
+
* Mon Aug 27 2007 Miroslav Lichvar <mlichvar at redhat.com> 5.2-7
- include patches 005, 006, 007
- Previous message (by thread): rpms/CCfits/FC-6 .cvsignore, 1.4, NONE CCfits-1.6-removerpath.patch, 1.1, NONE CCfits.spec, 1.10, NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.6, NONE
- Next message (by thread): rpms/xpa/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE sources, 1.2, NONE xpa-2.1.6-makefile.patch, 1.2, NONE xpa.spec, 1.5, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list