rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Accepting request 774813 from Base:System

Browse Source 
- Add ncurses patch 20200215
  + improve manual page for panel library, extending the portability
    section as well as documenting error-returns.
  + show tic's version when installing terminal database in run_tic.sh
  + correct check for gcc vs other compilers used in ncurses 6.0, from
    FreeBSD patch by Kyle Evans (cf: 20150725).
  + add notes for 6.2 to INSTALL.

- Update to ncurses 6.2 (patch 20200212)
  * Add 20200212 6.2 release for upload to ftp.gnu.org
    + update release notes
    + minor build-fixes, mostly to test-package scripts
  * Add ncurses patch20200208
    + modify check for sizeof(wchar_t) to ensure it gives useful result
      when cross-compiling.
    + drop assumption in configure script that Cygwin's linker is broken.
    + define NCURSES_BROKEN_LINKER if the broken-linker feature is used,
    to simplify configure-checks for ncurses-examples.
  * Add ncurses patch20200202
    + reassert copyright on ncurses, per discussion in ncurses FAQ:
      https://invisible-island.net/ncurses/ncurses.faq.html#relicensed
  * Add ncurses patch20200201
    + modify comparison in make_hash.c to correct a special case in
      collision handling for Caps-hpux11
    + add testing utility report_hashing to check hash-tables used for
      terminfo and termcap names.
    + fix a missing prototype for _nc_free_and_exit().
    + update a few comments about tack 1.07
    + use an awk script to split too-long pathnames used in Ada95 sample
      programs for explain.txt

OBS-URL: https://build.opensuse.org/request/show/774813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=166
This commit is contained in:
Dominique Leuenberger 2020-02-21 15:39:59 +00:00 committed by Git OBS Bridge
commit e0bfc6f83e
11 changed files with 169 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ncurses-5.7-tack.dif
View File

@ -3,8 +3,8 @@
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
--- tack/Makefile.in --- tack/Makefile.in
+++ tack/Makefile.in 2018-01-22 11:17:39.717358930 +0000 +++ tack/Makefile.in 2020-02-12 11:04:53.991231022 +0000
@@ -84,7 +84,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -85,7 +85,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg CFLAGS_PROFILE = $(CCFLAGS) -pg
@ -13,7 +13,7 @@
CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
@@ -93,7 +93,7 @@ ABI_VERSION = @cf_cv_abi_version@ @@ -94,7 +94,7 @@ ABI_VERSION = @cf_cv_abi_version@
LOCAL_LIBDIR = @top_builddir@/lib LOCAL_LIBDIR = @top_builddir@/lib
LD = @LD@ LD = @LD@
@ -22,7 +22,7 @@
LDFLAGS = @EXTRA_LDFLAGS@ @TINFO_LDFLAGS@ \ LDFLAGS = @EXTRA_LDFLAGS@ @TINFO_LDFLAGS@ \
@LDFLAGS@ @LD_MODEL@ @TINFO_LIBS@ @LIBS@ @LDFLAGS@ @LD_MODEL@ @TINFO_LIBS@ @LIBS@
@@ -101,7 +101,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI @@ -102,7 +102,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG) LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG)
LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
@ -31,7 +31,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
@@ -165,10 +165,10 @@ DEPS_TACK = \ @@ -166,10 +166,10 @@ DEPS_TACK = \
$(MODEL)/tack$o $(MODEL)/tack$o
tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES) tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES)

2
ncurses-5.9-ibm327x.dif
View File

@ -4,7 +4,7 @@
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000
@@ -17044,8 +17044,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv @@ -17051,8 +17051,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
# #
ibm327x|line mode IBM 3270 style, ibm327x|line mode IBM 3270 style,

3
ncurses-6.1-patches.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b58c0c1f395e26837ef5ac61108bfd63cb57f5be2ed1207b5099492d7773f11a
size 2033554

3
ncurses-6.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
size 3365395

3
ncurses-6.2-patches.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9baa9af598a438ab2ff39172f40f63a52604067983c033a811a9d591224a2689
size 10048

162
ncurses-6.1.dif → ncurses-6.2.dif
View File

