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

Accepting request 782927 from Base:System

Browse Source 
- Add ncurses patch 20200308
  + update copyright notices in test-packages.
  + modify tracemunch to guard against errors in its known_p1 table.
  + add several --with-xxx-libname options, to help with pkgsrc (prompted
    by discussion with Thomas Klausner).

- Add ncurses patch 20200301
  + modify wbkgd() and wbkgrnd() to avoid storing a null in the
    background character, because it may be used in cases where the
    corresponding 0x80 is not treated as a null (report by Marc Rechte,
    cf: 20181208).

- Add ncurses patch 20200229
  + modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
    which conflicts with conventional use for passing linker options.
  > fixes for building with Visual Studio C++ and msys2 (patches by
    "Maarten Anonymous"):
  + check for pcre2posix.h instead of pcre2-posix.h
  + add case in CF_SHARED_OPTS for msys2 + msvc
  + add fallback definition for STDIN_FILENO in progs.priv.h
  + modify win_driver.c to use _alloca() rather than gcc's variable
    length array feature.
  + add NCURSES_IMPEXP to ncurses wrapped-variable declarations
  + remove NCURSES_IMPEXP from class variables in c++/cursslk.h
  + remove fallback prototype for exit() from c++/etip.h.in
  + use configured check for <sys/time.h> in a couple of places
  + conditionally include winsock.h in ncurses/win32con/gettimeofday.c,
    because Visual Studio needs this for the timestruct declaration.
  + adjust syntax in a couple of files using the NCURSES_API symbol.

OBS-URL: https://build.opensuse.org/request/show/782927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=168
This commit is contained in:
Dominique Leuenberger 2020-03-14 08:53:42 +00:00 committed by Git OBS Bridge
commit 25cd3aebfc
3 changed files with 82 additions and 43 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:77f738a9e6b40c6673bedbf09205ec330de18596e787f9826c9e4a908700566b
size 18766
oid sha256:afa41abdf496b435f01707403d7aa1f1c066dfd6b69d8a6ff8a21105e4d88c60
size 202757

82
ncurses-6.2.dif
View File

