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

Accepting request 420449 from Base:System

Browse Source 
- Add ncurses patch 20160813
  + add a dependency upon generated-sources in Ada95/src/Makefile.in to
    handle a case of "configure && make install".
  + trim trailing blanks from include/Caps*, to work around a problem
    in sed (Debian #818067).

- Add ncurses patch 20160806
  + improve CF_GNU_SOURCE configure macro to optionally define
    _DEFAULT_SOURCE work around a nuisance in recent glibc releases.
  + move the terminfo-specific parts of tput's "reset" function into
    the shared reset_cmd.c, making the two forms of reset use the same
    strings.
  + split-out the terminal initialization functions from tset as
    progs/reset_cmd.c, as part of changes to merge the reset-feature
    with tput.

- Add ncurses patch 20160730
  + change tset's initialization to allow it to get settings from the
    standard input as well as /dev/tty, to be more effective when
    output or error are redirected.
  + improve discussion of history and portability for tset/reset/tput
    manual pages.
- Add ncurses patch 20160723
  + improve error message from tset/reset when both stderr/stdout are
    redirected to a file or pipe.
  + improve organization of curs_attr.3x, curs_color.3x
- Add ncurses patch 20160709
  + work around Debian's antique/unmaintained version of mawk when
    building link_test.
  + improve test/list_keys.c, showing ncurses's convention of modifiers

OBS-URL: https://build.opensuse.org/request/show/420449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=119
This commit is contained in:
Dominique Leuenberger 2016-08-25 07:49:27 +00:00 committed by Git OBS Bridge
commit 990d9958ff
3 changed files with 79 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncurses-6.0-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:478a080b25d5c9fd9761491c50fcf8d08807d23561a177591051a6a3c6167d28 oid sha256:398346657cc4269adaceaedf258871096f914265c7f3c9b4ce2e7a3e8c259a56
size 768432 size 874293

72
ncurses-6.0.dif
View File

@ -21,7 +21,7 @@
19 files changed, 239 insertions(+), 80 deletions(-) 19 files changed, 239 insertions(+), 80 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2016-07-07 09:02:12.558645150 +0000 +++ aclocal.m4 2016-08-08 12:33:42.740866267 +0000
@@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -564,7 +564,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)
@@ -4687,12 +4687,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -4700,12 +4700,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
@@ -4702,7 +4705,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4715,7 +4718,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
@@ -4742,7 +4745,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4755,7 +4758,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
@@ -4751,23 +4754,23 @@ case "$MANPAGE_FORMAT" in @@ -4764,23 +4767,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
@@ -4776,7 +4779,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4789,7 +4792,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
@@ -4786,18 +4789,18 @@ CF_EOF @@ -4799,18 +4802,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
@@ -4817,9 +4820,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -4830,9 +4833,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" && (
@@ -4839,6 +4842,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -4852,6 +4855,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 2016-07-07 09:02:12.562645073 +0000 +++ configure 2016-08-08 12:33:42.744866190 +0000
@@ -5885,7 +5885,7 @@ case $cf_cv_system_name in @@ -5885,7 +5885,7 @@ case $cf_cv_system_name in
fi fi
;; ;;
@ -160,7 +160,7 @@
;; ;;
(openbsd[2-9].*|mirbsd*) (openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath," LD_RPATH_OPT="-Wl,-rpath,"
@@ -11564,12 +11564,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -11613,12 +11613,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
@ -178,7 +178,7 @@
sed -f $cf_man_alias \\ sed -f $cf_man_alias \\
CF_EOF CF_EOF
@@ -11579,7 +11582,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11628,7 +11631,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
@ -187,7 +187,7 @@
CF_EOF CF_EOF
fi fi
@@ -11619,7 +11622,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11668,7 +11671,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -196,7 +196,7 @@
CF_EOF CF_EOF
fi fi
@@ -11628,23 +11631,23 @@ case "$MANPAGE_FORMAT" in @@ -11677,23 +11680,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
@ -226,7 +226,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test \$section = 1 ; then if test \$section = 1 ; then
@@ -11653,7 +11656,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11702,7 +11705,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
@ -235,7 +235,7 @@
then then
continue continue
fi fi
@@ -11663,18 +11666,18 @@ CF_EOF @@ -11712,18 +11715,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
@ -257,7 +257,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
@@ -11694,9 +11697,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -11743,9 +11746,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test \$verb = removing ; then elif test \$verb = removing ; then
@ -270,7 +270,7 @@
) )
test -d \$cf_subdir\${section} && test -d \$cf_subdir\${section} &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -11716,6 +11719,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -11765,6 +11768,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -278,7 +278,7 @@
;; ;;
esac esac
done done
@@ -21987,6 +21991,7 @@ if test "$with_termlib" != no ; then @@ -22036,6 +22040,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 2016-07-07 09:02:12.562645073 +0000 +++ include/curses.h.in 2016-08-08 12:33:42.744866190 +0000
@@ -165,6 +165,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -165,6 +165,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 2016-07-07 09:02:12.562645073 +0000 +++ include/termcap.h.in 2016-08-08 12:33:42.744866190 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_CONST #undef NCURSES_CONST
--- include/tic.h --- include/tic.h
+++ include/tic.h 2016-07-07 09:02:12.562645073 +0000 +++ include/tic.h 2016-08-08 12:33:42.744866190 +0000
@@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias @@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias
*/ */
@ -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 2016-07-07 09:02:12.562645073 +0000 +++ man/man_db.renames 2016-08-08 12:33:42.744866190 +0000
@@ -167,6 +167,8 @@ tput.1 tput.1 @@ -167,6 +167,8 @@ tput.1 tput.1
tset.1 tset.1 tset.1 tset.1
vprintf.3s vprintf.3 vprintf.3s vprintf.3
@ -338,7 +338,7 @@
# Other: # Other:
tack.1m tack.1 tack.1m tack.1
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2016-07-07 09:02:12.562645073 +0000 +++ man/ncurses.3x 2016-08-08 12:33:42.744866190 +0000
@@ -121,6 +121,10 @@ after the shell environment variable \fB @@ -121,6 +121,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
@ -351,7 +351,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 2016-07-07 09:02:12.562645073 +0000 +++ misc/gen-pkgconfig.in 2016-08-08 12:33:42.744866190 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -391,7 +391,7 @@
echo "** creating ${name}${suffix}.pc" echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in --- misc/ncurses-config.in
+++ misc/ncurses-config.in 2016-07-07 09:02:12.562645073 +0000 +++ misc/ncurses-config.in 2016-08-08 12:33:42.744866190 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do @@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link # compile/link
--cflags) --cflags)
@ -402,7 +402,7 @@
fi fi
if test "${includedir}" != /usr/include ; then if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2016-07-07 09:02:12.626643834 +0000 +++ misc/terminfo.src 2016-08-08 12:33:42.800865143 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -773,7 +773,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 2016-07-07 09:02:12.566644995 +0000 +++ ncurses/Makefile.in 2016-08-08 12:33:42.748866115 +0000
@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) : @@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -784,7 +784,7 @@
./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 2016-07-07 09:02:12.566644995 +0000 +++ ncurses/curses.priv.h 2016-08-08 12:33:42.748866115 +0000
@@ -2024,6 +2024,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2024,6 +2024,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);
@ -795,7 +795,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 2016-07-07 09:02:12.566644995 +0000 +++ ncurses/run_cmd.sh 2016-08-08 12:33:42.748866115 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -809,7 +809,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2016-07-07 09:02:12.566644995 +0000 +++ ncurses/tinfo/MKfallback.sh 2016-08-08 12:33:42.748866115 +0000
@@ -68,6 +68,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -842,7 +842,7 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2016-07-07 09:02:12.566644995 +0000 +++ ncurses/tinfo/access.c 2016-08-08 12:33:42.748866115 +0000
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
#include <ctype.h> #include <ctype.h>
@ -885,7 +885,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 2016-07-07 09:02:12.566644995 +0000 +++ ncurses/tinfo/lib_setup.c 2016-08-08 12:33:42.752866041 +0000
@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) @@ -584,6 +584,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 */
@ -897,7 +897,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 2016-07-07 09:02:12.566644995 +0000 +++ ncurses/tinfo/read_entry.c 2016-08-08 12:33:42.752866041 +0000
@@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi @@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -915,7 +915,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2016-07-07 09:02:12.570644918 +0000 +++ ncurses/tinfo/read_termcap.c 2016-08-08 12:33:42.752866041 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -962,7 +962,7 @@
} }
if (copied != 0) if (copied != 0)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2016-07-07 09:02:12.570644918 +0000 +++ test/test.priv.h 2016-08-08 12:33:42.752866041 +0000
@@ -736,12 +736,12 @@ extern char *strnames[], *strcodes[], *s @@ -736,12 +736,12 @@ extern char *strnames[], *strcodes[], *s
#endif #endif

