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

Accepting request 931670 from Base:System

Browse Source 
- Add ncurses patch 20211115 (boo##1192668)
  + fix memory-leak in delwin for pads (report by Werner Fink, OpenSUSE
    #1192668, cf:  20211106),

- Add ncurses patch 20211113
  + minor clarification to clear.1 (Debian #999437).
  + add xterm+sl-alt, use that in foot+base (report by Jonas Grosse
    Sundrup) -TD
  + improve search-path check for pkg-config, for Debian testing which
    installs pkg-config with architecture-prefixes.
- Correct offsets of patch ncurses-6.3.dif

- Add ncurses patch 20211106
  + improve check in misc/Makefile.in for empty $PKG_CONFIG_LIBDIR
  + modify wnoutrefresh to call pnoutrefresh if its parameter is a pad,
    rather than treating it as an error, and modify new_panel to permit
    its window-parameter to be a pad (report by Giorgos Xou).
  + fix a memory-leak in del_curterm (prompted by discussion with Bram
    Moolenaar, cf: 20210821).

- Add ncurses patch 20211030
  + simplify some references to WINDOWS._flags using macros.
  + add a "check" rule in Ada95 makefile, to help with test-packages.
  + build-fix for cross-compiling to MingW, conditionally add -lssp
- Correct offsets of patch ncurses-6.3.dif

- Add ncurses patch 20211026
  + corrected regex needed for older pkg-config used in Solaris 10.
  + amend configure option's auto-search to account for systems where
    none of the directories known to pkg-config exist, adapted from

OBS-URL: https://build.opensuse.org/request/show/931670
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=200
This commit is contained in:
Dominique Leuenberger
2021-11-20 21:47:44 +00:00
committed by Git OBS Bridge
parent b37ba5e403 d1ba7496f3
commit 0626bc144d
5 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ncurses-5.9-ibm327x.dif
View File

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

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

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a072f8968be854f67d580752e70d66d2478424c6fd8a4d8d4bffd3a837ae7b4d
size 230
oid sha256:596ade31373b0bee427ab9050529c813dae7d9d01f2861ec853522fa583a8a5c
size 179208

70
ncurses-6.2.dif → ncurses-6.3.dif
View File

@@ -28,7 +28,7 @@
#include <stdio.h>
#if defined(__cplusplus)
@@ -5803,12 +5803,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5834,12 +5834,15 @@ cat >>$cf_edit_man <<CF_EOF
echo "? missing rename for \$cf_source"
cf_target="\$cf_source"
fi
@@ -46,7 +46,7 @@
sed -f "$cf_man_alias" \\
CF_EOF
@@ -5818,7 +5821,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5849,7 +5852,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@@ -55,7 +55,7 @@
CF_EOF
fi
@@ -5858,7 +5861,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5889,7 +5892,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@@ -64,7 +64,7 @@
CF_EOF
fi
@@ -5867,23 +5870,23 @@ case "$MANPAGE_FORMAT" in
@@ -5898,23 +5901,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
@@ -94,7 +94,7 @@
for cf_alias in \$aliases
do
if test "\$section" = 1 ; then
@@ -5892,7 +5895,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5923,7 +5926,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f "\$cf_alias\${suffix}" ; then
@@ -103,7 +103,7 @@
then
continue
fi
@@ -5902,18 +5905,18 @@ CF_EOF
@@ -5933,18 +5936,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@@ -125,7 +125,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -5933,9 +5936,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5964,9 +5967,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test "\$verb" = removing ; then
@@ -138,7 +138,7 @@
)
test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && (
@@ -5955,6 +5958,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5986,6 +5989,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@@ -148,7 +148,7 @@
done
--- configure
+++ configure 2021-06-07 07:18:38.420598827 +0000
@@ -5941,7 +5941,7 @@ echo $ECHO_N "checking for an rpath opti
@@ -5939,7 +5939,7 @@ echo $ECHO_N "checking for an rpath opti
fi
;;
(linux*|gnu*|k*bsd*-gnu|freebsd*)
@@ -157,7 +157,7 @@
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -7554,7 +7554,7 @@ echo "${ECHO_T}$with_pcre2" >&6
@@ -7552,7 +7552,7 @@ echo "${ECHO_T}$with_pcre2" >&6
if test "x$with_pcre2" != xno ; then
cf_with_pcre2_ok=no
@@ -166,7 +166,7 @@
do
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
@@ -14834,12 +14834,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14832,12 +14832,15 @@ cat >>$cf_edit_man <<CF_EOF
echo "? missing rename for \$cf_source"
cf_target="\$cf_source"
fi
@@ -184,7 +184,7 @@
sed -f "$cf_man_alias" \\
CF_EOF
@@ -14849,7 +14852,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14847,7 +14850,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@@ -193,7 +193,7 @@
CF_EOF
fi
@@ -14889,7 +14892,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14887,7 +14890,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@@ -202,7 +202,7 @@
CF_EOF
fi
@@ -14898,23 +14901,23 @@ case "$MANPAGE_FORMAT" in
@@ -14896,23 +14899,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
@@ -232,7 +232,7 @@
for cf_alias in \$aliases
do
if test "\$section" = 1 ; then
@@ -14923,7 +14926,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14921,7 +14924,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f "\$cf_alias\${suffix}" ; then
@@ -241,7 +241,7 @@
then
continue
fi
@@ -14933,18 +14936,18 @@ CF_EOF
@@ -14931,18 +14934,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@@ -263,7 +263,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -14964,9 +14967,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14962,9 +14965,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test "\$verb" = removing ; then
@@ -276,7 +276,7 @@
)
test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && (
@@ -14986,6 +14989,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14984,6 +14987,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@@ -418,7 +418,7 @@
gn, use=dumb,
lpr|printer|line printer,
OTbs, hc, os,
@@ -1018,9 +1020,15 @@ linux-c|linux console 1.3.6+ for older n
@@ -1018,9 +1020,15 @@ linux-c|Linux console 1.3.6+ for older n
# The 2.2.x kernels add a private mode that sets the cursor type; use that to
# get a block cursor for cvvis.
# reported by Frank Heckenbach <frank@g-n-u.de>.
@@ -435,7 +435,7 @@
# Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here:
# http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html
@@ -1053,6 +1061,7 @@ linux2.6|linux 2.6.x console,
@@ -1053,6 +1061,7 @@ linux2.6|Linux 2.6.x console,
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy
yzz{{||}}~~,
enacs=\E)0, rmacs=^O,
@@ -470,7 +470,7 @@
use=xterm-new,
# This entry assumes that xterm's handling of VT100 SI/SO is disabled by
@@ -5821,7 +5848,7 @@ xterms-sun|small (80x24) xterm with sunF
@@ -5842,7 +5869,7 @@ xterms-sun|small (80x24) xterm with sunF
#### GNOME (VTE)
# this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
@@ -479,7 +479,7 @@
bce,
kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
use=xterm-color,
@@ -6093,10 +6120,14 @@ mgt|Multi GNOME Terminal,
@@ -6114,10 +6141,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).
@@ -495,7 +495,7 @@
# Konsole 1.0.1 (2001/11/25)
# (formerly known as kvt)
#
@@ -6348,7 +6379,7 @@ mlterm3|multi lingual terminal emulator,
@@ -6369,7 +6400,7 @@ 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,
@@ -504,7 +504,7 @@
bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, 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,
@@ -6425,7 +6456,7 @@ rxvt-basic|rxvt terminal base (X Window
@@ -6446,7 +6477,7 @@ rxvt-basic|rxvt terminal base (X Window
enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
ind=\n, is1=\E[?47l\E=\E[?1l,
@@ -513,7 +513,7 @@
kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
rmul=\E[24m,
@@ -6520,8 +6551,8 @@ rxvt-basic|rxvt terminal base (X Window
@@ -6541,8 +6572,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,
@@ -524,7 +524,7 @@
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~, kf2=\E[12~, kf20=\E[34~,
@@ -6611,6 +6642,38 @@ rxvt-cygwin-native|rxvt terminal emulato
@@ -6632,6 +6663,38 @@ rxvt-cygwin-native|rxvt terminal emulato
\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin,
@@ -563,7 +563,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,
@@ -6675,7 +6738,7 @@ Eterm|Eterm-color|Eterm with xterm-style
@@ -6696,7 +6759,7 @@ Eterm|Eterm-color|Eterm with xterm-style
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, is1=\E[?47l\E>\E[?1l,
is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
@@ -572,7 +572,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=,
@@ -7765,7 +7828,7 @@ pty|4bsd pseudo teletype,
@@ -7787,7 +7850,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
@@ -581,7 +581,7 @@
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r,
@@ -7778,6 +7841,13 @@ eterm|gnu emacs term.el terminal emulati
@@ -7800,6 +7863,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,
@@ -595,7 +595,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,
@@ -7905,7 +7975,7 @@ screen|VT 100/ANSI X3.64 virtual termina
@@ -7927,7 +7997,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,
@@ -604,7 +604,7 @@
kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
@@ -8025,6 +8095,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
@@ -8047,6 +8117,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
use=xterm+x11mouse, use=xterm-new,
#:screen.xterm|screen for modern xterm,
#: use=screen.xterm-new,
@@ -618,7 +618,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,
@@ -8112,7 +8189,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
@@ -8134,7 +8211,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,
@@ -627,7 +627,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,
@@ -10042,7 +10119,7 @@ hp700-wy|HP700/41 emulating wyse30,
@@ -10062,7 +10139,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,
@@ -636,7 +636,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,
@@ -17684,7 +17761,7 @@ ibm3101|i3101|IBM 3101-10,
@@ -17704,7 +17781,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,
@@ -645,7 +645,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
@@ -17942,7 +18019,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
@@ -17962,7 +18039,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.

48
ncurses.changes
View File

@@ -1,3 +1,51 @@
-------------------------------------------------------------------
Tue Nov 16 08:48:25 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20211115
+ fix memory-leak in delwin for pads (report by Werner Fink, OpenSUSE
#1192668, cf: 20211106),
-------------------------------------------------------------------
Mon Nov 15 07:14:58 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20211113
+ minor clarification to clear.1 (Debian #999437).
+ add xterm+sl-alt, use that in foot+base (report by Jonas Grosse
Sundrup) -TD
+ improve search-path check for pkg-config, for Debian testing which
installs pkg-config with architecture-prefixes.
- Correct offsets of patch ncurses-6.3.dif
-------------------------------------------------------------------
Mon Nov 8 07:17:32 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20211106
+ improve check in misc/Makefile.in for empty $PKG_CONFIG_LIBDIR
+ modify wnoutrefresh to call pnoutrefresh if its parameter is a pad,
rather than treating it as an error, and modify new_panel to permit
its window-parameter to be a pad (report by Giorgos Xou).
+ fix a memory-leak in del_curterm (prompted by discussion with Bram
Moolenaar, cf: 20210821).
-------------------------------------------------------------------
Tue Nov 2 08:34:24 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20211030
+ simplify some references to WINDOWS._flags using macros.
+ add a "check" rule in Ada95 makefile, to help with test-packages.
+ build-fix for cross-compiling to MingW, conditionally add -lssp
- Correct offsets of patch ncurses-6.3.dif
-------------------------------------------------------------------
Wed Oct 27 06:30:02 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20211026
+ corrected regex needed for older pkg-config used in Solaris 10.
+ amend configure option's auto-search to account for systems where
none of the directories known to pkg-config exist, adapted from
mailing-list comment (report by Milan P. Stanic).
- Port patch ncurses-6.2.dif which is now named ncurses-6.3.dif
-------------------------------------------------------------------
Fri Oct 22 10:08:10 UTC 2021 - Dr. Werner Fink <werner@suse.de>

2
ncurses.spec
View File

@@ -88,7 +88,7 @@ Source8: cursescheck
Source9: ftp://ftp.invisible-island.net/ncurses/ncurses-%{basevers}.tar.gz.asc
Source10: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.09-20210619.tgz.asc
Source11: ncurses.keyring
Patch0: ncurses-6.2.dif
Patch0: ncurses-6.3.dif
Patch1: ncurses-5.9-ibm327x.dif
Patch2: ncurses-5.7-tack.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build