Accepting request 810717 from Base:System

- Add ncurses patch 20200531
  + correct configure version-check/warnng for g++ to allow for 10.x
  + re-enable "bel" in konsole-base (report by Nia Huang)
  + add linux-s entry (patch by Alexandre Montaron).
  + drop long-obsolete convert_configure.pl 
  + add test/test_parm.c, for checking tparm changes.
  + improve parameter-checking for tparm, adding function _nc_tiparm() to
    handle the most-used case, which accepts only numeric parameters
    (report/testcase by "puppet-meteor").
  + use a more conservative estimate of the buffer-size in lib_tparm.c's
    save_text() and save_number(), in case the sprintf() function
    passes-through unexpected characters from a format specifier
    (report/testcase by "puppet-meteor").
  + add a check for end-of-string in cvtchar to handle a malformed
    string in infotocap (report/testcase by "puppet-meteor").

- Add ncurses patch 20200523
  + update version-check for gnat to allow for gnat 10.x to 99.x
  + fix an uninitialized variable in lib_mouse.c changes (cf: 20200502)
  + add a check in EmitRange to guard against repeat_char emitting digits
    which could be interpreted as BSD-style padding when --enable-bsdpad 
    is configured (report/patch by Hiltjo Posthuma).
  + add --disable-pkg-ldflags to suppress EXTRA_LDFLAGS from the
    generated pkg-config and ncurses*-config files, to simplify
    configuring in the case where rpath is used but the packager wants
    to hide the feature (report by Michael Stapelberg).
  > fixes for building with Visual Studio C++ and msys2 (patches by
    "Maarten Anonymous"):
  + modify CF_SHARED_OPTS to generate a script which translates linker
    options into Visual Studio's dialect.

OBS-URL: https://build.opensuse.org/request/show/810717
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=174
This commit is contained in:
Dominique Leuenberger 2020-06-11 12:39:36 +00:00 committed by Git OBS Bridge
commit 38fe1dcc8c
4 changed files with 90 additions and 36 deletions

View File

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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c660d3b61d34eb8fcda0d38dedc663086734a9be253eedc0296812a3d4ff989c
size 372974
oid sha256:84723cb8ec14af58ec203005d9f1d83e58695bdc5b36756aa907cac8953510ca
size 501045

View File