@ -21,7 +21,7 @@
19 files changed, 248 insertions(+), 77 deletions(-)
--- aclocal.m4
+++ aclocal.m4 2020-02-12 11:05:15.034837378 +0000
+++ aclocal.m4 2020-03-09 09:17:28.745300221 +0000
@@ -583,7 +583,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
@ -31,7 +31,7 @@
#include <stdio.h>
#if defined(__cplusplus)
@@ -5313,12 +5313,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5320,12 +5320,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@ -49,7 +49,7 @@
sed -f $cf_man_alias \\
CF_EOF
@@ -5328,7 +5331,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5335,7 +5338,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -58,7 +58,7 @@
CF_EOF
fi
@@ -5368,7 +5371,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5375,7 +5378,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -67,7 +67,7 @@
CF_EOF
fi
@@ -5377,23 +5380,23 @@ case "$MANPAGE_FORMAT" in
@@ -5384,23 +5387,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
@ -97,7 +97,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
@@ -5402,7 +5405,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5409,7 +5412,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@ -106,7 +106,7 @@
then
continue
fi
@@ -5412,18 +5415,18 @@ CF_EOF
@@ -5419,18 +5422,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -128,7 +128,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -5443,9 +5446,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5450,9 +5453,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -141,7 +141,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -5465,6 +5468,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5472,6 +5475,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -150,8 +150,8 @@
esac
done
--- configure
+++ configure 2020-02-12 11:05:15.034837378 +0000
@@ -5596,7 +5596,7 @@ echo $ECHO_N "checking for an rpath opti
+++ configure 2020-03-09 09:17:28.749300145 +0000
@@ -5600,7 +5600,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,"
@@ -14068,12 +14068,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14103,12 +14103,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
@@ -14083,7 +14086,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14118,7 +14121,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -187,7 +187,7 @@
CF_EOF
fi
@@ -14123,7 +14126,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14158,7 +14161,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -196,7 +196,7 @@
CF_EOF
fi
@@ -14132,23 +14135,23 @@ case "$MANPAGE_FORMAT" in
@@ -14167,23 +14170,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
@@ -14157,7 +14160,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14192,7 +14195,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
@@ -14167,18 +14170,18 @@ CF_EOF
@@ -14202,18 +14205,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
@@ -14198,9 +14201,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14233,9 +14236,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -270,7 +270,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -14220,6 +14223,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14255,6 +14258,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -278,7 +278,7 @@
;;
esac
done
@@ -25398,6 +25402,7 @@ if test "$with_termlib" != no ; then
@@ -25433,6 +25437,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@ -287,7 +287,7 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- include/curses.h.in
+++ include/curses.h.in 2020-02-12 11:05:15.034837378 +0000
+++ include/curses.h.in 2020-03-09 09:17:28.749300145 +0000
@@ -186,6 +186,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@ -299,7 +299,7 @@
* We need FILE, etc. Include this before checking any feature symbols.
*/
--- include/termcap.h.in
+++ include/termcap.h.in 2020-02-12 11:05:15.034837378 +0000
+++ include/termcap.h.in 2020-03-09 09:17:28.749300145 +0000
@@ -47,6 +47,8 @@ extern "C"
{
#endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_OSPEED
--- include/tic.h
+++ include/tic.h 2020-02-12 11:05:15.038837303 +0000
+++ include/tic.h 2020-03-09 09:17:28.749300145 +0000
@@ -237,12 +237,12 @@ struct user_table_entry
*/
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
+++ man/man_db.renames 2020-02-12 11:05:15.038837303 +0000
+++ man/man_db.renames 2020-03-09 09:17:28.749300145 +0000
@@ -164,6 +164,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5
@ -345,7 +345,7 @@
#
getty.1 getty.8
--- man/ncurses.3x
+++ man/ncurses.3x 2020-02-12 11:05:15.038837303 +0000
+++ man/ncurses.3x 2020-03-09 09:17:28.749300145 +0000
@@ -140,6 +140,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes
@ -358,8 +358,8 @@
called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2020-02-12 11:05:15.038837303 +0000
@@ -89,6 +89,9 @@ do
+++ misc/gen-pkgconfig.in 2020-03-09 09:17:28.749300145 +0000
@@ -92,6 +92,9 @@ do
-specs*) # ignore linker specs-files which were used to build library
continue
;;
@ -369,7 +369,7 @@
-Wl,-z,*) # ignore flags used to manipulate shared image
continue
;;
@@ -141,6 +144,7 @@ do
@@ -150,6 +153,7 @@ do
LIBS="-l$name"
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
@ -377,7 +377,7 @@
reqs=
if [ $name = $MAIN_LIBRARY ]; then
@@ -151,9 +155,11 @@ do
@@ -160,9 +164,11 @@ do
desc="$desc terminal interface library"
elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@ -389,7 +389,7 @@
desc="$desc add-on library"
fi
@@ -163,6 +169,8 @@ do
@@ -172,6 +178,8 @@ do
[ $NEED_TINFO != yes ] ; then
[ -n "$reqs" ] && reqs="$reqs, "
reqs="${reqs}${SUB_LIBRARY}${suffix}"
@ -399,7 +399,7 @@
if [ $name = $MAIN_LIBRARY ]
--- misc/terminfo.src
+++ misc/terminfo.src 2020-02-12 11:05:15.042837228 +0000
+++ misc/terminfo.src 2020-03-09 09:17:28.753300070 +0000
@@ -305,7 +305,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@ -783,7 +783,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in
+++ ncurses/Makefile.in 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/Makefile.in 2020-03-09 09:17:28.753300070 +0000
@@ -229,7 +229,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@ -794,7 +794,7 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/curses.priv.h 2020-03-09 09:17:28.753300070 +0000
@@ -2245,6 +2245,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@ -805,7 +805,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/run_cmd.sh 2020-03-09 09:17:28.753300070 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@ -819,7 +819,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/tinfo/MKfallback.sh 2020-03-09 09:17:28.753300070 +0000
@@ -72,6 +72,12 @@ else
tmp_info=
fi
@ -834,7 +834,7 @@
/* This file was generated by $0 */
--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/tinfo/access.c 2020-03-09 09:17:28.753300070 +0000
@@ -31,6 +31,10 @@
* Author: Thomas E. Dickey *
****************************************************************************/
@ -878,7 +878,7 @@
_nc_access(const char *path, int mode)
{
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/tinfo/lib_setup.c 2020-03-09 09:17:28.753300070 +0000
@@ -605,6 +605,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
@ -890,7 +890,7 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/tinfo/read_entry.c 2020-03-09 09:17:28.753300070 +0000
@@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0;
int code;
@ -908,7 +908,7 @@
return (code);
}
--- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2020-02-12 11:05:15.042837228 +0000
+++ ncurses/tinfo/read_termcap.c 2020-03-09 09:17:28.753300070 +0000
@@ -323,14 +323,18 @@ _nc_getent(
*/
if (fd >= 0) {
@ -955,7 +955,7 @@
}
if (copied != 0)
--- progs/Makefile.in
+++ progs/Makefile.in 2020-02-12 11:05:15.042837228 +0000
+++ progs/Makefile.in 2020-03-09 09:17:28.753300070 +0000
@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -975,7 +975,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h
+++ test/test.priv.h 2020-02-12 11:05:15.042837228 +0000
+++ test/test.priv.h 2020-03-09 09:17:28.753300070 +0000
@@ -994,12 +994,12 @@ extern char *_nc_strstr(const char *, co
#endif

39
ncurses.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Mon Mar 9 09:16:31 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200308
+ update copyright notices in test-packages.
+ modify tracemunch to guard against errors in its known_p1 table.
+ add several --with-xxx-libname options, to help with pkgsrc (prompted
by discussion with Thomas Klausner).
-------------------------------------------------------------------
Tue Mar 3 08:15:34 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200301
+ modify wbkgd() and wbkgrnd() to avoid storing a null in the
background character, because it may be used in cases where the
corresponding 0x80 is not treated as a null (report by Marc Rechte,
cf: 20181208).
-------------------------------------------------------------------
Sun Mar 1 08:26:26 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20200229
+ modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
which conflicts with conventional use for passing linker options.
> fixes for building with Visual Studio C++ and msys2 (patches by
"Maarten Anonymous"):
+ check for pcre2posix.h instead of pcre2-posix.h
+ add case in CF_SHARED_OPTS for msys2 + msvc
+ add fallback definition for STDIN_FILENO in progs.priv.h
+ modify win_driver.c to use _alloca() rather than gcc's variable
length array feature.
+ add NCURSES_IMPEXP to ncurses wrapped-variable declarations
+ remove NCURSES_IMPEXP from class variables in c++/cursslk.h
+ remove fallback prototype for exit() from c++/etip.h.in
+ use configured check for <sys/time.h> in a couple of places
+ conditionally include winsock.h in ncurses/win32con/gettimeofday.c,
because Visual Studio needs this for the timestruct declaration.
+ adjust syntax in a couple of files using the NCURSES_API symbol.
-------------------------------------------------------------------
Mon Feb 24 08:56:07 UTC 2020 - Dr. Werner Fink <werner@suse.de>