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

Accepting request 562434 from Base:System

Browse Source 
- Add ncurses patch 20171230
  + build-fix for ncurses-examples with Fedora27, adding check for
    reset_color_pairs() -- not yet in Fedora's package.
  + consistently add $CFLAGS to $MK_SHARED_LIB symbol in configure
    script when the latter happens to use the C compiler rather than
    directly using the loader (report by Jeffrey Walton).
  + set ABI for upcoming 6.1 release in "*.map" files.  While there are
    some remaining internals to apply, no ABI-related changes are
    anticipated.
  + add configure --with-config-suffix option to work around filename
    conflict with Redhat packages versus test-packages.
- Add ncurses patch 20171223
  + modify ncurses-examples to quiet const-warnings when building with
    PDCurses.
  + modify toe to not exit if unable to read a terminal description,
    e.g., if there is a permission problem.
  + minor fix for progs/toe.c, using _nc_free_termtype2.
  + assign 0 to pointer in _nc_tgetent_leak() after freeing it. Also
    avoid reusing pointer from previous successful call to tgetent
    if the latest call is unsuccessful (patch by Michael Schroeder,
    OpenSuSE #1070450).
  + minor fix for test/tracemunch, initialize $awaiting variable.

- Disable memory leak checking (boo#1070450) 

- Add ncurses patch 20171216
  + repair template in test/package/ncurses-examples.spec (cf: 20171111).
  + improve tic's warning about the number of parameters tparm might use
    for u1-u9 by making a special case for u6.
  + improve curs_attr.3x discussion of color pairs.

OBS-URL: https://build.opensuse.org/request/show/562434
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=139
This commit is contained in:
Dominique Leuenberger 2018-01-10 22:28:55 +00:00 committed by Git OBS Bridge
commit 0b3f2359e0
4 changed files with 114 additions and 35 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:3dd555773b70504e4f5c97a94ecc690d2f278cd6dd96cc7a1c0b1c0b76b2dfcb
size 3044400
oid sha256:b55196fa0f8daca84926dae3c21881c91d9f94a80d6c8076243af5566e6b5026
size 3229637

64
ncurses-6.0.dif
View File

@ -22,7 +22,7 @@
20 files changed, 248 insertions(+), 81 deletions(-)
--- aclocal.m4
+++ aclocal.m4 2017-11-20 08:13:37.950059704 +0000
+++ aclocal.m4 2018-01-06 11:10:51.910633598 +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
@ -151,8 +151,8 @@
esac
done
--- configure
+++ configure 2017-11-20 08:13:37.954059629 +0000
@@ -5950,7 +5950,7 @@ case $cf_cv_system_name in
+++ configure 2018-01-06 11:10:51.914633524 +0000
@@ -5969,7 +5969,7 @@ case $cf_cv_system_name in
fi
;;
(linux*|gnu*|k*bsd*-gnu|freebsd*)
@ -161,7 +161,7 @@
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -11916,12 +11916,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -12020,12 +12020,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
@@ -11931,7 +11934,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -12035,7 +12038,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -188,7 +188,7 @@
CF_EOF
fi
@@ -11971,7 +11974,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -12075,7 +12078,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -197,7 +197,7 @@
CF_EOF
fi
@@ -11980,23 +11983,23 @@ case "$MANPAGE_FORMAT" in
@@ -12084,23 +12087,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
@@ -12005,7 +12008,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -12109,7 +12112,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
@@ -12015,18 +12018,18 @@ CF_EOF
@@ -12119,18 +12122,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
@@ -12046,9 +12049,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -12150,9 +12153,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -271,7 +271,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -12068,6 +12071,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -12172,6 +12175,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -279,7 +279,7 @@
;;
esac
done
@@ -22773,6 +22777,7 @@ if test "$with_termlib" != no ; then
@@ -22881,6 +22885,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 2017-11-20 08:13:37.954059629 +0000
+++ include/curses.h.in 2018-01-06 11:10:51.914633524 +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 2017-11-20 08:13:37.954059629 +0000
+++ include/termcap.h.in 2018-01-06 11:10:51.918633450 +0000
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@ -311,7 +311,7 @@
#undef NCURSES_CONST
--- include/tic.h
+++ include/tic.h 2017-11-20 08:13:37.954059629 +0000
+++ include/tic.h 2018-01-06 11:10:51.918633450 +0000
@@ -207,12 +207,12 @@ struct alias
*/
@ -328,7 +328,7 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
+++ man/man_db.renames 2017-11-20 08:13:37.954059629 +0000
+++ man/man_db.renames 2018-01-06 11:10:51.918633450 +0000
@@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5
@ -337,7 +337,7 @@
tic.1m tic.1
toe.1m toe.1
tput.1 tput.1
@@ -170,6 +171,7 @@ tset.1 tset.1
@@ -171,6 +172,7 @@ user_caps.5 user_caps.5
wresize.3x wresize.3ncurses
#
# Other:
@ -346,7 +346,7 @@
#
getty.1 getty.8
--- man/ncurses.3x
+++ man/ncurses.3x 2017-11-20 08:13:37.954059629 +0000
+++ man/ncurses.3x 2018-01-06 11:10:51.918633450 +0000
@@ -138,6 +138,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 2017-11-20 08:13:37.954059629 +0000
+++ misc/gen-pkgconfig.in 2018-01-06 11:10:51.918633450 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi
@ -399,7 +399,7 @@
echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in
+++ misc/ncurses-config.in 2017-11-20 08:13:37.954059629 +0000
+++ misc/ncurses-config.in 2018-01-06 11:10:51.918633450 +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 2017-11-20 08:14:54.892595872 +0000
+++ misc/terminfo.src 2018-01-06 11:10:51.922633376 +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 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/Makefile.in 2018-01-06 11:10:51.922633376 +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 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/curses.priv.h 2018-01-06 11:10:51.922633376 +0000
@@ -2146,6 +2146,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 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/run_cmd.sh 2018-01-06 11:10:51.922633376 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@ -831,7 +831,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/tinfo/MKfallback.sh 2018-01-06 11:10:51.922633376 +0000
@@ -68,6 +68,12 @@ else
tmp_info=
fi
@ -864,7 +864,7 @@
done
--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/tinfo/access.c 2018-01-06 11:10:51.922633376 +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 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/tinfo/lib_setup.c 2018-01-06 11:10:51.922633376 +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 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/tinfo/read_entry.c 2018-01-06 11:10:51.922633376 +0000
@@ -431,6 +431,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 2017-11-20 08:13:37.958059552 +0000
+++ ncurses/tinfo/read_termcap.c 2018-01-06 11:10:51.922633376 +0000
@@ -322,14 +322,18 @@ _nc_getent(
*/
if (fd >= 0) {
@ -984,7 +984,7 @@
}
if (copied != 0)
--- progs/Makefile.in
+++ progs/Makefile.in 2017-11-20 08:13:37.958059552 +0000
+++ progs/Makefile.in 2018-01-06 11:10:51.922633376 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -1004,8 +1004,8 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h
+++ test/test.priv.h 2017-11-20 08:13:37.958059552 +0000
@@ -891,12 +891,12 @@ extern char *strnames[], *strcodes[], *s
+++ test/test.priv.h 2018-01-06 11:10:51.922633376 +0000
@@ -899,12 +899,12 @@ extern char *strnames[], *strcodes[], *s
#endif
/* out-of-band values for representing absent capabilities */

76
ncurses.changes
View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Sat Jan 8 08:45:51 UTC 2018 - werner@suse.de
- Add ncurses patch 20171230
+ build-fix for ncurses-examples with Fedora27, adding check for
reset_color_pairs() -- not yet in Fedora's package.
+ consistently add $CFLAGS to $MK_SHARED_LIB symbol in configure
script when the latter happens to use the C compiler rather than
directly using the loader (report by Jeffrey Walton).
+ set ABI for upcoming 6.1 release in "*.map" files. While there are
some remaining internals to apply, no ABI-related changes are
anticipated.
+ add configure --with-config-suffix option to work around filename
conflict with Redhat packages versus test-packages.
- Add ncurses patch 20171223
+ modify ncurses-examples to quiet const-warnings when building with
PDCurses.
+ modify toe to not exit if unable to read a terminal description,
e.g., if there is a permission problem.
+ minor fix for progs/toe.c, using _nc_free_termtype2.
+ assign 0 to pointer in _nc_tgetent_leak() after freeing it. Also
avoid reusing pointer from previous successful call to tgetent
if the latest call is unsuccessful (patch by Michael Schroeder,
OpenSuSE #1070450).
+ minor fix for test/tracemunch, initialize $awaiting variable.
-------------------------------------------------------------------
Fri Dec 22 11:44:19 UTC 2017 - werner@suse.de
- Disable memory leak checking (boo#1070450)
-------------------------------------------------------------------
Mon Dec 18 07:22:49 UTC 2017 - werner@suse.de
- Add ncurses patch 20171216
+ repair template in test/package/ncurses-examples.spec (cf: 20171111).
+ improve tic's warning about the number of parameters tparm might use
for u1-u9 by making a special case for u6.
+ improve curs_attr.3x discussion of color pairs.
-------------------------------------------------------------------
Mon Dec 11 08:27:21 UTC 2017 - werner@suse.de
- Add ncurses patch 20171209
+ modify misc/ncurses-config.in to make output with --includedir
consistent with --cflags, i.e., when --disable-overwrite option was
configured the output should show the subdirectory where headers
are.
+ modify MKlib_gen.sh to suppress macros when calling an "implemented"
function in link_test.c
+ updated ftp-url used in test-packages, etc.
+ modify order of -pie/-shared options in configure script in case
LDFLAGS uses "-pie", working around a defect or limitation in the GNU
linker (prompted by patch by Yogesh Prasad, forwarded by Jay Shah).
+ add entry in man_db.renames for user_caps.5
-------------------------------------------------------------------
Mon Nov 27 13:32:56 UTC 2017 - werner@suse.de
- Add ncurses patch 20171125
+ modify MKlib_gen.sh to avoid tracing result from getstr/getnstr
before initialized.
+ add "-a" aspect-ratio option to picsmap.
+ add configure check for default path of rgb.txt, used in picsmap.
+ modify _nc_write_entry() to truncate too-long filename (report by
Hosein Askari, Debian #882620).
+ build-fix for ncurses-examples with NetBSD curses:
+ it lacks the use_env() function.
+ it lacks libpanel; a recent change used the wrong ifdef symbol.
+ add a macro for is_linetouched() and adjust the function's return
value to make it possible for most applications to check for an
error-return (report by Midolikawa H).
+ additional manpage cleanup.
+ update config.guess, config.sub from
http://git.savannah.gnu.org/cgit/config.git
-------------------------------------------------------------------
Mon Nov 20 08:11:58 UTC 2017 - werner@suse.de

5
ncurses.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ncurses
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,6 +22,7 @@
%else
%bcond_with symversion
%endif
%bcond_with memleakck
Name: ncurses
#!BuildIgnore: terminfo
@ -413,7 +414,9 @@ rm -vf mk-dlls.sh
--disable-overwrite \
--disable-rpath \
--disable-rpath-hack \
%if %{with memleakck}
--disable-leaks \
%endif
--disable-xmc-glitch \
--enable-symlinks \
--enable-big-core \