File project.diff of Package readline8

--- baselibs.conf.orig
+++ baselibs.conf
@@ -1,9 +1,7 @@
 libreadline8
   obsoletes "readline-<targettype> <= <version>"
   provides "readline-<targettype> = <version>"
-readline-devel
+readline8-devel
  requires -readline-<targettype>
  requires "libreadline8-<targettype> = <version>"
  conflicts "readline5-devel-<targettype>"
- conflicts "readline6-devel-<targettype>"
- conflicts "readline7-devel-<targettype>"
--- readline-5.2-conf.patch.orig
+++ readline-5.2-conf.patch
@@ -5,8 +5,8 @@
  3 files changed, 47 insertions(+), 13 deletions(-)
 
 --- lib/readline/bind.c
-+++ lib/readline/bind.c	2018-11-29 08:33:08.921317296 +0000
-@@ -850,6 +850,9 @@ rl_function_of_keyseq_len (const char *k
++++ lib/readline/bind.c	2022-04-28 12:11:29.254618915 +0000
+@@ -962,6 +962,9 @@ rl_trim_arg_from_keyseq	(const char *key
  /* The last key bindings file read. */
  static char *last_readline_init_file = (char *)NULL;
  
@@ -16,7 +16,7 @@
  /* The file we're currently reading key bindings from. */
  static const char *current_readline_init_file;
  static int current_readline_init_include_level;
-@@ -917,11 +920,14 @@ rl_re_read_init_file (int count, int ign
+@@ -1029,11 +1032,14 @@ rl_re_read_init_file (int count, int ign
    return r;
  }
  
@@ -32,7 +32,7 @@
       4. /etc/inputrc
     If the file existed and could be opened and read, 0 is returned,
     otherwise errno is returned. */
-@@ -930,18 +936,39 @@ rl_read_init_file (const char *filename)
+@@ -1042,18 +1048,39 @@ rl_read_init_file (const char *filename)
  {
    /* Default the filename. */
    if (filename == 0)
@@ -80,7 +80,7 @@
  #if defined (__MSDOS__)
    if (_rl_read_init_file (filename, 0) == 0)
      return 0;
-@@ -1681,7 +1708,14 @@ remove_trailing:
+@@ -1811,7 +1838,14 @@ rl_parse_and_bind (char *string)
  	  rl_macro_bind (seq, &funname[1], _rl_keymap);
  	}
        else
@@ -96,28 +96,28 @@
  
        xfree (seq);
        return 0;
-@@ -1850,7 +1884,6 @@ typedef int _rl_sv_func_t PARAMS((const
- #define V_INT		2
- 
+@@ -1985,7 +2019,6 @@ typedef int _rl_sv_func_t (const char *)
  /* Forward declarations */
--static int sv_bell_style PARAMS((const char *));
- static int sv_combegin PARAMS((const char *));
- static int sv_dispprefix PARAMS((const char *));
- static int sv_compquery PARAMS((const char *));
+ static int sv_region_start_color (const char *);
+ static int sv_region_end_color (const char *);
+-static int sv_bell_style (const char *);
+ static int sv_combegin (const char *);
+ static int sv_dispprefix (const char *);
+ static int sv_compquery (const char *);
 --- lib/readline/doc/rluser.texi
-+++ lib/readline/doc/rluser.texi	2018-11-29 08:33:08.921317296 +0000
-@@ -349,7 +349,8 @@ file is taken from the value of the envi
++++ lib/readline/doc/rluser.texi	2022-04-28 12:10:02.600171100 +0000
+@@ -350,7 +350,8 @@ file is taken from the value of the envi
  @end ifclear
  that variable is unset, the default is @file{~/.inputrc}.  If that
  file does not exist or cannot be read, the ultimate default is
 -@file{/etc/inputrc}.
 +@file{/etc/inputrc}. If both @file{~/.inputrc} and @file{/etc/inputrc}
 +exist Readline will read first @file{/etc/inputrc} and then @file{~/.inputrc}.
- 
- When a program which uses the Readline library starts up, the
- init file is read, and the key bindings are set.
+ @ifset BashFeatures
+ The @w{@code{bind}} builtin command can also be used to set Readline
+ keybindings and variables.
 --- lib/readline/rlconf.h
-+++ lib/readline/rlconf.h	2018-11-29 08:33:08.921317296 +0000
++++ lib/readline/rlconf.h	2022-04-28 12:10:02.600171100 +0000
 @@ -37,7 +37,7 @@
  #define HANDLE_SIGNALS
  
--- readline-6.2-metamode.patch.orig
+++ readline-6.2-metamode.patch
@@ -4,7 +4,7 @@
 
 --- lib/readline/bind.c
 +++ lib/readline/bind.c	2018-09-20 06:40:06.799183658 +0000
-@@ -1827,6 +1827,7 @@ static const struct {
+@@ -1958,6 +1958,7 @@ static const struct {
  #if defined (VISIBLE_STATS)
    { "visible-stats",		&rl_visible_stats,		0 },
  #endif /* VISIBLE_STATS */
--- readline-6.2-xmalloc.dif.orig
+++ readline-6.2-xmalloc.dif
@@ -38,6 +38,6 @@
 +#define xrealloc _rl_xrealloc
 +#define xfree    _rl_xfree
 +
- extern PTR_T xmalloc PARAMS((size_t));
- extern PTR_T xrealloc PARAMS((void *, size_t));
- extern void xfree PARAMS((void *));
+ extern PTR_T xmalloc (size_t);
+ extern PTR_T xrealloc (void *, size_t);
+ extern void xfree (void *);
--- readline-6.3-destdir.patch.orig
+++ readline-6.3-destdir.patch
@@ -1,10 +1,10 @@
 ---
  shlib/Makefile.in     |    9 +++++----
- support/shlib-install |   47 +++++++++++++++++++++++++++--------------------
- 2 files changed, 32 insertions(+), 24 deletions(-)
+ support/shlib-install |   39 +++++++++++++++++++++++----------------
+ 2 files changed, 28 insertions(+), 20 deletions(-)
 
 --- shlib/Makefile.in
-+++ shlib/Makefile.in	2018-09-20 06:43:10.055842585 +0000
++++ shlib/Makefile.in	2020-10-12 15:18:05.027444750 +0000
 @@ -59,6 +59,7 @@ bindir = @bindir@
  libdir = @libdir@
  datadir = @datadir@
@@ -36,7 +36,7 @@
  
  uninstall-unsupported:
 --- support/shlib-install
-+++ support/shlib-install	2018-09-20 06:44:54.757933583 +0000
++++ support/shlib-install	2020-10-12 15:24:18.932389177 +0000
 @@ -3,7 +3,7 @@
  # shlib-install - install a shared library and do any necessary host-specific
  #		  post-installation configuration (like ldconfig)
@@ -46,7 +46,7 @@
  #
  # Chet Ramey
  # chet@po.cwru.edu
-@@ -12,10 +12,12 @@
+@@ -12,7 +12,9 @@
  # defaults
  #
  INSTALLDIR=/usr/local/lib
@@ -55,11 +55,7 @@
 +DESTDIR=
  
  PROGNAME=`basename $0`
--USAGE="$PROGNAME [-D] -O host_os [-V host_vendor] -d installation-dir [-b bin-dir] -i install-prog [-U] library"
-+USAGE="$PROGNAME [-D] -O host_os [-V host_vendor] [-l linkage-dir] -d installation-dir [-b bin-dir] -i install-prog [-U] library"
- 
- # process options
- 
+ USAGE="$PROGNAME [-D] -O host_os [-V host_vendor] -d installation-dir [-b bin-dir] -i install-prog [-U] library"
 @@ -24,14 +26,19 @@ while [ $# -gt 0 ]; do
  	-O)	shift; host_os="$1"; shift ;;
  	-V)	shift; host_vendor="$1"; shift ;;
@@ -126,7 +122,7 @@
  # Create symlinks to the installed library.  This section is incomplete.
 @@ -120,27 +127,27 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR &&
  case "$host_os-$host_vendor" in
- *linux*|freebsd*-gentoo)
+ *linux*|freebsd*|dragonfly*)
  	# libname.so.M -> libname.so.M.N
 -	${echo} ${RM} ${INSTALLDIR}/$LINK2
 +	${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2
@@ -166,31 +162,8 @@
  	if [ -z "$uninstall" ]; then
  		eval $INSTALL_LINK1
  	fi
-@@ -159,19 +166,19 @@ solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|iri
- freebsd3*|freebsdaout*)
- 	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
- 		# libname.so -> libname.so.M
--		${echo} ${RM} ${INSTALLDIR}/$LINK1
-+		${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1
- 		if [ -z "$uninstall" ]; then
- 			eval $INSTALL_LINK1
- 		fi
- 	else
- 		# libname.so.M -> libname.so.M.N
--		${echo} ${RM} ${INSTALLDIR}/$LINK2
-+		${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2
- 		if [ -z "$uninstall" ]; then
- 			eval $INSTALL_LINK2
- 		fi
- 
- 		# libname.so -> libname.so.M.N
--		${echo} ${RM} ${INSTALLDIR}/$LINK1
-+		${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1
- 		if [ -z "$uninstall" ]; then
- 			eval $INSTALL_LINK1
- 		fi
-@@ -188,7 +195,7 @@ freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*
- 	
+@@ -156,7 +163,7 @@ solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|iri
+ 
  hpux1*)
  	# libname.sl -> libname.M
 -	${echo} ${RM} ${INSTALLDIR}/$LINK1.sl
--- readline-6.3-input.dif.orig
+++ readline-6.3-input.dif
@@ -5,7 +5,7 @@
 
 --- lib/readline/input.c
 +++ lib/readline/input.c	2018-11-29 08:29:58.432878428 +0000
-@@ -501,6 +501,8 @@ rl_read_key (void)
+@@ -801,6 +801,8 @@ rl_read_key (void)
    return (c);
  }
  
@@ -14,7 +14,7 @@
  int
  rl_getc (FILE *stream)
  {
-@@ -542,7 +544,10 @@ rl_getc (FILE *stream)
+@@ -862,7 +864,10 @@ rl_getc (FILE *stream)
        /* If zero characters are returned, then the file that we are
  	 reading from is empty!  Return EOF in that case. */
        if (result == 0)
@@ -28,7 +28,7 @@
        if (errno == EINTR)
 --- lib/readline/readline.c
 +++ lib/readline/readline.c	2018-11-29 08:29:58.432878428 +0000
-@@ -525,6 +525,9 @@ _rl_internal_char_cleanup (void)
+@@ -557,6 +557,9 @@ _rl_internal_char_cleanup (void)
      _rl_erase_entire_line ();
  }
  
@@ -38,7 +38,7 @@
  STATIC_CALLBACK int
  #if defined (READLINE_CALLBACKS)
  readline_internal_char (void)
-@@ -573,6 +576,10 @@ readline_internal_charloop (void)
+@@ -614,6 +617,10 @@ readline_internal_charloop (void)
        c = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_READCMD);
  
--- readline-6.3-rltrace.patch.orig
+++ readline-6.3-rltrace.patch
@@ -7,7 +7,7 @@ temporary files from public location wit
 
 --- lib/readline/util.c
 +++ lib/readline/util.c	2018-09-20 06:47:51.238715688 +0000
-@@ -487,10 +487,12 @@ _rl_trace (va_alist)
+@@ -489,10 +489,12 @@ _rl_trace (va_alist)
  
    if (_rl_tracefp == 0)
      _rl_tropen ();
@@ -21,7 +21,7 @@ temporary files from public location wit
    va_end (args);
  }
  
-@@ -510,7 +512,7 @@ _rl_tropen (void)
+@@ -512,7 +514,7 @@ _rl_tropen (void)
  #endif
    snprintf (fnbuf, sizeof (fnbuf), "%s/rltrace.%ld", x, (long)getpid());
    unlink(fnbuf);
@@ -30,7 +30,7 @@ temporary files from public location wit
    return _rl_tracefp != 0;
  }
  
-@@ -519,7 +521,8 @@ _rl_trclose (void)
+@@ -521,7 +523,8 @@ _rl_trclose (void)
  {
    int r;
  
--- readline-7.0-screen.patch.orig
+++ readline-7.0-screen.patch
@@ -10,7 +10,7 @@ This helps to get /etc/inputrc work for
 
 --- lib/readline/bind.c
 +++ lib/readline/bind.c	2019-08-16 08:26:42.327029248 +0000
-@@ -1195,19 +1195,34 @@ parser_if (char *args)
+@@ -1313,19 +1313,34 @@ parser_if (char *args)
       word in ARGS is the same as the value stored in rl_readline_name. */
    if (rl_terminal_name && _rl_strnicmp (args, "term=", 5) == 0)
      {