41
ncurses.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Aug 15 11:55:32 UTC 2016 - werner@suse.de
- Add ncurses patch 20160813
+ add a dependency upon generated-sources in Ada95/src/Makefile.in to
handle a case of "configure && make install".
+ trim trailing blanks from include/Caps*, to work around a problem
in sed (Debian #818067).
-------------------------------------------------------------------
Mon Aug 8 12:32:57 UTC 2016 - werner@suse.de
- Add ncurses patch 20160806
+ improve CF_GNU_SOURCE configure macro to optionally define
_DEFAULT_SOURCE work around a nuisance in recent glibc releases.
+ move the terminfo-specific parts of tput's "reset" function into
the shared reset_cmd.c, making the two forms of reset use the same
strings.
+ split-out the terminal initialization functions from tset as
progs/reset_cmd.c, as part of changes to merge the reset-feature
with tput.
-------------------------------------------------------------------
Mon Aug 1 11:45:10 UTC 2016 - werner@suse.de
- Add ncurses patch 20160730
+ change tset's initialization to allow it to get settings from the
standard input as well as /dev/tty, to be more effective when
output or error are redirected.
+ improve discussion of history and portability for tset/reset/tput
manual pages.
- Add ncurses patch 20160723
+ improve error message from tset/reset when both stderr/stdout are
redirected to a file or pipe.
+ improve organization of curs_attr.3x, curs_color.3x
- Add ncurses patch 20160709
+ work around Debian's antique/unmaintained version of mawk when
building link_test.
+ improve test/list_keys.c, showing ncurses's convention of modifiers
for special keys, based on xterm.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 7 08:57:03 UTC 2016 - werner@suse.de Thu Jul 7 08:57:03 UTC 2016 - werner@suse.de