pool/ncurses
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 403674 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/403674
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=117
This commit is contained in:
Dominique Leuenberger 2016-07-09 07:17:52 +00:00 committed by Git OBS Bridge
commit 21fc07f333
3 changed files with 102 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncurses-6.0-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:62ab6d72cfa3639ac748c4e742b84f7599e1dc4d322e04b688cc89b7266628c1 oid sha256:8274212b194a2d5f4f1283e322277d553188be96e682dfc1ee155de6bfc8c969
size 569615 size 751760

122
ncurses-6.0.dif
View File

@ -21,7 +21,7 @@
19 files changed, 239 insertions(+), 80 deletions(-) 19 files changed, 239 insertions(+), 80 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2016-05-17 10:35:27.099114266 +0000 +++ aclocal.m4 2016-06-13 10:16:37.035750939 +0000
@@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -564,7 +564,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
@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -4677,12 +4677,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -4684,12 +4684,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
@@ -4692,7 +4695,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4699,7 +4702,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
@@ -4732,7 +4735,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4739,7 +4742,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
@@ -4741,23 +4744,23 @@ case "$MANPAGE_FORMAT" in @@ -4748,23 +4751,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
@@ -4766,7 +4769,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4773,7 +4776,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
@@ -4776,18 +4779,18 @@ CF_EOF @@ -4783,18 +4786,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
@@ -4807,9 +4810,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -4814,9 +4817,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" && (
@@ -4829,6 +4832,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4836,6 +4839,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -150,8 +150,8 @@
esac esac
done done
--- configure --- configure
+++ configure 2016-05-17 10:35:27.099114266 +0000 +++ configure 2016-06-13 10:16:37.039750860 +0000
@@ -5867,7 +5867,7 @@ case $cf_cv_system_name in @@ -5885,7 +5885,7 @@ case $cf_cv_system_name in
fi fi
;; ;;
(linux*|gnu*|k*bsd*-gnu|freebsd*) (linux*|gnu*|k*bsd*-gnu|freebsd*)
@ -160,7 +160,7 @@
;; ;;
(openbsd[2-9].*|mirbsd*) (openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath," LD_RPATH_OPT="-Wl,-rpath,"
@@ -11546,12 +11546,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -11564,12 +11564,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
@@ -11561,7 +11564,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11579,7 +11582,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
@@ -11601,7 +11604,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11619,7 +11622,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
@@ -11610,23 +11613,23 @@ case "$MANPAGE_FORMAT" in @@ -11628,23 +11631,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
@@ -11635,7 +11638,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11653,7 +11656,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
@@ -11645,18 +11648,18 @@ CF_EOF @@ -11663,18 +11666,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
@@ -11676,9 +11679,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -11694,9 +11697,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" && (
@@ -11698,6 +11701,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11716,6 +11719,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
@@ -21966,6 +21970,7 @@ if test "$with_termlib" != no ; then @@ -21987,6 +21991,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,7 +287,7 @@
# 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 2016-05-17 10:35:27.099114266 +0000 +++ include/curses.h.in 2016-06-13 10:16:37.039750860 +0000
@@ -165,6 +165,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -165,6 +165,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,7 +299,7 @@
* 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 2016-05-17 10:35:27.103114187 +0000 +++ include/termcap.h.in 2016-06-13 10:16:37.039750860 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_CONST #undef NCURSES_CONST
--- include/tic.h --- include/tic.h
+++ include/tic.h 2016-05-17 10:35:27.103114187 +0000 +++ include/tic.h 2016-06-13 10:16:37.039750860 +0000
@@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias @@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias
*/ */
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2016-05-17 10:35:27.103114187 +0000 +++ man/man_db.renames 2016-06-13 10:16:37.039750860 +0000
@@ -167,6 +167,8 @@ tput.1 tput.1 @@ -167,6 +167,8 @@ tput.1 tput.1
tset.1 tset.1 tset.1 tset.1
vprintf.3s vprintf.3 vprintf.3s vprintf.3
@ -338,7 +338,7 @@
# Other: # Other:
tack.1m tack.1 tack.1m tack.1
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2016-05-17 10:35:27.103114187 +0000 +++ man/ncurses.3x 2016-06-13 10:16:37.039750860 +0000
@@ -121,6 +121,10 @@ after the shell environment variable \fB @@ -121,6 +121,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
@ -351,7 +351,7 @@
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 2016-05-17 10:35:27.103114187 +0000 +++ misc/gen-pkgconfig.in 2016-06-13 10:16:37.039750860 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -391,7 +391,7 @@
echo "** creating ${name}${suffix}.pc" echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in --- misc/ncurses-config.in
+++ misc/ncurses-config.in 2016-05-17 10:35:27.103114187 +0000 +++ misc/ncurses-config.in 2016-06-13 10:16:37.039750860 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do @@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link # compile/link
--cflags) --cflags)
@ -402,7 +402,7 @@
fi fi
if test "${includedir}" != /usr/include ; then if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2016-05-17 10:37:34.480597198 +0000 +++ misc/terminfo.src 2016-06-13 10:16:37.091749844 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -507,7 +507,7 @@
ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
@@ -4405,8 +4417,26 @@ xterm-noapp|xterm with cursor keys in no @@ -4407,8 +4419,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System), xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old, lines#24, use=xterm-old,
@ -534,7 +534,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
@@ -4741,7 +4771,7 @@ xterms-sun|small (80x24) xterm with sunF @@ -4743,7 +4773,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
@ -543,7 +543,7 @@
bce, bce,
kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color, use=xterm-color,
@@ -4910,10 +4940,14 @@ mgt|Multi GNOME Terminal, @@ -4916,10 +4946,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).
@ -559,7 +559,7 @@
# Konsole 1.0.1 # Konsole 1.0.1
# (formerly known as kvt) # (formerly known as kvt)
# #
@@ -5043,14 +5077,14 @@ mlterm3|multi lingual terminal emulator, @@ -5049,14 +5083,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,
@ -577,7 +577,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@,
ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
@@ -5105,6 +5139,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 @@ -5111,6 +5145,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".
@ -585,7 +585,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
@@ -5116,13 +5151,14 @@ rxvt-basic|rxvt terminal base (X Window @@ -5122,13 +5157,14 @@ rxvt-basic|rxvt terminal base (X Window
clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
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=^J, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
@ -603,7 +603,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,
@@ -5131,7 +5167,7 @@ rxvt-basic|rxvt terminal base (X Window @@ -5137,7 +5173,7 @@ rxvt-basic|rxvt terminal base (X Window
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%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,
@ -612,7 +612,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
@@ -5214,8 +5250,8 @@ rxvt-basic|rxvt terminal base (X Window @@ -5220,8 +5256,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,
@ -623,7 +623,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~,
@@ -5272,6 +5308,38 @@ rxvt-cygwin-native|rxvt terminal emulato @@ -5278,6 +5314,38 @@ rxvt-cygwin-native|rxvt terminal emulato
acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376, acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin, use=rxvt-cygwin,
@ -662,7 +662,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,
@@ -5318,7 +5386,7 @@ mrxvt-256color|multitabbed rxvt with 256 @@ -5324,7 +5392,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
@ -671,7 +671,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
@@ -5332,13 +5400,13 @@ Eterm|Eterm-color|Eterm with xterm-style @@ -5338,13 +5406,13 @@ 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,
@ -687,7 +687,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=,
@@ -5912,7 +5980,7 @@ pty|4bsd pseudo teletype, @@ -5918,7 +5986,7 @@ pty|4bsd pseudo teletype,
#### Emacs #### Emacs
# 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
@ -696,7 +696,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=^M, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
@@ -5925,6 +5993,13 @@ eterm|gnu emacs term.el terminal emulati @@ -5931,6 +5999,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,
@ -710,7 +710,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,
@@ -6025,7 +6100,7 @@ screen|VT 100/ANSI X3.64 virtual termina @@ -6031,7 +6106,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, ht=^I, hts=\EH, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH,
ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0,
@ -719,7 +719,7 @@
kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kcuu1=\EOA, 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,
kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
@@ -6221,7 +6296,7 @@ screen2|old VT 100/ANSI X3.64 virtual te @@ -6227,7 +6302,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,
@ -728,7 +728,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=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, nel=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
@@ -7964,7 +8039,7 @@ hp700-wy|HP700/41 emulating wyse30, @@ -7970,7 +8045,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,
@ -737,7 +737,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,
@@ -11099,6 +11174,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit @@ -11105,6 +11180,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)
@ -745,7 +745,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,
@@ -11108,7 +11184,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio @@ -11114,7 +11190,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=^J, cuf=\E[%p1%dC, cuf1=\E[C, cud=\E[%p1%dB, cud1=^J, 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,
@ -754,7 +754,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\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l, flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
@@ -15384,7 +15460,7 @@ ibm3101|i3101|IBM 3101-10, @@ -15390,7 +15466,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=^J, kcub1=\ED, kcud1=\EB, el=\EI, home=\EH, hts=\E0, ind=^J, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH, kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
@ -763,7 +763,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}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162, sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162,
@@ -15625,7 +15701,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De @@ -15631,7 +15707,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
tbc=\E[3g, tbc=\E[3g,
# "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.
@ -773,7 +773,7 @@
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 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/Makefile.in 2016-06-13 10:16:37.043750782 +0000
@@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) : @@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -784,7 +784,7 @@
./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 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/curses.priv.h 2016-06-13 10:16:37.043750782 +0000
@@ -2024,6 +2024,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2024,6 +2024,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);
@ -795,7 +795,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 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/run_cmd.sh 2016-06-13 10:16:37.043750782 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -809,7 +809,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/tinfo/MKfallback.sh 2016-06-13 10:16:37.043750782 +0000
@@ -68,6 +68,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -842,7 +842,7 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/tinfo/access.c 2016-06-13 10:16:37.043750782 +0000
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
#include <ctype.h> #include <ctype.h>
@ -885,7 +885,7 @@
_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 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/tinfo/lib_setup.c 2016-06-13 10:16:37.043750782 +0000
@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) @@ -584,6 +584,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 */
@ -897,16 +897,16 @@
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 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/tinfo/read_entry.c 2016-06-13 10:16:37.043750782 +0000
@@ -435,6 +435,7 @@ _nc_read_file_entry(const char *const fi @@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi
int limit; FILE *fp = 0;
char buffer[MAX_ENTRY_SIZE + 1]; int code;
+ _nc_fsid(); + _nc_fsid();
if (_nc_access(filename, R_OK) < 0 if (_nc_access(filename, R_OK) < 0
|| (fp = fopen(filename, "rb")) == 0) { || (fp = fopen(filename, "rb")) == 0) {
TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
@@ -452,6 +453,7 @@ _nc_read_file_entry(const char *const fi @@ -453,6 +454,7 @@ _nc_read_file_entry(const char *const fi
} }
fclose(fp); fclose(fp);
} }
@ -915,7 +915,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2016-05-17 10:35:27.107114107 +0000 +++ ncurses/tinfo/read_termcap.c 2016-06-13 10:16:37.047750704 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -962,7 +962,7 @@
} }
if (copied != 0) if (copied != 0)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2016-05-17 10:35:27.107114107 +0000 +++ test/test.priv.h 2016-06-13 10:16:37.047750704 +0000
@@ -728,12 +728,12 @@ extern char *strnames[], *strcodes[], *s @@ -728,12 +728,12 @@ extern char *strnames[], *strcodes[], *s
#endif #endif

39
ncurses.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Mon Jun 13 10:09:58 UTC 2016 - werner@suse.de
- Add ncurses patch 20160611
+ revise fix for Debian #805618 (report by Vlado Potisk, cf: 20151128).
+ modify test/ncurses.c a/A screens to make exiting on an escape
character depend on the start of keypad and timeout modes, to allow
better testing of function-keys.
+ modify rs1 for xterm-16color, xterm-88color and xterm-256color to
reset palette using "oc" string as in linux -TD
+ use ANSI reply for u8 in xterm-new, to reflect vt220-style responses
that could be returned -TD
+ added a few capabilities fixed in recent vte -TD
-------------------------------------------------------------------
Mon Jun 6 13:15:39 UTC 2016 - werner@suse.de
- Add ncurses patch 20160528
+ further workaround for PIE/PIC breakage which causes gpm to not link.
+ fix most cppcheck warnings, mostly style, in ncurses library.
- Add ncurses patch 20160604
+ correct logic for -f option in test/demo_terminfo.c
+ add test/list_keys.c
-------------------------------------------------------------------
Tue May 24 07:41:19 UTC 2016 - werner@suse.de
- Add ncurses patch 20160521
+ improved manual page description of tset/reset versus window-size.
+ fixes to work with a slightly broken compiler configuration which
cannot compile "Hello World!" without adding compiler options
(report by Ola x Nilsson):
+ pass appropriate compiler options to the CF_PROG_CC_C_O macro.
+ when separating compiler and options in CF_CC_ENV_FLAGS, ensure
that all options are split-off into CFLAGS or CPPFLAGS
+ restore some -I options removed in 20140726 because they appeared
to be redundant. In fact, they are needed for a compiler that
cannot combine -c and -o options.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 17 10:33:40 UTC 2016 - werner@suse.de Tue May 17 10:33:40 UTC 2016 - werner@suse.de