@ -151,7 +151,7 @@
done
--- configure
+++ configure 2020-03-09 09:17:28.749300145 +0000
@@ -5620,7 +5620,7 @@ echo $ECHO_N "checking for an rpath opti
@@ -5621,7 +5621,7 @@ echo $ECHO_N "checking for an rpath opti
fi
;;
(linux*|gnu*|k*bsd*-gnu|freebsd*)
@ -160,7 +160,7 @@
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -14124,12 +14124,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14224,12 +14224,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@ -178,7 +178,7 @@
sed -f $cf_man_alias \\
CF_EOF
@@ -14139,7 +14142,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14239,7 +14242,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -187,7 +187,7 @@
CF_EOF
fi
@@ -14179,7 +14182,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14279,7 +14282,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -196,7 +196,7 @@
CF_EOF
fi
@@ -14188,23 +14191,23 @@ case "$MANPAGE_FORMAT" in
@@ -14288,23 +14291,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories
@ -226,7 +226,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
@@ -14213,7 +14216,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14313,7 +14316,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@ -235,7 +235,7 @@
then
continue
fi
@@ -14223,18 +14226,18 @@ CF_EOF
@@ -14323,18 +14326,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -257,7 +257,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -14254,9 +14257,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14354,9 +14357,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -270,7 +270,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -14276,6 +14279,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14376,6 +14379,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -278,7 +278,7 @@
;;
esac
done
@@ -25860,6 +25864,7 @@ if test "$with_termlib" != no ; then
@@ -25961,6 +25965,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@ -487,7 +487,7 @@
dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG,
il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~,
@@ -4438,6 +4450,7 @@ xterm-mono|monochrome xterm,
@@ -4454,6 +4466,7 @@ xterm-mono|monochrome xterm,
use=xterm-r6,
# This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
# The name has been changed and some aliases have been removed.
@ -495,7 +495,7 @@
xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
OTbs, am, bce, km, mir, msgr, xenl, XT,
cols#80, it#8, lines#24, ncv@,
@@ -4447,7 +4460,7 @@ xterm-xf86-v32|xterm terminal emulator (
@@ -4463,7 +4476,7 @@ xterm-xf86-v32|xterm terminal emulator (
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,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -504,7 +504,7 @@
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,
ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
@@ -5114,8 +5127,26 @@ xterm-noapp|xterm with cursor keys in no
@@ -5130,8 +5143,26 @@ xterm-noapp|xterm with cursor keys in no
xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
lines#24, use=xterm-old,
@ -531,7 +531,7 @@
use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
@@ -5460,7 +5491,7 @@ xterms-sun|small (80x24) xterm with sunF
@@ -5476,7 +5507,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@ -540,7 +540,7 @@
bce,
kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color,
@@ -5711,10 +5742,14 @@ mgt|Multi GNOME Terminal,
@@ -5727,10 +5758,14 @@ mgt|Multi GNOME Terminal,
#### KDE
# This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
# or not is debatable).
@ -556,7 +556,7 @@
# Konsole 1.0.1 (2001/11/25)
# (formerly known as kvt)
#
@@ -5926,14 +5961,14 @@ mlterm3|multi lingual terminal emulator,
@@ -5945,14 +5980,14 @@ mlterm3|multi lingual terminal emulator,
mlterm2|multi lingual terminal emulator,
am, eslok, km, mc5i, mir, msgr, npc, xenl, XT,
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@,
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=^?,
@@ -5990,6 +6025,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
@@ -6009,6 +6044,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
# 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
# "rxvt" or "rxvt-color".
@ -582,7 +582,7 @@
#
# removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD
@@ -6001,13 +6037,14 @@ rxvt-basic|rxvt terminal base (X Window
@@ -6020,13 +6056,14 @@ rxvt-basic|rxvt terminal base (X Window
clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r,
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,
@ -600,7 +600,7 @@
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
rmul=\E[24m,
rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
@@ -6018,7 +6055,7 @@ rxvt-basic|rxvt terminal base (X Window
@@ -6037,7 +6074,7 @@ rxvt-basic|rxvt terminal base (X Window
%p9%t\016%e\017%;,
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,
@ -609,7 +609,7 @@
# Key Codes from rxvt reference:
#
# Note: Shift + F1-F10 generates F11-F20
@@ -6101,8 +6138,8 @@ rxvt-basic|rxvt terminal base (X Window
@@ -6120,8 +6157,8 @@ rxvt-basic|rxvt terminal base (X Window
# Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
rxvt+pcfkeys|fragment for PC-style fkeys,
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~,
kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
@@ -6193,6 +6230,38 @@ rxvt-cygwin-native|rxvt terminal emulato
@@ -6212,6 +6249,38 @@ rxvt-cygwin-native|rxvt terminal emulato
\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin,
@ -659,7 +659,7 @@
# This variant is supposed to work with rxvt 2.7.7 when compiled with
# NO_BRIGHTCOLOR defined. rxvt needs more work...
rxvt-16color|rxvt with 16 colors like aixterm,
@@ -6239,7 +6308,7 @@ mrxvt-256color|multitabbed rxvt with 256
@@ -6258,7 +6327,7 @@ mrxvt-256color|multitabbed rxvt with 256
# Eterm 0.9.3
#
# 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
# but does otherwise follow the rxvt+pcfkeys model -TD
# remove nonworking flash -TD
@@ -6253,12 +6322,12 @@ Eterm|Eterm-color|Eterm with xterm-style
@@ -6272,12 +6341,12 @@ Eterm|Eterm-color|Eterm with xterm-style
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,
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,
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=,
@@ -7211,7 +7280,7 @@ pty|4bsd pseudo teletype,
@@ -7230,7 +7299,7 @@ pty|4bsd pseudo teletype,
# 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
@ -692,7 +692,7 @@
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
@@ -7224,6 +7293,13 @@ eterm|gnu emacs term.el terminal emulati
@@ -7243,6 +7312,13 @@ eterm|gnu emacs term.el terminal emulati
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,
smul=\E[4m,
@ -706,7 +706,7 @@
# 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,
@@ -7352,7 +7428,7 @@ screen|VT 100/ANSI X3.64 virtual termina
@@ -7371,7 +7447,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,
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,
@ -715,7 +715,7 @@
kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 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,
@@ -7473,6 +7549,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
@@ -7492,6 +7568,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
use=xterm+x11mouse, use=xterm-new,
#:screen.xterm|screen for modern xterm,
#: use=screen.xterm-new,
@ -729,7 +729,7 @@
# xterm-r6 does not really support khome/kend unless it is propped up by
# the translations resource.
screen.xterm-r6|screen customized for X11R6 xterm,
@@ -7560,7 +7643,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
@@ -7579,7 +7662,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
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,
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,
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,
@@ -9463,7 +9546,7 @@ hp700-wy|HP700/41 emulating wyse30,
@@ -9482,7 +9565,7 @@ hp700-wy|HP700/41 emulating wyse30,
ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@ -747,7 +747,7 @@
am, da, db, xhp,
cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA,
@@ -12693,6 +12776,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
@@ -12713,6 +12796,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
# at support for the VT320 itself.
# 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)
@ -755,7 +755,7 @@
vt320-k3|MS-Kermit 3.00's vt320 emulation,
am, eslok, hs, km, mir, msgr, xenl,
cols#80, it#8, lines#49, pb#9600, vt#3,
@@ -12702,7 +12786,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
@@ -12722,7 +12806,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
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,
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,
flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
?5l,
@@ -17114,7 +17198,7 @@ ibm3101|i3101|IBM 3101-10,
@@ -17134,7 +17218,7 @@ ibm3101|i3101|IBM 3101-10,
cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
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,
sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t
@@ -17372,7 +17456,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
@@ -17392,7 +17476,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
tbc=\E[3g, use=ecma+index,
# "Megapel" refers to the display adapter, which was used with the IBM RT
# aka IBM 6150.

View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Tue Jun 2 06:24:20 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200531
+ correct configure version-check/warnng for g++ to allow for 10.x
+ re-enable "bel" in konsole-base (report by Nia Huang)
+ add linux-s entry (patch by Alexandre Montaron).
+ drop long-obsolete convert_configure.pl
+ add test/test_parm.c, for checking tparm changes.
+ improve parameter-checking for tparm, adding function _nc_tiparm() to
handle the most-used case, which accepts only numeric parameters
(report/testcase by "puppet-meteor").
+ use a more conservative estimate of the buffer-size in lib_tparm.c's
save_text() and save_number(), in case the sprintf() function
passes-through unexpected characters from a format specifier
(report/testcase by "puppet-meteor").
+ add a check for end-of-string in cvtchar to handle a malformed
string in infotocap (report/testcase by "puppet-meteor").
-------------------------------------------------------------------
Mon May 25 07:11:21 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200523
+ update version-check for gnat to allow for gnat 10.x to 99.x
+ fix an uninitialized variable in lib_mouse.c changes (cf: 20200502)
+ add a check in EmitRange to guard against repeat_char emitting digits
which could be interpreted as BSD-style padding when --enable-bsdpad
is configured (report/patch by Hiltjo Posthuma).
+ add --disable-pkg-ldflags to suppress EXTRA_LDFLAGS from the
generated pkg-config and ncurses*-config files, to simplify
configuring in the case where rpath is used but the packager wants
to hide the feature (report by Michael Stapelberg).
> fixes for building with Visual Studio C++ and msys2 (patches by
"Maarten Anonymous"):
+ modify CF_SHARED_OPTS to generate a script which translates linker
options into Visual Studio's dialect.
+ omit parentheses around function-names in generated lib_gen.c to
-------------------------------------------------------------------
Mon May 18 15:01:22 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200516
+ add notes on termcap.h header in curs_termcap.3x
+ update notes on vscode / xterm.js -TD
-------------------------------------------------------------------
Mon May 11 07:56:31 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200509
+ add "-r" option to the dots test-programs, to help with scripting
a performance comparison.
+ build-fix test/move_field.c for NetBSD curses, whose form headers
use different names than SVr4 or ncurses.
-------------------------------------------------------------------
Mon May 4 06:35:31 UTC 2020 - Dr. Werner Fink <werner@suse.de>