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

Update to 6.1-20180825

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=387
This commit is contained in:
Dr. Werner Fink 2018-08-27 08:02:18 +00:00 committed by Git OBS Bridge
parent e83d42c09b
commit 1fd345de14
3 changed files with 73 additions and 48 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
oid sha256:0bee9a3dcf3f2c54729160737de7730e81d3db0174ca71d6562ee6d166febba9
size 552400
oid sha256:5039e6971fdb9cd8094eb848224ec6b09c57651849fb3ad8243213f3edbb41cf
size 677101

92
ncurses-6.1.dif
View File

@ -22,7 +22,7 @@
20 files changed, 248 insertions(+), 81 deletions(-)
--- aclocal.m4
+++ aclocal.m4 2018-08-06 08:10:42.473427417 +0000
+++ aclocal.m4 2018-08-27 07:57:30.144412402 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
@ -32,7 +32,7 @@
#include <stdio.h>
#if defined(__cplusplus)
@@ -4888,12 +4888,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4940,12 +4940,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
@@ -4903,7 +4906,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4955,7 +4958,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -59,7 +59,7 @@
CF_EOF
fi
@@ -4943,7 +4946,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -4995,7 +4998,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -68,7 +68,7 @@
CF_EOF
fi
@@ -4952,23 +4955,23 @@ case "$MANPAGE_FORMAT" in
@@ -5004,23 +5007,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
@@ -4977,7 +4980,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5029,7 +5032,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
@@ -4987,18 +4990,18 @@ CF_EOF
@@ -5039,18 +5042,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
@@ -5018,9 +5021,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5070,9 +5073,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -142,7 +142,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -5040,6 +5043,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5092,6 +5095,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -151,17 +151,17 @@
esac
done
--- configure
+++ configure 2018-08-06 08:10:42.473427417 +0000
@@ -5352,7 +5352,7 @@ case $cf_cv_system_name in
fi
;;
(linux*|gnu*|k*bsd*-gnu|freebsd*)
- LD_RPATH_OPT="-Wl,-rpath,"
+ LD_RPATH_OPT="-Wl,-rpath-link,"
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -13406,12 +13406,15 @@ cat >>$cf_edit_man <<CF_EOF
+++ configure 2018-08-27 07:59:02.178709875 +0000
@@ -5463,7 +5463,7 @@ echo $ECHO_N "checking for an rpath opti
fi
;;
(linux*|gnu*|k*bsd*-gnu|freebsd*)
- LD_RPATH_OPT="-Wl,-rpath,"
+ LD_RPATH_OPT="-Wl,-rpath-link,"
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -13518,12 +13518,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@ -179,7 +179,7 @@
sed -f $cf_man_alias \\
CF_EOF
@@ -13421,7 +13424,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -13533,7 +13536,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -188,7 +188,7 @@
CF_EOF
fi
@@ -13461,7 +13464,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -13573,7 +13576,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -197,7 +197,7 @@
CF_EOF
fi
@@ -13470,23 +13473,23 @@ case "$MANPAGE_FORMAT" in
@@ -13582,23 +13585,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
@ -227,7 +227,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
@@ -13495,7 +13498,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -13607,7 +13610,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@ -236,7 +236,7 @@
then
continue
fi
@@ -13505,18 +13508,18 @@ CF_EOF
@@ -13617,18 +13620,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -258,7 +258,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -13536,9 +13539,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -13648,9 +13651,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -271,7 +271,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -13558,6 +13561,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -13670,6 +13673,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -279,7 +279,7 @@
;;
esac
done
@@ -23970,6 +23974,7 @@ if test "$with_termlib" != no ; then
@@ -24131,6 +24135,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@ -288,7 +288,7 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- include/curses.h.in
+++ include/curses.h.in 2018-08-06 08:10:42.477427344 +0000
+++ include/curses.h.in 2018-08-27 07:57:30.148412327 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@ -300,7 +300,7 @@
* We need FILE, etc. Include this before checking any feature symbols.
*/
--- include/termcap.h.in
+++ include/termcap.h.in 2018-08-06 08:10:42.477427344 +0000
+++ include/termcap.h.in 2018-08-27 07:57:30.148412327 +0000
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@ -311,7 +311,7 @@
#undef NCURSES_OSPEED
--- include/tic.h
+++ include/tic.h 2018-08-06 08:10:42.477427344 +0000
+++ include/tic.h 2018-08-27 07:57:30.148412327 +0000
@@ -221,12 +221,12 @@ struct alias
*/
@ -328,7 +328,7 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
+++ man/man_db.renames 2018-08-06 08:10:42.477427344 +0000
+++ man/man_db.renames 2018-08-27 07:57:30.148412327 +0000
@@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5
@ -346,7 +346,7 @@
#
getty.1 getty.8
--- man/ncurses.3x
+++ man/ncurses.3x 2018-08-06 08:10:42.477427344 +0000
+++ man/ncurses.3x 2018-08-27 07:57:30.148412327 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes
@ -359,7 +359,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 2018-08-06 08:10:42.477427344 +0000
+++ misc/gen-pkgconfig.in 2018-08-27 07:57:30.148412327 +0000
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
fi
@ -399,7 +399,7 @@
if test $name = $MAIN_LIBRARY
--- misc/ncurses-config.in
+++ misc/ncurses-config.in 2018-08-06 08:10:42.477427344 +0000
+++ misc/ncurses-config.in 2018-08-27 07:57:30.148412327 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link
--cflags)
@ -410,7 +410,7 @@
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
+++ misc/terminfo.src 2018-08-06 08:10:42.481427272 +0000
+++ misc/terminfo.src 2018-08-27 07:57:30.152412254 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@ -795,7 +795,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 2018-08-06 08:10:42.481427272 +0000
+++ ncurses/Makefile.in 2018-08-27 07:57:30.152412254 +0000
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@ -806,7 +806,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 2018-08-06 08:10:42.485427200 +0000
+++ ncurses/curses.priv.h 2018-08-27 07:57:30.152412254 +0000
@@ -2173,6 +2173,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);
@ -817,7 +817,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 2018-08-06 08:10:42.485427200 +0000
+++ ncurses/run_cmd.sh 2018-08-27 07:57:30.152412254 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@ -831,7 +831,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2018-08-06 08:10:42.485427200 +0000
+++ ncurses/tinfo/MKfallback.sh 2018-08-27 07:57:30.152412254 +0000
@@ -68,6 +68,12 @@ else
tmp_info=
fi
@ -864,7 +864,7 @@
done
--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2018-08-06 08:10:42.485427200 +0000
+++ ncurses/tinfo/access.c 2018-08-27 07:57:30.152412254 +0000
@@ -35,6 +35,9 @@
#include <ctype.h>
@ -907,7 +907,7 @@
_nc_access(const char *path, int mode)
{
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2018-08-06 08:10:42.485427200 +0000
+++ ncurses/tinfo/lib_setup.c 2018-08-27 07:57:30.156412180 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
@ -919,7 +919,7 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2018-08-06 08:10:42.485427200 +0000
+++ ncurses/tinfo/read_entry.c 2018-08-27 07:57:30.156412180 +0000
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0;
int code;
@ -937,7 +937,7 @@
return (code);
}
--- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2018-08-06 08:10:42.485427200 +0000
+++ ncurses/tinfo/read_termcap.c 2018-08-27 07:57:30.156412180 +0000
@@ -322,14 +322,18 @@ _nc_getent(
*/
if (fd >= 0) {
@ -984,7 +984,7 @@
}
if (copied != 0)
--- progs/Makefile.in
+++ progs/Makefile.in 2018-08-06 08:10:42.485427200 +0000
+++ progs/Makefile.in 2018-08-27 07:57:30.156412180 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -1004,7 +1004,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h
+++ test/test.priv.h 2018-08-06 08:10:42.485427200 +0000
+++ test/test.priv.h 2018-08-27 07:57:30.156412180 +0000
@@ -910,12 +910,12 @@ extern char *strnames[], *strcodes[], *s
#endif

25
ncurses.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Aug 27 07:56:48 UTC 2018 - werner@suse.de
- Add ncurses patch 6.1-20180825
+ add a section to tput manual page clarifying how it determines the
terminal size (prompted by discussion with Grant Jenks).
+ add "--disable-relink" to rpm test-packages, for consistency with the
deb test-packages.
+ split spec-file into ncurses6.spec and ncursest6.spec to work around
toolset breakage in Fedora 28.
+ drop mention of "--disable-touching", which was not in the final
20180818 updates.
- Add ncurses patch 6.1-20180818
+ build-fix for PDCurses with ncurses-examples.
+ improved CF_CC_ENV_FLAGS.
+ modify configure scripts to reduce relinking/ranlib during library
install (Debian #903790):
+ use "install -p" when available, to avoid need for ranlib of
static libraries.
+ modify scripts which use "--disable-relink" to add a 1-second
sleep to work around tools which use whole-second timestamps, e.g.,
in utime() rather than the actual file system resolution.
+ add "--disable-touching" option for using "install -p" option during
the install, e.g., so that header-files have a predictable timestamp.
-------------------------------------------------------------------
Thu Aug 9 11:26:52 UTC 2018 - tchvatal@suse.com