SliTaz Repositories

     1.1 --- a/readline-dev/receipt	Thu Feb 12 18:16:49 2015 +0200
     1.2 +++ b/readline-dev/receipt	Thu Feb 12 18:56:37 2015 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="readline-dev"
     1.7 -VERSION="6.2"
     1.8 +VERSION="6.3"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="GNU readline devel files."
    1.11  MAINTAINER="pankso@slitaz.org"

     2.1 --- a/readline/receipt	Thu Feb 12 18:16:49 2015 +0200
     2.2 +++ b/readline/receipt	Thu Feb 12 18:56:37 2015 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="readline"
     2.7 -VERSION="6.2"
     2.8 +VERSION="6.3"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="GNU readline."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12 @@ -18,6 +18,7 @@
    2.13  compile_rules()
    2.14  {
    2.15  	cd $src
    2.16 +	patch -Np1 -i $stuff/readline-6.3-upstream_fixes-3.patch
    2.17  	sed -i '/(MV)/d' Makefile*
    2.18  	./configure $CONFIGURE_ARGS &&
    2.19  	make && make DESTDIR=$DESTDIR install

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/readline/stuff/readline-6.3-upstream_fixes-3.patch	Thu Feb 12 18:56:37 2015 +0000
     3.3 @@ -0,0 +1,155 @@
     3.4 +Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
     3.5 +Updated By:              Armin K. <krejzi at email dot com>
     3.6 +Date:                    2014-10-04
     3.7 +Initial Package Version: 6.3
     3.8 +Upstream Status:         Already in upstream patch repo
     3.9 +Origin:                  Upstream
    3.10 +Description:             This patch contains upstream patch numbers 001 through 008.
    3.11 +
    3.12 +--- a/display.c	2013-12-27 19:10:56.000000000 +0100
    3.13 ++++ b/display.c	2014-10-04 21:30:27.039621661 +0200
    3.14 +@@ -1637,7 +1637,7 @@
    3.15 +   /* If we are changing the number of invisible characters in a line, and
    3.16 +      the spot of first difference is before the end of the invisible chars,
    3.17 +      lendiff needs to be adjusted. */
    3.18 +-  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
    3.19 ++  if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
    3.20 +       current_invis_chars != visible_wrap_offset)
    3.21 +     {
    3.22 +       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
    3.23 +@@ -1825,8 +1825,13 @@
    3.24 + 	      else
    3.25 + 		_rl_last_c_pos += bytes_to_insert;
    3.26 + 
    3.27 ++	      /* XXX - we only want to do this if we are at the end of the line
    3.28 ++		 so we move there with _rl_move_cursor_relative */
    3.29 + 	      if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
    3.30 +-		goto clear_rest_of_line;
    3.31 ++		{
    3.32 ++		  _rl_move_cursor_relative (ne-new, new);
    3.33 ++		  goto clear_rest_of_line;
    3.34 ++		}
    3.35 + 	    }
    3.36 + 	}
    3.37 +       /* Otherwise, print over the existing material. */
    3.38 +@@ -2677,7 +2682,8 @@
    3.39 + {
    3.40 +   if (_rl_echoing_p)
    3.41 +     {
    3.42 +-      _rl_move_vert (_rl_vis_botlin);
    3.43 ++      if (_rl_vis_botlin > 0)	/* minor optimization plus bug fix */
    3.44 ++	_rl_move_vert (_rl_vis_botlin);
    3.45 +       _rl_vis_botlin = 0;
    3.46 +       fflush (rl_outstream);
    3.47 +       rl_restart_output (1, 0);
    3.48 +--- a/input.c	2014-01-10 21:07:08.000000000 +0100
    3.49 ++++ b/input.c	2014-10-04 21:30:27.347630462 +0200
    3.50 +@@ -534,8 +534,16 @@
    3.51 + 	return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
    3.52 +       else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
    3.53 + 	return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
    3.54 ++      /* keyboard-generated signals of interest */
    3.55 +       else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
    3.56 +         RL_CHECK_SIGNALS ();
    3.57 ++      /* non-keyboard-generated signals of interest */
    3.58 ++      else if (_rl_caught_signal == SIGALRM
    3.59 ++#if defined (SIGVTALRM)
    3.60 ++		|| _rl_caught_signal == SIGVTALRM
    3.61 ++#endif
    3.62 ++	      )
    3.63 ++        RL_CHECK_SIGNALS ();
    3.64 + 
    3.65 +       if (rl_signal_event_hook)
    3.66 + 	(*rl_signal_event_hook) ();
    3.67 +--- a/misc.c	2012-09-02 00:03:11.000000000 +0200
    3.68 ++++ b/misc.c	2014-10-04 21:30:27.625638402 +0200
    3.69 +@@ -461,6 +461,7 @@
    3.70 + 	    saved_undo_list = 0;
    3.71 + 	  /* Set up rl_line_buffer and other variables from history entry */
    3.72 + 	  rl_replace_from_history (entry, 0);	/* entry->line is now current */
    3.73 ++	  entry->data = 0;			/* entry->data is now current undo list */
    3.74 + 	  /* Undo all changes to this history entry */
    3.75 + 	  while (rl_undo_list)
    3.76 + 	    rl_do_undo ();
    3.77 +@@ -468,7 +469,6 @@
    3.78 + 	     the timestamp. */
    3.79 + 	  FREE (entry->line);
    3.80 + 	  entry->line = savestring (rl_line_buffer);
    3.81 +-	  entry->data = 0;
    3.82 + 	}
    3.83 +       entry = previous_history ();
    3.84 +     }
    3.85 +--- a/patchlevel	2013-11-15 14:11:11.000000000 +0100
    3.86 ++++ b/patchlevel	2014-10-04 21:30:27.625638402 +0200
    3.87 +@@ -1,3 +1,3 @@
    3.88 + # Do not edit -- exists only for use by patch
    3.89 + 
    3.90 +-5
    3.91 ++8
    3.92 +--- a/readline.c	2013-10-28 19:58:06.000000000 +0100
    3.93 ++++ b/readline.c	2014-10-04 21:30:25.951590557 +0200
    3.94 +@@ -744,7 +744,8 @@
    3.95 +     r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
    3.96 + 
    3.97 +   RL_CHECK_SIGNALS ();
    3.98 +-  if (r == 0)			/* success! */
    3.99 ++  /* We only treat values < 0 specially to simulate recursion. */
   3.100 ++  if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */
   3.101 +     {
   3.102 +       _rl_keyseq_chain_dispose ();
   3.103 +       RL_UNSETSTATE (RL_STATE_MULTIKEY);
   3.104 +@@ -964,7 +965,7 @@
   3.105 + #if defined (VI_MODE)
   3.106 +   if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
   3.107 +       key != ANYOTHERKEY &&
   3.108 +-      rl_key_sequence_length == 1 &&	/* XXX */
   3.109 ++      _rl_dispatching_keymap == vi_movement_keymap &&
   3.110 +       _rl_vi_textmod_command (key))
   3.111 +     _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
   3.112 + #endif
   3.113 +--- a/rltypedefs.h	2011-03-26 19:53:31.000000000 +0100
   3.114 ++++ b/rltypedefs.h	2014-10-04 21:30:26.747613312 +0200
   3.115 +@@ -26,6 +26,25 @@
   3.116 + extern "C" {
   3.117 + #endif
   3.118 + 
   3.119 ++/* Old-style, attempt to mark as deprecated in some way people will notice. */
   3.120 ++
   3.121 ++#if !defined (_FUNCTION_DEF)
   3.122 ++#  define _FUNCTION_DEF
   3.123 ++
   3.124 ++#if defined(__GNUC__) || defined(__clang__)
   3.125 ++typedef int Function () __attribute__ ((deprecated));
   3.126 ++typedef void VFunction () __attribute__ ((deprecated));
   3.127 ++typedef char *CPFunction () __attribute__ ((deprecated));
   3.128 ++typedef char **CPPFunction () __attribute__ ((deprecated));
   3.129 ++#else
   3.130 ++typedef int Function ();
   3.131 ++typedef void VFunction ();
   3.132 ++typedef char *CPFunction ();
   3.133 ++typedef char **CPPFunction ();
   3.134 ++#endif
   3.135 ++
   3.136 ++#endif /* _FUNCTION_DEF */
   3.137 ++
   3.138 + /* New style. */
   3.139 + 
   3.140 + #if !defined (_RL_FUNCTION_TYPEDEF)
   3.141 +--- a/util.c	2013-09-02 19:36:12.000000000 +0200
   3.142 ++++ b/util.c	2014-10-04 21:30:26.206597848 +0200
   3.143 +@@ -476,6 +476,7 @@
   3.144 +   return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));
   3.145 + }
   3.146 + 
   3.147 ++#if defined (DEBUG)
   3.148 + #if defined (USE_VARARGS)
   3.149 + static FILE *_rl_tracefp;
   3.150 + 
   3.151 +@@ -538,6 +539,7 @@
   3.152 +   _rl_tracefp = fp;
   3.153 + }
   3.154 + #endif
   3.155 ++#endif /* DEBUG */
   3.156 + 
   3.157 + 
   3.158 + #if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT)