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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=259
This commit is contained in:
Dr. Werner Fink 2016-09-12 12:58:32 +00:00 committed by Git OBS Bridge
parent b21c0f58a8
commit 7633cdb49e
4 changed files with 90 additions and 44 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
oid sha256:398346657cc4269adaceaedf258871096f914265c7f3c9b4ce2e7a3e8c259a56
size 874293
oid sha256:ecdf159ed89b4babebc810d28171df85b0d0a3fc7df09b21597388f6655dad5b
size 1106137

80
ncurses-6.0.dif
View File

@ -21,7 +21,7 @@
19 files changed, 239 insertions(+), 80 deletions(-)
--- aclocal.m4
+++ aclocal.m4 2016-08-08 12:33:42.740866267 +0000
+++ aclocal.m4 2016-09-12 12:57:28.319002677 +0000
@@ -564,7 +564,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)
@@ -4700,12 +4700,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4717,12 +4717,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
@@ -4715,7 +4718,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4732,7 +4735,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -58,7 +58,7 @@
CF_EOF
fi
@@ -4755,7 +4758,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4772,7 +4775,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -67,7 +67,7 @@
CF_EOF
fi
@@ -4764,23 +4767,23 @@ case "$MANPAGE_FORMAT" in
@@ -4781,23 +4784,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
@@ -4789,7 +4792,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4806,7 +4809,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
@@ -4799,18 +4802,18 @@ CF_EOF
@@ -4816,18 +4819,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
@@ -4830,9 +4833,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4847,9 +4850,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -141,7 +141,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -4852,6 +4855,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4869,6 +4872,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -150,8 +150,8 @@
esac
done
--- configure
+++ configure 2016-08-08 12:33:42.744866190 +0000
@@ -5885,7 +5885,7 @@ case $cf_cv_system_name in
+++ configure 2016-09-12 12:57:28.323002600 +0000
@@ -5895,7 +5895,7 @@ case $cf_cv_system_name in
fi
;;
(linux*|gnu*|k*bsd*-gnu|freebsd*)
@ -160,7 +160,7 @@
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -11613,12 +11613,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11620,12 +11620,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
@@ -11628,7 +11631,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11635,7 +11638,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -187,7 +187,7 @@
CF_EOF
fi
@@ -11668,7 +11671,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11675,7 +11678,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -196,7 +196,7 @@
CF_EOF
fi
@@ -11677,23 +11680,23 @@ case "$MANPAGE_FORMAT" in
@@ -11684,23 +11687,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
@@ -11702,7 +11705,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11709,7 +11712,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
@@ -11712,18 +11715,18 @@ CF_EOF
@@ -11719,18 +11722,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
@@ -11743,9 +11746,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11750,9 +11753,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -270,7 +270,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -11765,6 +11768,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11772,6 +11775,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -278,7 +278,7 @@
;;
esac
done
@@ -22036,6 +22040,7 @@ if test "$with_termlib" != no ; then
@@ -22227,6 +22231,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 2016-08-08 12:33:42.744866190 +0000
+++ include/curses.h.in 2016-09-12 12:57:28.323002600 +0000
@@ -165,6 +165,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 2016-08-08 12:33:42.744866190 +0000
+++ include/termcap.h.in 2016-09-12 12:57:28.323002600 +0000
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_CONST
--- include/tic.h
+++ include/tic.h 2016-08-08 12:33:42.744866190 +0000
+++ include/tic.h 2016-09-12 12:57:28.323002600 +0000
@@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias
*/
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
+++ man/man_db.renames 2016-08-08 12:33:42.744866190 +0000
+++ man/man_db.renames 2016-09-12 12:57:28.323002600 +0000
@@ -167,6 +167,8 @@ tput.1 tput.1
tset.1 tset.1
vprintf.3s vprintf.3
@ -338,7 +338,7 @@
# Other:
tack.1m tack.1
--- man/ncurses.3x
+++ man/ncurses.3x 2016-08-08 12:33:42.744866190 +0000
+++ man/ncurses.3x 2016-09-12 12:57:28.323002600 +0000
@@ -121,6 +121,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes
@ -351,7 +351,7 @@
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 2016-08-08 12:33:42.744866190 +0000
+++ misc/gen-pkgconfig.in 2016-09-12 12:57:28.327002524 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi
@ -391,7 +391,7 @@
echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in
+++ misc/ncurses-config.in 2016-08-08 12:33:42.744866190 +0000
+++ misc/ncurses-config.in 2016-09-12 12:57:28.327002524 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link
--cflags)
@ -402,7 +402,7 @@
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
+++ misc/terminfo.src 2016-08-08 12:33:42.800865143 +0000
+++ misc/terminfo.src 2016-09-12 12:57:28.383001464 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@ -773,7 +773,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 2016-08-08 12:33:42.748866115 +0000
+++ ncurses/Makefile.in 2016-09-12 12:57:28.327002524 +0000
@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@ -784,7 +784,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 2016-08-08 12:33:42.748866115 +0000
+++ ncurses/curses.priv.h 2016-09-12 12:57:28.327002524 +0000
@@ -2024,6 +2024,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);
@ -795,7 +795,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 2016-08-08 12:33:42.748866115 +0000
+++ ncurses/run_cmd.sh 2016-09-12 12:57:28.331002449 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@ -809,7 +809,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2016-08-08 12:33:42.748866115 +0000
+++ ncurses/tinfo/MKfallback.sh 2016-09-12 12:57:28.331002449 +0000
@@ -68,6 +68,12 @@ else
tmp_info=
fi
@ -842,7 +842,7 @@
done
--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2016-08-08 12:33:42.748866115 +0000
+++ ncurses/tinfo/access.c 2016-09-12 12:57:28.331002449 +0000
@@ -35,6 +35,9 @@
#include <ctype.h>
@ -885,7 +885,7 @@
_nc_access(const char *path, int mode)
{
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2016-08-08 12:33:42.752866041 +0000
+++ ncurses/tinfo/lib_setup.c 2016-09-12 12:57:28.331002449 +0000
@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
@ -897,7 +897,7 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2016-08-08 12:33:42.752866041 +0000
+++ ncurses/tinfo/read_entry.c 2016-09-12 12:57:28.331002449 +0000
@@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0;
int code;
@ -915,7 +915,7 @@
return (code);
}
--- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2016-08-08 12:33:42.752866041 +0000
+++ ncurses/tinfo/read_termcap.c 2016-09-12 12:57:28.331002449 +0000
@@ -322,14 +322,18 @@ _nc_getent(
*/
if (fd >= 0) {
@ -942,7 +942,7 @@
myfd = TRUE;
}
lineno = 0;
@@ -1117,8 +1121,10 @@ _nc_read_termcap_entry(const char *const
@@ -1118,8 +1122,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]));
@ -953,7 +953,7 @@
_nc_set_source(termpaths[i]);
/*
@@ -1130,6 +1136,7 @@ _nc_read_termcap_entry(const char *const
@@ -1131,6 +1137,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp);
}
@ -962,8 +962,8 @@
}
if (copied != 0)
--- test/test.priv.h
+++ test/test.priv.h 2016-08-08 12:33:42.752866041 +0000
@@ -736,12 +736,12 @@ extern char *strnames[], *strcodes[], *s
+++ test/test.priv.h 2016-09-12 12:57:28.331002449 +0000
@@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s
#endif
/* out-of-band values for representing absent capabilities */

48
ncurses.changes
View File

@ -1,3 +1,51 @@
-------------------------------------------------------------------
Mon Sep 12 12:55:25 UTC 2016 - werner@suse.de
- Add ncurses patch 20160910
+ trim dead code ifdef'd with HIDE_EINTR since 970830 (discussion with
Leon Winter).
+ trim some obsolete/incorrect wording about EINTR from wgetch manual
page (patch by Leon Winter).
+ really correct 20100515 change (patch by Rich Coe).
+ add "--enable-string-hacks" option to test/configure
+ completed string-hacks for "sprintf", etc., including test-programs.
+ make "--enable-string-hacks" work with Debian by checking for the
"bsd" library and its associated "<bsd/string.h>" header.
- Add ncurses patch 20160903
+ correct 20100515 change for weak signals versus sigprocmask (report
by Rich Coe).
+ modify misc/Makefile.in to work around OpenBSD "make" which unlike
all other versions of "make" does not recognize continuation lines
of comments.
+ amend the last change to CF_C_ENV_FLAGS to move only the
preprocessor, optimization and warning flags to CPPFLAGS and CFLAGS,
leaving the residue in CC. That happens to work for gcc's various
"model" options, but may require tuning for other compilers (report
by Sven Joachim).
- Add ncurses patch 20160827
+ add "v" menu entry to test/ncurses.c to show baudrate and other
values.
+ add "newer" baudrate symbols from Linux and FreeBSD to progs/tset.c,
lib_baudrate.c
+ modify CF_XOPEN_SOURCE macro:
+ add "uclinux" to case for "linux" (patch by Yann E. Morin)
+ modify _GNU_SOURCE for cygwin headers, tested with cygwin 2.3, 2.5
(patch by Corinna Vinschen, from changes to tin).
+ improve CF_CC_ENV_FLAGS macro to allow for compiler wrappers such
as "ccache" (report by Enrico Scholz).
+ update config.guess, config.sub from
http://git.savannah.gnu.org/cgit/config.git
- Add ncurses patch 20160820
+ update tput manual page to reflect changes to manipulate terminal
modes by sharing functions with tset.
+ add the terminal-mode parts of "reset" (aka tset) to the "tput reset"
command, making the two almost the same except for window-size.
+ adapt logic used in dialog "--keep-tite" option for test/filter.c as
"-a" option. When set, test/filter attempts to suppress the
alternate screen.
+ correct a typo in interix entry -TD
- Drop patch ncurses-6.0-signal.dif as now upstream
-------------------------------------------------------------------
Mon Sep 5 00:14:00 UTC 2016 - rcoe@wi.rr.com

2
ncurses.spec
View File

@ -67,7 +67,6 @@ Patch0: ncurses-6.0.dif
Patch1: ncurses-5.9-ibm327x.dif
Patch4: ncurses-5.7-tack.dif
Patch5: ncurses-5.9-environment.dif
Patch6: ncurses-6.0-signal.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _miscdir %{_datadir}/misc
%global _incdir %{_includedir}
@ -282,7 +281,6 @@ mv tack-* tack
%patch4 -p0 -b .hs
%patch5 -p0 -b .lc
%patch0 -p0 -b .p0
%patch6 -p0 -b .p6
rm -vf include/ncurses_dll.h
rm -vf mkdirs.sh
rm -vf tar-copy.sh