@ -21,8 +21,8 @@
19 files changed, 248 insertions(+), 77 deletions(-) 19 files changed, 248 insertions(+), 77 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2019-11-11 09:30:23.206670737 +0000 +++ aclocal.m4 2020-02-12 11:05:15.034837378 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -583,7 +583,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[ AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out rm -f cf_test.out
AC_TRY_RUN([ AC_TRY_RUN([
@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -5280,12 +5280,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -5313,12 +5313,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -49,7 +49,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -5295,7 +5298,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5328,7 +5331,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -58,7 +58,7 @@
CF_EOF CF_EOF
fi fi
@@ -5335,7 +5338,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5368,7 +5371,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -67,7 +67,7 @@
CF_EOF CF_EOF
fi fi
@@ -5344,23 +5347,23 @@ case "$MANPAGE_FORMAT" in @@ -5377,23 +5380,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -97,7 +97,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -5369,7 +5372,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5402,7 +5405,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -106,7 +106,7 @@
then then
continue continue
fi fi
@@ -5379,18 +5382,18 @@ CF_EOF @@ -5412,18 +5415,18 @@ CF_EOF
case "x$LN_S" in case "x$LN_S" in
(*-f) (*-f)
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -128,7 +128,7 @@
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -5410,9 +5413,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -5443,9 +5446,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -141,7 +141,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -5432,6 +5435,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5465,6 +5468,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -150,7 +150,7 @@
esac esac
done done
--- configure --- configure
+++ configure 2019-11-11 09:30:23.210670661 +0000 +++ configure 2020-02-12 11:05:15.034837378 +0000
@@ -5596,7 +5596,7 @@ echo $ECHO_N "checking for an rpath opti @@ -5596,7 +5596,7 @@ echo $ECHO_N "checking for an rpath opti
fi fi
;; ;;
@ -160,7 +160,7 @@
;; ;;
(openbsd[2-9].*|mirbsd*) (openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath," LD_RPATH_OPT="-Wl,-rpath,"
@@ -14082,12 +14082,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -14068,12 +14068,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source echo '? missing rename for '\$cf_source
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -178,7 +178,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -14097,7 +14100,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14083,7 +14086,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -187,7 +187,7 @@
CF_EOF CF_EOF
fi fi
@@ -14137,7 +14140,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14123,7 +14126,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -196,7 +196,7 @@
CF_EOF CF_EOF
fi fi
@@ -14146,23 +14149,23 @@ case "$MANPAGE_FORMAT" in @@ -14132,23 +14135,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -226,7 +226,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -14171,7 +14174,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14157,7 +14160,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then if test -f \$cf_alias\${suffix} ; then
@ -235,7 +235,7 @@
then then
continue continue
fi fi
@@ -14181,18 +14184,18 @@ CF_EOF @@ -14167,18 +14170,18 @@ CF_EOF
case "x$LN_S" in case "x$LN_S" in
(*-f) (*-f)
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -257,7 +257,7 @@
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -14212,9 +14215,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -14198,9 +14201,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -270,7 +270,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -14234,6 +14237,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -14220,6 +14223,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -278,7 +278,7 @@
;; ;;
esac esac
done done
@@ -25378,6 +25382,7 @@ if test "$with_termlib" != no ; then @@ -25398,6 +25402,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}" TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -287,8 +287,8 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2019-11-11 09:30:23.210670661 +0000 +++ include/curses.h.in 2020-02-12 11:05:15.034837378 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -186,6 +186,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t; typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif #endif
@ -299,8 +299,8 @@
* We need FILE, etc. Include this before checking any feature symbols. * We need FILE, etc. Include this before checking any feature symbols.
*/ */
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2019-11-11 09:30:23.210670661 +0000 +++ include/termcap.h.in 2020-02-12 11:05:15.034837378 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -47,6 +47,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -310,8 +310,8 @@
#undef NCURSES_OSPEED #undef NCURSES_OSPEED
--- include/tic.h --- include/tic.h
+++ include/tic.h 2019-11-11 09:30:23.210670661 +0000 +++ include/tic.h 2020-02-12 11:05:15.038837303 +0000
@@ -236,12 +236,12 @@ struct user_table_entry @@ -237,12 +237,12 @@ struct user_table_entry
*/ */
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */
@ -327,8 +327,8 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2019-11-11 09:30:23.210670661 +0000 +++ man/man_db.renames 2020-02-12 11:05:15.038837303 +0000
@@ -163,6 +163,7 @@ term.7 term.7 @@ -164,6 +164,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5 terminfo.5 terminfo.5
terminfo.\\\*n terminfo.5 terminfo.\\\*n terminfo.5
@ -336,7 +336,7 @@
tic.1m tic.1 tic.1m tic.1
toe.1m toe.1 toe.1m toe.1
tput.1 tput.1 tput.1 tput.1
@@ -171,6 +172,7 @@ user_caps.5 user_caps.5 @@ -172,6 +173,7 @@ user_caps.5 user_caps.5
wresize.3x wresize.3ncurses wresize.3x wresize.3ncurses
# #
# Other: # Other:
@ -345,8 +345,8 @@
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2019-11-11 09:30:23.210670661 +0000 +++ man/ncurses.3x 2020-02-12 11:05:15.038837303 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB @@ -140,6 +140,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes .SS Datatypes
.PP .PP
@ -358,8 +358,8 @@
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2019-11-15 13:14:38.635601252 +0000 +++ misc/gen-pkgconfig.in 2020-02-12 11:05:15.038837303 +0000
@@ -88,6 +88,9 @@ do @@ -89,6 +89,9 @@ do
-specs*) # ignore linker specs-files which were used to build library -specs*) # ignore linker specs-files which were used to build library
continue continue
;; ;;
@ -369,7 +369,7 @@
-Wl,-z,*) # ignore flags used to manipulate shared image -Wl,-z,*) # ignore flags used to manipulate shared image
continue continue
;; ;;
@@ -131,6 +134,7 @@ do @@ -141,6 +144,7 @@ do
LIBS="-l$name" LIBS="-l$name"
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
@ -377,7 +377,7 @@
reqs= reqs=
if [ $name = $MAIN_LIBRARY ]; then if [ $name = $MAIN_LIBRARY ]; then
@@ -141,9 +145,11 @@ do @@ -151,9 +155,11 @@ do
desc="$desc terminal interface library" desc="$desc terminal interface library"
elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@ -389,7 +389,7 @@
desc="$desc add-on library" desc="$desc add-on library"
fi fi
@@ -153,6 +159,8 @@ do @@ -163,6 +169,8 @@ do
[ $NEED_TINFO != yes ] ; then [ $NEED_TINFO != yes ] ; then
[ -n "$reqs" ] && reqs="$reqs, " [ -n "$reqs" ] && reqs="$reqs, "
reqs="${reqs}${SUB_LIBRARY}${suffix}" reqs="${reqs}${SUB_LIBRARY}${suffix}"
@ -399,7 +399,7 @@
if [ $name = $MAIN_LIBRARY ] if [ $name = $MAIN_LIBRARY ]
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2019-11-11 09:30:23.214670585 +0000 +++ misc/terminfo.src 2020-02-12 11:05:15.042837228 +0000
@@ -305,7 +305,9 @@ dumb|80-column dumb tty, @@ -305,7 +305,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -531,7 +531,7 @@
use=xterm-new, use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by # This entry assumes that xterm's handling of VT100 SI/SO is disabled by
@@ -5406,7 +5437,7 @@ xterms-sun|small (80x24) xterm with sunF @@ -5407,7 +5438,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE) #### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@ -540,7 +540,7 @@
bce, bce,
kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color, use=xterm-color,
@@ -5657,10 +5688,14 @@ mgt|Multi GNOME Terminal, @@ -5658,10 +5689,14 @@ mgt|Multi GNOME Terminal,
#### KDE #### KDE
# This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
# or not is debatable). # or not is debatable).
@ -556,7 +556,7 @@
# Konsole 1.0.1 (2001/11/25) # Konsole 1.0.1 (2001/11/25)
# (formerly known as kvt) # (formerly known as kvt)
# #
@@ -5872,14 +5907,14 @@ mlterm3|multi lingual terminal emulator, @@ -5873,14 +5908,14 @@ mlterm3|multi lingual terminal emulator,
mlterm2|multi lingual terminal emulator, mlterm2|multi lingual terminal emulator,
am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
colors#8, cols#80, it#8, lines#24, pairs#64, colors#8, cols#80, it#8, lines#24, pairs#64,
@ -574,7 +574,7 @@
home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
il=\E[%p1%dL, il1=\E[L, ind=\n, il=\E[%p1%dL, il1=\E[L, ind=\n,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
@@ -5936,6 +5971,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 @@ -5937,6 +5972,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
# rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
# Since rxvt is not really compatible with xterm, it should be configured as # Since rxvt is not really compatible with xterm, it should be configured as
# "rxvt" or "rxvt-color". # "rxvt" or "rxvt-color".
@ -582,7 +582,7 @@
# #
# removed dch/dch1 because they are inconsistent with bce/ech -TD # removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD # remove km as per tack test -TD
@@ -5947,13 +5983,14 @@ rxvt-basic|rxvt terminal base (X Window @@ -5948,13 +5984,14 @@ rxvt-basic|rxvt terminal base (X Window
clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r, clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
@ -600,7 +600,7 @@
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
rmul=\E[24m, rmul=\E[24m,
rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
@@ -5964,7 +6001,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -5965,7 +6002,7 @@ rxvt-basic|rxvt terminal base (X Window
%p9%t\016%e\017%;, %p9%t\016%e\017%;,
sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
@ -609,7 +609,7 @@
# Key Codes from rxvt reference: # Key Codes from rxvt reference:
# #
# Note: Shift + F1-F10 generates F11-F20 # Note: Shift + F1-F10 generates F11-F20
@@ -6047,8 +6084,8 @@ rxvt-basic|rxvt terminal base (X Window @@ -6048,8 +6085,8 @@ rxvt-basic|rxvt terminal base (X Window
# Removed kDN6, etc (control+shift) since rxvt does not implement this -TD # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
rxvt+pcfkeys|fragment for PC-style fkeys, rxvt+pcfkeys|fragment for PC-style fkeys,
kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
@ -620,7 +620,7 @@
kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
@@ -6139,6 +6176,38 @@ rxvt-cygwin-native|rxvt terminal emulato @@ -6140,6 +6177,38 @@ rxvt-cygwin-native|rxvt terminal emulato
\302x\263y\363z\362{\343|\330~\376, \302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin, use=rxvt-cygwin,
@ -659,7 +659,7 @@
# This variant is supposed to work with rxvt 2.7.7 when compiled with # This variant is supposed to work with rxvt 2.7.7 when compiled with
# NO_BRIGHTCOLOR defined. rxvt needs more work... # NO_BRIGHTCOLOR defined. rxvt needs more work...
rxvt-16color|rxvt with 16 colors like aixterm, rxvt-16color|rxvt with 16 colors like aixterm,
@@ -6185,7 +6254,7 @@ mrxvt-256color|multitabbed rxvt with 256 @@ -6186,7 +6255,7 @@ mrxvt-256color|multitabbed rxvt with 256
# Eterm 0.9.3 # Eterm 0.9.3
# #
# removed kf0 which conflicts with kf10 -TD # removed kf0 which conflicts with kf10 -TD
@ -668,7 +668,7 @@
# Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT
# but does otherwise follow the rxvt+pcfkeys model -TD # but does otherwise follow the rxvt+pcfkeys model -TD
# remove nonworking flash -TD # remove nonworking flash -TD
@@ -6199,12 +6268,12 @@ Eterm|Eterm-color|Eterm with xterm-style @@ -6200,12 +6269,12 @@ Eterm|Eterm-color|Eterm with xterm-style
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -683,7 +683,7 @@
kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
@@ -7151,7 +7220,7 @@ pty|4bsd pseudo teletype, @@ -7158,7 +7227,7 @@ pty|4bsd pseudo teletype,
# https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el
# #
# The codes supported by the term.el terminal emulation in GNU Emacs 19.30 # The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@ -692,7 +692,7 @@
am, mir, xenl, am, mir, xenl,
cols#80, lines#24, cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
@@ -7164,6 +7233,13 @@ eterm|gnu emacs term.el terminal emulati @@ -7171,6 +7240,13 @@ eterm|gnu emacs term.el terminal emulati
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
smul=\E[4m, smul=\E[4m,
@ -706,7 +706,7 @@
# The codes supported by the term.el terminal emulation in GNU Emacs 22.2 # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
@@ -7292,7 +7368,7 @@ screen|VT 100/ANSI X3.64 virtual termina @@ -7299,7 +7375,7 @@ screen|VT 100/ANSI X3.64 virtual termina
dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG, enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
@ -715,7 +715,7 @@
kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
@@ -7413,6 +7489,13 @@ screen.xterm-xfree86|screen.xterm-new|sc @@ -7420,6 +7496,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
use=xterm+x11mouse, use=xterm-new, use=xterm+x11mouse, use=xterm-new,
#:screen.xterm|screen for modern xterm, #:screen.xterm|screen for modern xterm,
#: use=screen.xterm-new, #: use=screen.xterm-new,
@ -729,7 +729,7 @@
# xterm-r6 does not really support khome/kend unless it is propped up by # xterm-r6 does not really support khome/kend unless it is propped up by
# the translations resource. # the translations resource.
screen.xterm-r6|screen customized for X11R6 xterm, screen.xterm-r6|screen customized for X11R6 xterm,
@@ -7500,7 +7583,7 @@ screen2|old VT 100/ANSI X3.64 virtual te @@ -7507,7 +7590,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL,
@ -738,7 +738,7 @@
kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH,
nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
@@ -9403,7 +9486,7 @@ hp700-wy|HP700/41 emulating wyse30, @@ -9410,7 +9493,7 @@ hp700-wy|HP700/41 emulating wyse30,
ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@ -747,7 +747,7 @@
am, da, db, xhp, am, da, db, xhp,
cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA,
@@ -12633,6 +12716,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit @@ -12640,6 +12723,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
# at support for the VT320 itself. # at support for the VT320 itself.
# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
# (vt320-k3: I added <rmam>/<smam> based on the init string -- esr) # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -755,7 +755,7 @@
vt320-k3|MS-Kermit 3.00's vt320 emulation, vt320-k3|MS-Kermit 3.00's vt320 emulation,
am, eslok, hs, km, mir, msgr, xenl, am, eslok, hs, km, mir, msgr, xenl,
cols#80, it#8, lines#49, pb#9600, vt#3, cols#80, it#8, lines#49, pb#9600, vt#3,
@@ -12642,7 +12726,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio @@ -12649,7 +12733,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -764,7 +764,7 @@
dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
?5l, ?5l,
@@ -17054,7 +17138,7 @@ ibm3101|i3101|IBM 3101-10, @@ -17061,7 +17145,7 @@ ibm3101|i3101|IBM 3101-10,
cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH,
@ -773,7 +773,7 @@
is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B,
sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t
@@ -17312,7 +17396,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De @@ -17319,7 +17403,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
tbc=\E[3g, use=ecma+index, tbc=\E[3g, use=ecma+index,
# "Megapel" refers to the display adapter, which was used with the IBM RT # "Megapel" refers to the display adapter, which was used with the IBM RT
# aka IBM 6150. # aka IBM 6150.
@ -783,8 +783,8 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- ncurses/Makefile.in
+++ ncurses/Makefile.in 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/Makefile.in 2020-02-12 11:05:15.042837228 +0000
@@ -222,7 +222,7 @@ $(DESTDIR)$(libdir) : @@ -224,7 +224,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
./fallback.c : $(tinfo)/MKfallback.sh ./fallback.c : $(tinfo)/MKfallback.sh
@ -794,8 +794,8 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/curses.priv.h 2020-02-12 11:05:15.042837228 +0000
@@ -2244,6 +2244,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2245,6 +2245,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -805,7 +805,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh --- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/run_cmd.sh 2020-02-12 11:05:15.042837228 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -819,8 +819,8 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/tinfo/MKfallback.sh 2020-02-12 11:05:15.042837228 +0000
@@ -71,6 +71,12 @@ else @@ -72,6 +72,12 @@ else
tmp_info= tmp_info=
fi fi
@ -834,8 +834,8 @@
/* This file was generated by $0 */ /* This file was generated by $0 */
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/tinfo/access.c 2020-02-12 11:05:15.042837228 +0000
@@ -30,6 +30,10 @@ @@ -31,6 +31,10 @@
* Author: Thomas E. Dickey * * Author: Thomas E. Dickey *
****************************************************************************/ ****************************************************************************/
@ -846,7 +846,7 @@
#include <curses.priv.h> #include <curses.priv.h>
#include <ctype.h> #include <ctype.h>
@@ -104,6 +108,30 @@ _nc_basename(char *path) @@ -105,6 +109,30 @@ _nc_basename(char *path)
return path + _nc_pathlast(path); return path + _nc_pathlast(path);
} }
@ -878,8 +878,8 @@
_nc_access(const char *path, int mode) _nc_access(const char *path, int mode)
{ {
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/tinfo/lib_setup.c 2020-02-12 11:05:15.042837228 +0000
@@ -604,6 +604,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) @@ -605,6 +605,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) { } else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */ result = value; /* use extension feature */
} else if ((env = getenv("TERM")) != 0) { } else if ((env = getenv("TERM")) != 0) {
@ -890,8 +890,8 @@
result = 1; /* always broken */ result = 1; /* always broken */
} else if (strstr(env, "screen") != 0 } else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c --- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/tinfo/read_entry.c 2020-02-12 11:05:15.042837228 +0000
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi @@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -899,7 +899,7 @@
if (_nc_access(filename, R_OK) < 0 if (_nc_access(filename, R_OK) < 0
|| (fp = fopen(filename, BIN_R)) == 0) { || (fp = fopen(filename, BIN_R)) == 0) {
TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
@@ -571,6 +572,7 @@ _nc_read_file_entry(const char *const fi @@ -572,6 +573,7 @@ _nc_read_file_entry(const char *const fi
} }
fclose(fp); fclose(fp);
} }
@ -908,8 +908,8 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2019-11-11 09:30:23.214670585 +0000 +++ ncurses/tinfo/read_termcap.c 2020-02-12 11:05:15.042837228 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -323,14 +323,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
(void) lseek(fd, (off_t) 0, SEEK_SET); (void) lseek(fd, (off_t) 0, SEEK_SET);
@ -935,7 +935,7 @@
myfd = TRUE; myfd = TRUE;
} }
lineno = 0; lineno = 0;
@@ -1122,8 +1126,10 @@ _nc_read_termcap_entry(const char *const @@ -1123,8 +1127,10 @@ _nc_read_termcap_entry(const char *const
for (i = 0; i < filecount; i++) { for (i = 0; i < filecount; i++) {
TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i])); TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i]));
@ -946,7 +946,7 @@
_nc_set_source(termpaths[i]); _nc_set_source(termpaths[i]);
/* /*
@@ -1135,6 +1141,7 @@ _nc_read_termcap_entry(const char *const @@ -1136,6 +1142,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp); (void) fclose(fp);
} }
@ -955,8 +955,8 @@
} }
if (copied != 0) if (copied != 0)
--- progs/Makefile.in --- progs/Makefile.in
+++ progs/Makefile.in 2019-11-11 09:30:23.214670585 +0000 +++ progs/Makefile.in 2020-02-12 11:05:15.042837228 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
CFLAGS_PROFILE = $(CCFLAGS) -pg CFLAGS_PROFILE = $(CCFLAGS) -pg
@ -965,7 +965,7 @@
CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
@@ -117,7 +117,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI @@ -118,7 +118,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG) LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG)
LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
@ -975,8 +975,8 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2019-11-11 09:30:23.214670585 +0000 +++ test/test.priv.h 2020-02-12 11:05:15.042837228 +0000
@@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *, @@ -994,12 +994,12 @@ extern char *_nc_strstr(const char *, co
#endif #endif
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */

3
ncurses-6.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d
size 3425862

62
ncurses.changes
View File

@ -1,3 +1,65 @@
-------------------------------------------------------------------
Mon Feb 17 08:37:54 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200215
+ improve manual page for panel library, extending the portability
section as well as documenting error-returns.
+ show tic's version when installing terminal database in run_tic.sh
+ correct check for gcc vs other compilers used in ncurses 6.0, from
FreeBSD patch by Kyle Evans (cf: 20150725).
+ add notes for 6.2 to INSTALL.
-------------------------------------------------------------------
Wed Feb 12 10:55:11 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Update to ncurses 6.2 (patch 20200212)
* Add 20200212 6.2 release for upload to ftp.gnu.org
+ update release notes
+ minor build-fixes, mostly to test-package scripts
* Add ncurses patch20200208
+ modify check for sizeof(wchar_t) to ensure it gives useful result
when cross-compiling.
+ drop assumption in configure script that Cygwin's linker is broken.
+ define NCURSES_BROKEN_LINKER if the broken-linker feature is used,
to simplify configure-checks for ncurses-examples.
* Add ncurses patch20200202
+ reassert copyright on ncurses, per discussion in ncurses FAQ:
https://invisible-island.net/ncurses/ncurses.faq.html#relicensed
* Add ncurses patch20200201
+ modify comparison in make_hash.c to correct a special case in
collision handling for Caps-hpux11
+ add testing utility report_hashing to check hash-tables used for
terminfo and termcap names.
+ fix a missing prototype for _nc_free_and_exit().
+ update a few comments about tack 1.07
+ use an awk script to split too-long pathnames used in Ada95 sample
programs for explain.txt
- Update to tack 1.9 (patch 20200202)
* Update copyright and license. Also, portability fixes.
- Adopt patch ncurses-5.7-tack.dif
- Adopt patch ncurses-6.1.dif which is now ncurses-6.2.dif
-------------------------------------------------------------------
Mon Jan 20 07:14:28 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200118
+ expanded description of XM in user_caps.5
+ improve xm example for xterm+x11mouse, xterm+sm+1006 -TD
+ add history section to curs_slk.3x and curs_terminfo.3x manpages.
+ update alacritty entries for 0.4.0 (prompted by patch by
Christian Durr) -TD
+ correct spelling errors found with codespell.
+ fix for test/configure, from xterm #352.
-------------------------------------------------------------------
Mon Jan 13 09:14:28 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200111
+ improve configure macros which check for the X11/Intrinsic.h header,
to accommodate recent MacOS changes.
+ suppress gcc's -Winline warning; it has not been useful for some time
+ update config.guess, config.sub
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 7 09:12:06 UTC 2020 - Dr. Werner Fink <werner@suse.de> Tue Jan 7 09:12:06 UTC 2020 - Dr. Werner Fink <werner@suse.de>

16
ncurses.spec
View File

@ -56,23 +56,23 @@ Obsoletes: ncurses-64bit
# but also build the ABI version 5 as this is part of the source # but also build the ABI version 5 as this is part of the source
# tar ball including the latest upstream fixes for ABI 5. # tar ball including the latest upstream fixes for ABI 5.
# #
Version: 6.1 Version: 6.2
Release: 0 Release: 0
Summary: Terminal control library Summary: Terminal control library
#Git: http://ncurses.scripts.mit.edu #Git: http://ncurses.scripts.mit.edu
License: MIT License: MIT
Group: System/Base Group: System/Base
URL: http://www.invisible-island.net/ncurses/ncurses.html URL: http://www.invisible-island.net/ncurses/ncurses.html
Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.1.tar.gz Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.2.tar.gz
Source1: ncurses-6.1-patches.tar.bz2 Source1: ncurses-6.2-patches.tar.bz2
Source2: handle.linux Source2: handle.linux
Source3: README.devel Source3: README.devel
Source4: ncurses-rpmlintrc Source4: ncurses-rpmlintrc
# Latest tack can be found at ftp://ftp.invisible-island.net/pub/ncurses/current/ # Latest tack can be found at ftp://ftp.invisible-island.net/pub/ncurses/current/
Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.08-20190721.tgz Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.09-20200202.tgz
Source6: edit.sed Source6: edit.sed
Source7: baselibs.conf Source7: baselibs.conf
Patch0: ncurses-6.1.dif Patch0: ncurses-6.2.dif
Patch1: ncurses-5.9-ibm327x.dif Patch1: ncurses-5.9-ibm327x.dif
Patch2: ncurses-5.7-tack.dif Patch2: ncurses-5.7-tack.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -1044,7 +1044,13 @@ includedir5=%{_incdir}/ncurses5' "$pc"
sed "s@^%{buildroot}@@g" | \ sed "s@^%{buildroot}@@g" | \
grep -v -F -x -f default.list -f screen.list -f iterm.list \ grep -v -F -x -f default.list -f screen.list -f iterm.list \
> extension.list > extension.list
#
# Remove backward compatibilty link if any
#
rm -f %{buildroot}%{_prefix}/lib/terminfo rm -f %{buildroot}%{_prefix}/lib/terminfo
#
# Store pkg-config files
#
cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
%if 0%{?qemu_user_space_build:1}%{?_crossbuild} %if 0%{?qemu_user_space_build:1}%{?_crossbuild}

3
tack-1.08-20190721.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f480c8df1b706f0d65d04fca0486e327cde68acd1a8b819e9860b62a7c9aa7ac
size 232840

3
tack-1.09-20200202.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6117f8045e55302cbdc16217342b6169384ddd51873d072c60ca80846f0ea0e0
size 237953