Changeset 35d0341
- Timestamp:
- May 18, 2014, 3:28:29 AM (10 years ago)
- Branches:
- clfs-3.0.0-sysvinit, sysvinit
- Children:
- dbf50c0c
- Parents:
- 5375902a (diff), 14ad87c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Files:
-
- 1 added
- 1 deleted
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/introduction/common/changelog.xml
r5375902a r35d0341 40 40 <para>17 May 2014</para> 41 41 <itemizedlist> 42 <listitem> 43 <para>[William Harrington] - Upgrade TZData to 2014c.</para> 44 </listitem> 42 45 <listitem> 43 46 <para>[William Harrington] - Add --disable-werror to cross-tools -
BOOK/packages.ent
r5375902a r35d0341 53 53 <!ENTITY bootscripts-clfs-size "41 KB"> 54 54 <!ENTITY bootscripts-clfs-url "http://ftp.cross-lfs.org/pub/clfs/conglomeration/bootscripts-cross-lfs/bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.xz"> 55 <!ENTITY bootscripts-clfs-md5 " f474bf2efff744548a69d9049bad973f">55 <!ENTITY bootscripts-clfs-md5 "30fde07e077d774462bfb5d2345fadff"> 56 56 <!ENTITY bootscripts-clfs-home " "> 57 57 … … 421 421 <!ENTITY tcl-home "http://www.tcl.tk"> 422 422 423 <!ENTITY tzdata-version "2014 b">423 <!ENTITY tzdata-version "2014c"> 424 424 <!ENTITY tzdata-size "221 KB"> 425 425 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz"> 426 <!ENTITY tzdata-md5 " c58d556612396d4ca5a17807a79924e5">426 <!ENTITY tzdata-md5 "fa7f3dc1c6f6238253a6f2b850467e2e"> 427 427 <!ENTITY tzdata-home "http://www.iana.org/time-zones"> 428 428 -
BOOK/patches.ent
r5375902a r35d0341 5 5 <!-- Start of Common Patches --> 6 6 7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update- 2.patch">8 <!ENTITY bash-branch_update-patch-md5 " 64c6b5961f538a6b3d4c92f5c65ce51a">9 <!ENTITY bash-branch_update-patch-size " 14.075KB">7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-3.patch"> 8 <!ENTITY bash-branch_update-patch-md5 "7d3f44211d9d962019b78c0b8a76b970"> 9 <!ENTITY bash-branch_update-patch-size "61 KB"> 10 10 11 11 <!-- Binutils branch update area … … 61 61 <!ENTITY perl-libc-patch-size "1.657 KB"> 62 62 63 <!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update- 2.patch">64 <!ENTITY readline-branch_update-patch-md5 " 72a60fac6699ee42f99ec78a5d74e4e1">65 <!ENTITY readline-branch_update-patch-size " 3.015KB">63 <!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-3.patch"> 64 <!ENTITY readline-branch_update-patch-md5 "db39169d31ee08517e69d5eaec2c61c6"> 65 <!ENTITY readline-branch_update-patch-size "4.182 KB"> 66 66 67 67 <!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch"> -
patches/readline-6.3-branch_update-3.patch
r5375902a r35d0341 1 1 Submitted By: William Harrington (kb0iic at cross-lfs dot org) 2 Date: 0 3-30-20142 Date: 05-17-2014 3 3 Initial Package Version: 6.3 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 6.3-00 56 Description: Contains all upstream patches up to 6.3-006 7 7 8 8 diff -Naur readline-6.3.orig/display.c readline-6.3/display.c 9 --- readline-6.3.orig/display.c 2013-12-27 12:10:56.000000000 -0600 10 +++ readline-6.3/display.c 2014-04-24 20:09:52.659098542 -0500 11 @@ -2677,7 +2677,8 @@ 9 --- readline-6.3.orig/display.c 2013-12-27 18:10:56.000000000 +0000 10 +++ readline-6.3/display.c 2014-05-17 23:40:59.102644473 +0000 11 @@ -1637,7 +1637,7 @@ 12 /* If we are changing the number of invisible characters in a line, and 13 the spot of first difference is before the end of the invisible chars, 14 lendiff needs to be adjusted. */ 15 - if (current_line == 0 && !_rl_horizontal_scroll_mode && 16 + if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */ 17 current_invis_chars != visible_wrap_offset) 18 { 19 if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) 20 @@ -1825,8 +1825,13 @@ 21 else 22 _rl_last_c_pos += bytes_to_insert; 23 24 + /* XXX - we only want to do this if we are at the end of the line 25 + so we move there with _rl_move_cursor_relative */ 26 if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) 27 - goto clear_rest_of_line; 28 + { 29 + _rl_move_cursor_relative (ne-new, new); 30 + goto clear_rest_of_line; 31 + } 32 } 33 } 34 /* Otherwise, print over the existing material. */ 35 @@ -2677,7 +2682,8 @@ 12 36 { 13 37 if (_rl_echoing_p) … … 19 43 fflush (rl_outstream); 20 44 rl_restart_output (1, 0); 45 diff -Naur readline-6.3.orig/patchlevel readline-6.3/patchlevel 46 --- readline-6.3.orig/patchlevel 2013-11-15 13:11:11.000000000 +0000 47 +++ readline-6.3/patchlevel 2014-05-17 23:40:59.102644473 +0000 48 @@ -1,3 +1,3 @@ 49 # Do not edit -- exists only for use by patch 50 51 -5 52 +6 21 53 diff -Naur readline-6.3.orig/readline.c readline-6.3/readline.c 22 --- readline-6.3.orig/readline.c 2013-10-28 1 3:58:06.000000000 -050023 +++ readline-6.3/readline.c 2014-0 4-24 20:09:49.666544077 -050054 --- readline-6.3.orig/readline.c 2013-10-28 18:58:06.000000000 +0000 55 +++ readline-6.3/readline.c 2014-05-17 23:40:59.092644501 +0000 24 56 @@ -744,7 +744,8 @@ 25 57 r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ)); … … 42 74 #endif 43 75 diff -Naur readline-6.3.orig/rltypedefs.h readline-6.3/rltypedefs.h 44 --- readline-6.3.orig/rltypedefs.h 2011-03-26 1 3:53:31.000000000 -050045 +++ readline-6.3/rltypedefs.h 2014-0 4-24 20:09:54.218697974 -050076 --- readline-6.3.orig/rltypedefs.h 2011-03-26 18:53:31.000000000 +0000 77 +++ readline-6.3/rltypedefs.h 2014-05-17 23:40:59.099311149 +0000 46 78 @@ -26,6 +26,25 @@ 47 79 extern "C" { … … 71 103 #if !defined (_RL_FUNCTION_TYPEDEF) 72 104 diff -Naur readline-6.3.orig/util.c readline-6.3/util.c 73 --- readline-6.3.orig/util.c 2013-09-02 1 2:36:12.000000000 -050074 +++ readline-6.3/util.c 2014-0 4-24 20:09:51.129496698 -0500105 --- readline-6.3.orig/util.c 2013-09-02 17:36:12.000000000 +0000 106 +++ readline-6.3/util.c 2014-05-17 23:40:59.095977825 +0000 75 107 @@ -476,6 +476,7 @@ 76 108 return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));
Note:
See TracChangeset
for help on using the changeset viewer.