r1250 - in trunk: . scripts/patches scripts/scripts/native-scripts

ryan at linuxfromscratch.org ryan at linuxfromscratch.org
Fri Mar 10 02:08:46 PST 2006


Author: ryan
Date: 2006-03-10 03:08:45 -0700 (Fri, 10 Mar 2006)
New Revision: 1250

Added:
   trunk/scripts/patches/readline-5.1-fixes-2.patch
Modified:
   trunk/
   trunk/scripts/scripts/native-scripts/native-readline.sh
Log:
 r1300 at rei:  lfs | 2006-03-09 18:59:02 +1100
 Add readline-5.1-fixes-2.patch
 ------------------------------
 Submitted By: Jim Gifford (patches at jg555 dot com)
 Date: 2006-02-06
 Initial Package Version: 5.1
 Origin: Upstream
 Upstream Status: Applied
 Description: Contains Patch 001-002 from Upstream
 



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1299
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564
   + 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1300
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564

Added: trunk/scripts/patches/readline-5.1-fixes-2.patch
===================================================================
--- trunk/scripts/patches/readline-5.1-fixes-2.patch	                        (rev 0)
+++ trunk/scripts/patches/readline-5.1-fixes-2.patch	2006-03-10 10:08:45 UTC (rev 1250)
@@ -0,0 +1,74 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2006-02-06
+Initial Package Version: 5.1
+Origin: Upstream
+Upstream Status: Applied 
+Description: Contains Patch 001-002 from Upstream 
+
+diff -Naur readline-5.1.orig/readline.c readline-5.1/readline.c
+--- readline-5.1.orig/readline.c	2005-07-05 02:29:35.000000000 +0000
++++ readline-5.1/readline.c	2006-02-06 22:23:31.000000000 +0000
+@@ -714,7 +714,7 @@
+ 
+ 	  rl_dispatching = 1;
+ 	  RL_SETSTATE(RL_STATE_DISPATCHING);
+-	  r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
++	  (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
+ 	  RL_UNSETSTATE(RL_STATE_DISPATCHING);
+ 	  rl_dispatching = 0;
+ 
+diff -Naur readline-5.1.orig/terminal.c readline-5.1/terminal.c
+--- readline-5.1.orig/terminal.c	2005-11-13 01:46:54.000000000 +0000
++++ readline-5.1/terminal.c	2006-02-06 22:24:54.000000000 +0000
+@@ -122,7 +122,7 @@
+ static char *_rl_visible_bell;
+ 
+ /* Non-zero means the terminal can auto-wrap lines. */
+-int _rl_term_autowrap;
++int _rl_term_autowrap = -1;
+ 
+ /* Non-zero means that this terminal has a meta key. */
+ static int term_has_meta;
+@@ -274,6 +274,9 @@
+ _rl_set_screen_size (rows, cols)
+      int rows, cols;
+ {
++  if (_rl_term_autowrap == -1)
++    _rl_init_terminal_io (rl_terminal_name);
++
+   if (rows > 0)
+     _rl_screenheight = rows;
+   if (cols > 0)
+diff -Naur readline-5.1.orig/text.c readline-5.1/text.c
+--- readline-5.1.orig/text.c	2005-09-24 23:06:07.000000000 +0000
++++ readline-5.1/text.c	2006-02-06 22:23:31.000000000 +0000
+@@ -1071,8 +1071,6 @@
+ rl_delete (count, key)
+      int count, key;
+ {
+-  int r;
+-
+   if (count < 0)
+     return (_rl_rubout_char (-count, key));
+ 
+@@ -1090,17 +1088,17 @@
+       else
+ 	rl_forward_byte (count, key);
+ 
+-      r = rl_kill_text (orig_point, rl_point);
++      rl_kill_text (orig_point, rl_point);
+       rl_point = orig_point;
+-      return r;
+     }
+   else
+     {
+       int new_point;
+ 
+       new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
+-      return (rl_delete_text (rl_point, new_point));
++      rl_delete_text (rl_point, new_point);
+     }
++  return 0;
+ }
+ 
+ /* Delete the character under the cursor, unless the insertion

Modified: trunk/scripts/scripts/native-scripts/native-readline.sh
===================================================================
--- trunk/scripts/scripts/native-scripts/native-readline.sh	2006-03-10 10:08:27 UTC (rev 1249)
+++ trunk/scripts/scripts/native-scripts/native-readline.sh	2006-03-10 10:08:45 UTC (rev 1250)
@@ -24,8 +24,8 @@
 
 case ${READLINE_VER} in
    4.3 ) apply_patch readline-4.3-gnu_fixes-1 ;;
-   # Should be fixed next release
    5.0 ) apply_patch readline-5.0-fixes-1 ;;
+   5.1 ) apply_patch readline-5.1-fixes-2 ;;
 esac
 
 max_log_init readline ${READLINE_VER} "native (shared)" ${CONFLOGS} ${LOG}




More information about the cross-lfs mailing list