Changeset 25e84be

Timestamp:

Dec 31, 2009, 11:35:24 AM (15 years ago)

Author:

Jonathan Norman <nate@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

24bab8b

Parents:

cdd36982

Message:

updated readline patch to -2

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/readline-6.0-branch_update-2.patch (moved) (moved from patches/readline-6.0-branch_update-1.patch ) (8 diffs)

BOOK/introduction/common/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>December 31, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Updated Readline Patch to -2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

BOOK/patches.ent

@@ -93 +93 @@
 <!ENTITY perl-libc-patch-size "1 KB">
 
-<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
-<!ENTITY readline-branch_update-patch-md5 "1113f58c09eebb9839c5fc4d692416d9">
-<!ENTITY readline-branch_update-patch-size "3 KB">
+<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-2.patch">
+<!ENTITY readline-branch_update-patch-md5 "1e92533f7b03e03bd0a73703d0d9cc75">
+<!ENTITY readline-branch_update-patch-size "8 KB">
 
 <!ENTITY sysvinit-fixes-patch "sysvinit-&sysvinit-version;-fixes-1.patch">

patches/readline-6.0-branch_update-2.patch

@@ -1 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 06-05-2009
-Initial Package Version: 6.0
+Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk)
+Date: 2009-12-31 
+Initial Package Version: 6.0 
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 6.0-003
+Description: Contains all upstream patches up to 6.0-004
 
 diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
---- readline-6.0.orig/display.c 2009-01-04 11:32:32.000000000 -0800
-+++ readline-6.0/display.c      2009-06-05 14:07:00.000000000 -0700
+--- readline-6.0.orig/display.c 2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/display.c      2009-12-31 19:05:02.000000000 +0000
 @@ -512,6 +512,7 @@
    /* Block keyboard interrupts because this function manipulates global
@@ -17 +17 @@
    if (!rl_display_prompt)
      rl_display_prompt = "";
-@@ -1236,6 +1237,7 @@
+@@ -1191,6 +1192,8 @@
+       if (!rl_display_fixed || 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],
+                       0,
+@@ -1198,6 +1201,13 @@
+                       _rl_screenwidth + (lmargin ? 0 : wrap_offset),
+                       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
+             the new line, we need to clear to eol. */
+@@ -1236,6 +1246,7 @@
        visible_wrap_offset = wrap_offset;
    }
@@ -25 +48 @@
  }
  
-@@ -1772,7 +1774,7 @@
+@@ -1772,7 +1783,7 @@
              space_to_eol will insert too many spaces.  XXX - maybe we should
              adjust col_lendiff based on the difference between _rl_last_c_pos
@@ -34 +57 @@
             {     
               if (_rl_term_autowrap && current_line < inv_botlin)
-@@ -1892,6 +1894,10 @@
+@@ -1892,6 +1903,10 @@
  
    woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
@@ -45 +68 @@
    /* If we have multibyte characters, NEW is indexed by the buffer point in
       a multibyte string, but _rl_last_c_pos is the display position.  In
-@@ -1905,9 +1911,9 @@
+@@ -1905,9 +1920,9 @@
          prompt string, since they're both buffer indices and DPOS is a
          desired display position. */
@@ -58 +81 @@
         {
 diff -Naur readline-6.0.orig/patchlevel readline-6.0/patchlevel
---- readline-6.0.orig/patchlevel        2008-11-18 08:01:14.000000000 -0800
-+++ readline-6.0/patchlevel     2009-06-05 14:07:00.000000000 -0700
+--- readline-6.0.orig/patchlevel        2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/patchlevel     2009-12-31 18:58:11.000000000 +0000
 @@ -1,3 +1,3 @@
  # Do not edit -- exists only for use by patch
@@ -66 +89 @@
 +3
 diff -Naur readline-6.0.orig/readline.h readline-6.0/readline.h
---- readline-6.0.orig/readline.h        2009-01-04 11:32:33.000000000 -0800
-+++ readline-6.0/readline.h     2009-06-05 14:06:57.000000000 -0700
+--- readline-6.0.orig/readline.h        2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/readline.h     2009-12-31 18:58:11.000000000 +0000
 @@ -814,8 +814,9 @@
  #define RL_STATE_VIMOTION      0x100000        /* reading vi motion arg */
@@ -80 +103 @@
  #define RL_UNSETSTATE(x)       (rl_readline_state &= ~(x))
 diff -Naur readline-6.0.orig/terminal.c readline-6.0/terminal.c
---- readline-6.0.orig/terminal.c        2009-01-04 11:32:34.000000000 -0800
-+++ readline-6.0/terminal.c     2009-06-05 14:06:57.000000000 -0700
+--- readline-6.0.orig/terminal.c        2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/terminal.c     2009-12-31 18:58:11.000000000 +0000
 @@ -355,7 +355,7 @@
        _rl_get_screen_size (fileno (rl_instream), 1);