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

Accepting request 712785 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/712785
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=157
This commit is contained in:
Dominique Leuenberger 2019-07-13 11:35:21 +00:00 committed by Git OBS Bridge
commit 493b57cee3
3 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncurses-6.1-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:d8c3d5b6ce1dc546e86c9dd8e5fff5352145c360b5c8b718022c70712c99c774 oid sha256:96a532990194d93375c3be783173792f301cc21b675e3980110da4820328005b
size 1482259 size 1533662

62
ncurses-6.1.dif
View File

@ -21,7 +21,7 @@
19 files changed, 248 insertions(+), 80 deletions(-) 19 files changed, 248 insertions(+), 80 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2019-05-20 13:40:39.388245916 +0000 +++ aclocal.m4 2019-06-24 09:21:19.443796673 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -580,7 +580,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)
@@ -4993,12 +4993,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -5197,12 +5197,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
@@ -5008,7 +5011,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5212,7 +5215,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
@@ -5048,7 +5051,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5252,7 +5255,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
@@ -5057,23 +5060,23 @@ case "$MANPAGE_FORMAT" in @@ -5261,23 +5264,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
@@ -5082,7 +5085,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5286,7 +5289,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
@@ -5092,18 +5095,18 @@ CF_EOF @@ -5296,18 +5299,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
@@ -5123,9 +5126,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -5327,9 +5330,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" && (
@@ -5145,6 +5148,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5349,6 +5352,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -150,7 +150,7 @@
esac esac
done done
--- configure --- configure
+++ configure 2019-05-20 13:40:39.388245916 +0000 +++ configure 2019-06-24 09:21:19.447796599 +0000
@@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti @@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti
fi fi
;; ;;
@ -278,7 +278,7 @@
;; ;;
esac esac
done done
@@ -24511,6 +24515,7 @@ if test "$with_termlib" != no ; then @@ -25003,6 +25007,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 2019-05-20 13:40:39.388245916 +0000 +++ include/curses.h.in 2019-06-24 09:21:19.447796599 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -177,6 +177,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 2019-05-20 13:40:39.388245916 +0000 +++ include/termcap.h.in 2019-06-24 09:21:19.447796599 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_OSPEED #undef NCURSES_OSPEED
--- include/tic.h --- include/tic.h
+++ include/tic.h 2019-05-20 13:40:39.388245916 +0000 +++ include/tic.h 2019-06-24 09:21:19.447796599 +0000
@@ -236,12 +236,12 @@ struct user_table_entry @@ -236,12 +236,12 @@ struct user_table_entry
*/ */
@ -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 2019-05-20 13:40:39.388245916 +0000 +++ man/man_db.renames 2019-06-24 09:22:25.130583470 +0000
@@ -163,6 +163,7 @@ term.7 term.7 @@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5 terminfo.5 terminfo.5
@ -336,16 +336,16 @@
tic.1m tic.1 tic.1m tic.1
toe.1m toe.1 toe.1m toe.1
tput.1 tput.1 tput.1 tput.1
@@ -171,6 +172,7 @@ user_caps.5 user_caps.5 @@ -172,6 +173,7 @@ wresize.3x wresize.3ncurses
wresize.3x wresize.3ncurses
# #
# Other: # Other:
tabs.1m tabs.1
+tack.1 tack.1 +tack.1 tack.1
tack.1m tack.1 tack.1m tack.1
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2019-05-20 13:40:39.388245916 +0000 +++ man/ncurses.3x 2019-06-24 09:21:19.447796599 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB @@ -139,6 +139,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
@ -358,7 +358,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 2019-05-20 13:40:39.388245916 +0000 +++ misc/gen-pkgconfig.in 2019-06-24 09:21:19.447796599 +0000
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include" @@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -398,7 +398,7 @@
if test $name = $MAIN_LIBRARY if test $name = $MAIN_LIBRARY
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2019-06-11 08:27:43.912247894 +0000 +++ misc/terminfo.src 2019-06-24 09:21:19.451796524 +0000
@@ -305,7 +305,9 @@ dumb|80-column dumb tty, @@ -305,7 +305,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -783,7 +783,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 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/Makefile.in 2019-06-24 09:21:19.451796524 +0000
@@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) : @@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -794,8 +794,8 @@
./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 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/curses.priv.h 2019-06-24 09:21:19.451796524 +0000
@@ -2242,6 +2242,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2246,6 +2246,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);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -805,7 +805,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 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/run_cmd.sh 2019-06-24 09:21:19.451796524 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -819,7 +819,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/tinfo/MKfallback.sh 2019-06-24 09:21:19.451796524 +0000
@@ -68,6 +68,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -852,7 +852,7 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/tinfo/access.c 2019-06-24 09:21:19.451796524 +0000
@@ -30,6 +30,10 @@ @@ -30,6 +30,10 @@
* Author: Thomas E. Dickey * * Author: Thomas E. Dickey *
****************************************************************************/ ****************************************************************************/
@ -896,7 +896,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 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/tinfo/lib_setup.c 2019-06-24 09:21:19.451796524 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) @@ -599,6 +599,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 */
@ -908,7 +908,7 @@
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 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/tinfo/read_entry.c 2019-06-24 09:21:19.451796524 +0000
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -926,7 +926,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2019-05-20 13:40:39.392245841 +0000 +++ ncurses/tinfo/read_termcap.c 2019-06-24 09:21:19.451796524 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -973,7 +973,7 @@
} }
if (copied != 0) if (copied != 0)
--- progs/Makefile.in --- progs/Makefile.in
+++ progs/Makefile.in 2019-05-20 13:40:39.392245841 +0000 +++ progs/Makefile.in 2019-06-24 09:21:19.451796524 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -993,7 +993,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2019-05-20 13:40:39.392245841 +0000 +++ test/test.priv.h 2019-06-24 09:21:19.451796524 +0000
@@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *, @@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *,
#endif #endif

22
ncurses.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Jun 24 09:20:53 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20190623
+ improve the tabs.1 manual page to distinguish the PWB/Unix and 7th
Edition versions of the tabs utility.
+ add configure check for getenv() to work around implementation shown
in Emscripten #6766, use that to optionally suppress START_TRACE
macro, whose call to getenv() may not work properly (report by Ilya
Ig Petrov).
+ modify initialization functions to avoid relying upon persistent
data for the result from getenv().
+ update config.guess, config.sub
- Adopt patch ncurses-6.1.dif
-------------------------------------------------------------------
Mon Jun 17 10:36:12 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20190615
+ expand the portability section of the man/tabs.1 manual page.
+ regenerate HTML manpages.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 11 08:27:10 UTC 2019 - Dr. Werner Fink <werner@suse.de> Tue Jun 11 08:27:10 UTC 2019 - Dr. Werner Fink <werner@suse.de>