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

Update to ncurses-6.2 patch 20210424

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=545
This commit is contained in:
Dr. Werner Fink 2021-04-26 08:05:52 +00:00 committed by Git OBS Bridge
parent 8c0b2fda2d
commit c82c0ab749
4 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30e46685f886efb5de5e64941dee381fcc9d4de50c81ef2e2aba7885a7362497
size 2183755
oid sha256:08d9cc452df795d4f87bd57bcb53fedbae97ef0b3cb89278e4069fba6e6cafef
size 2280232

36
ncurses-6.2.dif
View File

@ -32,7 +32,7 @@
#include <stdio.h>
#if defined(__cplusplus)
@@ -5625,12 +5625,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5637,12 +5637,15 @@ cat >>$cf_edit_man <<CF_EOF
echo "? missing rename for \$cf_source"
cf_target="\$cf_source"
fi
@ -50,7 +50,7 @@
sed -f "$cf_man_alias" \\
CF_EOF
@@ -5640,7 +5643,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5652,7 +5655,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -59,7 +59,7 @@
CF_EOF
fi
@@ -5680,7 +5683,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5692,7 +5695,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -68,7 +68,7 @@
CF_EOF
fi
@@ -5689,23 +5692,23 @@ case "$MANPAGE_FORMAT" in
@@ -5701,23 +5704,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
@ -98,7 +98,7 @@
for cf_alias in \$aliases
do
if test "\$section" = 1 ; then
@@ -5714,7 +5717,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5726,7 +5729,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f "\$cf_alias\${suffix}" ; then
@ -107,7 +107,7 @@
then
continue
fi
@@ -5724,18 +5727,18 @@ CF_EOF
@@ -5736,18 +5739,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -129,7 +129,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -5755,9 +5758,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5767,9 +5770,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test "\$verb" = removing ; then
@ -142,7 +142,7 @@
)
test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && (
@@ -5777,6 +5780,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5789,6 +5792,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -170,7 +170,7 @@
do
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
@@ -14473,12 +14473,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14481,12 +14481,15 @@ cat >>$cf_edit_man <<CF_EOF
echo "? missing rename for \$cf_source"
cf_target="\$cf_source"
fi
@ -188,7 +188,7 @@
sed -f "$cf_man_alias" \\
CF_EOF
@@ -14488,7 +14491,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14496,7 +14499,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -197,7 +197,7 @@
CF_EOF
fi
@@ -14528,7 +14531,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14536,7 +14539,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -206,7 +206,7 @@
CF_EOF
fi
@@ -14537,23 +14540,23 @@ case "$MANPAGE_FORMAT" in
@@ -14545,23 +14548,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
@ -236,7 +236,7 @@
for cf_alias in \$aliases
do
if test "\$section" = 1 ; then
@@ -14562,7 +14565,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14570,7 +14573,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f "\$cf_alias\${suffix}" ; then
@ -245,7 +245,7 @@
then
continue
fi
@@ -14572,18 +14575,18 @@ CF_EOF
@@ -14580,18 +14583,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -267,7 +267,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -14603,9 +14606,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14611,9 +14614,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test "\$verb" = removing ; then
@ -280,7 +280,7 @@
)
test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && (
@@ -14625,6 +14628,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14633,6 +14636,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -829,7 +829,7 @@
myfd = TRUE;
}
lineno = 0;
@@ -1123,8 +1127,10 @@ _nc_read_termcap_entry(const char *const
@@ -1125,8 +1129,10 @@ _nc_read_termcap_entry(const char *const
for (i = 0; i < filecount; i++) {
TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i]));
@ -840,7 +840,7 @@
_nc_set_source(termpaths[i]);
/*
@@ -1136,6 +1142,7 @@ _nc_read_termcap_entry(const char *const
@@ -1138,6 +1144,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp);
}

43
ncurses.changes
View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Mon Apr 26 07:02:43 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20210424
+ avoid using broken system macros for snprintf which interfere with
_nc_SLIMIT's conditionally adding a parameter when the string-hacks
configure option is enabled.
+ add a "all::" rule before the new "check" rule in test/Makefile.in
- Add ncurses patch 20210418
+ improve CF_LINK_FUNCS by ensuring that the source-file is closed
before linking to the target.
+ add "check" rules for headers in c++, progs and test-directories.
+ build-fix for termsort module when configured with termcap (reports
by Rajeev V Pillai, Rudi Heitbaum).
- Add ncurses patch 20210417
+ extend --disable-pkg-ldflags option to also control whether $LDFLAGS
from the build is provided in -config and .pc files (Debian #986764).
+ fix some cppcheck warnings, mostly style, in ncurses and c++
libraries and progs directory.
+ fix off-by-one limit for tput's processing command-line arguments
(patch by Hadrien Lacour).
- Do not strip examples
- Install available manual pages of examples as well
-------------------------------------------------------------------
Tue Apr 6 06:52:18 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20210403
+ fix some cppcheck warnings, mostly style, in ncurses library and
progs directory.
+ improve description of BSD-style padding in curs_termcap.3x
+ improved CF_C11_NORETURN macro, from byacc changes.
+ fix "--enable-leak" in CF_DISABLE_LEAKS to allow turning
leak-checking off later in a set of options.
+ relax modification-time comparison in CF_LINK_FUNCS to allow it to
accept link() function with NFS filesystems which change the mtime
on the link target, e.g., several BSD systems.
+ call delay_output_sp to handle BSD-style padding when tputs_sp is
called, whether directly or internally, to ensure that the SCREEN
pointer is passed correctly (reports by Henric Jungheim, Juraj
Lutter).
- Correct offsets of patch ncurses-6.2.dif
-------------------------------------------------------------------
Mon Mar 29 07:37:33 UTC 2021 - Dr. Werner Fink <werner@suse.de>

11
ncurses.spec
View File

@ -443,8 +443,10 @@ mv tack-* tack
exec /usr/bin/gzip -9 ${1+"$@"}
EOF
chmod 0755 gzip/gzip
INSTALL_PROGRAM='${INSTALL}'
INSTALL_OPT_S=""
PATH=$PWD/gzip:$PATH
export CC CFLAGS CXX CXXFLAGS CPPFLAGS TERM LDFLAGS
export CC CFLAGS CXX CXXFLAGS CPPFLAGS TERM LDFLAGS INSTALL_PROGRAM INSTALL_OPT_S
#
# Detect 64bit architecures and be sure that we use an
# unsigned long for chtype to be backward compatible with
@ -689,9 +691,10 @@ mv tack-* tack
make install DESTDIR=${PWD} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
%else
make %{?_smp_mflags} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make install DESTDIR=${PWD} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make install DESTDIR=${PWD} INSTALL_PROG=install TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
%endif
mv usr usr.back
cp Makefile Makefile.back
make distclean
popd
%endif
@ -1136,6 +1139,8 @@ includedir5=%{_incdir}/ncurses5' "$pc"
#
pushd test
mv usr.back usr
mkdir -p ./%{_mandir}/man6
cp -p $(find -name '*.6') .%{_mandir}/man6/
(cd usr/; tar -cpSf - .) | tar -xpsSf - -C %{buildroot}%{_prefix}
install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses/
popd
@ -1233,7 +1238,7 @@ popd
%{_libexecdir}/ncurses/*
%dir %{_datadir}/ncurses/
%{_datadir}/ncurses/*
#%doc %{_mandir}/man6/*%{ext_man}
%doc %{_mandir}/man6/*%{ext_man}
%files -n libncurses5
%defattr(-,root,root)