diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index c4e53f8..61d9e48 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72dc24460e605ed1ce18410aed542b7e88a3fed63eb08827eb20199f5d718da3 -size 1640183 +oid sha256:c9e207531c4357cf2d4e44adf8ce6cb93e7af5799174497c7733cfe3bc9d3814 +size 1739944 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 3041a78..c8f4f73 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,8 +21,8 @@ 19 files changed, 240 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2017-01-30 08:55:04.189218562 +0000 -@@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool]) ++++ aclocal.m4 2017-02-20 11:16:21.482330611 +0000 +@@ -593,7 +593,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out AC_TRY_RUN([ @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -4733,12 +4733,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -4863,9 +4866,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -11879,9 +11882,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2017-01-30 08:55:04.197218430 +0000 -@@ -2030,6 +2030,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2017-02-20 11:16:21.494330379 +0000 +@@ -2034,6 +2034,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); extern NCURSES_EXPORT(int) _nc_access (const char *, int); @@ -804,7 +804,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-01-30 08:55:04.197218430 +0000 ++++ ncurses/run_cmd.sh 2017-02-20 11:16:21.494330379 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -818,7 +818,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-01-30 08:55:04.197218430 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-02-20 11:16:21.494330379 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -851,7 +851,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-01-30 08:55:04.197218430 +0000 ++++ ncurses/tinfo/access.c 2017-02-20 11:16:21.494330379 +0000 @@ -35,6 +35,9 @@ #include @@ -894,7 +894,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-01-30 08:55:04.197218430 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-02-20 11:16:21.494330379 +0000 @@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -906,8 +906,8 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-01-30 08:55:04.197218430 +0000 -@@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi ++++ ncurses/tinfo/read_entry.c 2017-02-20 11:16:21.494330379 +0000 +@@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -915,7 +915,7 @@ if (_nc_access(filename, R_OK) < 0 || (fp = fopen(filename, "rb")) == 0) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); -@@ -453,6 +454,7 @@ _nc_read_file_entry(const char *const fi +@@ -451,6 +452,7 @@ _nc_read_file_entry(const char *const fi } fclose(fp); } @@ -924,7 +924,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-01-30 08:55:04.201218365 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-02-20 11:16:21.494330379 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -971,8 +971,8 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2017-01-30 08:55:04.201218365 +0000 -@@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2017-02-20 11:16:21.494330379 +0000 +@@ -786,12 +786,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index 5c70915..927dd2d 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Mon Feb 20 11:15:23 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170218 + + fix several formatting issues with manual pages. + + correct read of terminfo entry in which all strings are absent or + explicitly cancelled. Before this fix, the result was that all were + treated as only absent. + + modify infocmp to suppress mixture of absent/cancelled capabilities + that would only show as "NULL, NULL", unless the -q option is used, + e.g., to show "-, @" or "@, -". + +------------------------------------------------------------------- +Mon Feb 13 09:16:11 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170212 + + build-fixes for PGI compilers (report by Adam J. Stewart) + + accept whitespace in sed expression for generating expanded.c + + modify configure check that g++ compiler warnings are not used. + + add configure check for -fPIC option needed for shared libraries. + + let configure --disable-ext-funcs override the default for the + --enable-sp-funcs option. + + mark some structs in form/menu/panel libraries as potentially opaque + without modifying API/ABI. + + add configure option --enable-opaque-curses for ncurses library and + similar options for the other libraries. + +------------------------------------------------------------------- +Mon Feb 6 11:08:53 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170204 + + trim newlines, tabs and escaped newlines from terminfo "paths" passed + to db-iterator. + + ignore zero-length files in db-iterator; these are useful for + instance to suppress "$HOME/.terminfo" when not wanted. + + amended "b64:" encoder to work with the terminfo reader. + + modify terminfo reader to accept "b64:" format using RFC-3548 in + as well as RFC-4648 url/filename-safe format. + + modify terminfo reader to accept "hex:" format as generated by + "infocmp -0qQ1" (cf: 20150905). + + adjust authors comment to reflect drop below 1% for SV. + +------------------------------------------------------------------- +Fri Feb 3 14:17:59 UTC 2017 - jengelh@inai.de + +- Drop authors block from description and ship AUTHORS intead. +- Replace canned summaries and descriptions by + package-specific ones. +- Replace |xargs rm by simpler -delete. Use modern tar options. + ------------------------------------------------------------------- Fri Feb 3 08:00:06 UTC 2017 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index e7cbead..3c34ba0 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -49,7 +49,7 @@ Obsoletes: ncurses-64bit # Version: 6.0 Release: 0 -Summary: New curses Libraries +Summary: Terminal control library License: MIT Group: System/Base #Git: http://ncurses.scripts.mit.edu @@ -75,18 +75,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build As soon as a text application needs to directly control its output to the screen (if it wants to place the cursor at location (x,y) then write text), ncurses is used. The panel and the forms libraries are -included in this package. These new libraries support color, special -characters, and panels. - - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis +included in this package. The ncurses libraries support color, special +characters, forms, and panels. %package -n ncurses-utils Summary: Tools using the new curses libraries @@ -109,16 +99,6 @@ tset -- terminal-initialization utility reset -- terminal initialization utility - - -Authors: --------- - Thomas E. Dickey - Eric S. Raymond - Zeyd M. Ben-Halim - Juergen Pfeifer - Pavel Curtis - %package -n terminfo-base Summary: A terminal descriptions database License: MIT @@ -131,15 +111,8 @@ This database is the official successor to the 4.4BSD termcap file and contains information about any known terminal. The ncurses library makes use of this database to use terminals correctly. - - -Authors: --------- - Thomas E. Dickey - Eric S. Raymond - %package -n libncurses5 -Summary: The New curses Libraries +Summary: Terminal control library License: MIT Group: System/Libraries Requires: terminfo-base @@ -152,21 +125,13 @@ Obsoletes: ncurses-64bit # %description -n libncurses5 -The ncurses library is used by the most curses based terminal -applications for controling its output and input to the screen. +The ncurses library is used by many terminal applications for +controlling output to the screen and input from the user. - - -Authors: --------- - Thomas E. Dickey - Eric S. Raymond - Zeyd M. Ben-Halim - Juergen Pfeifer - Pavel Curtis +This package contains the library built with the version 5 ABI. %package -n libncurses6 -Summary: The New curses Libraries +Summary: Terminal control library License: MIT Group: System/Libraries Requires: terminfo-base @@ -174,18 +139,10 @@ Provides: ncurses = %{version} Recommends: ncurses-utils = %{version} %description -n libncurses6 -The ncurses library is used by the most curses based terminal -applications for controling its output and input to the screen. +The ncurses library is used by many terminal applications for +controlling output to the screen and input from the user. - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis +This package contains the library built with the version 6 ABI. %package -n terminfo Summary: A terminal descriptions database @@ -201,15 +158,8 @@ just use the Linux console, xterm, and VT100, you probably will not need this database -- a minimal /usr/share/terminfo tree for these terminals is already included in the terminfo-base package. - - -Authors: --------- - Eric S. Raymond - Thomas E. Dickey - %package -n ncurses-devel -Summary: Include Files and Libraries mandatory for Development +Summary: Development files for the ncurses6 terminal control library License: MIT Group: Development/Libraries/C and C++ Provides: ncurses6-devel @@ -224,21 +174,11 @@ Obsoletes: ncurses-devel-64bit # %description -n ncurses-devel -This package contains all necessary include files and libraries needed -to develop applications that require these. - - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis +This package contains the headers needed to build against +the ncurses library in its ABI version 6 form. %package -n ncurses5-devel -Summary: Include Files and Libraries mandatory for Development +Summary: Development files for the ncurses5 terminal control library License: MIT Group: Development/Libraries/C and C++ Provides: ncurses:%{_incdir}/ncurses5/ncurses.h @@ -248,18 +188,8 @@ Requires: ncurses = %{version}-%{release} Requires: ncurses-devel = %{version}-%{release} %description -n ncurses5-devel -This package contains all necessary include files and libraries needed -to develop applications that require these. - - - -Authors: --------- - Thomas E. Dickey - Juergen Pfeifer - Eric S. Raymond - Zeyd M. Ben-Halim - Pavel Curtis +This package contains the headers needed to build against +the ncurses library in its ABI version 5 form. %package -n tack Summary: Terminfo action checker @@ -275,18 +205,11 @@ correctness of an existing entry, and to develop the correct pad timings needed to ensure that screen updates do not fall behind the incoming data stream. - - -Authors: --------- - Daniel Weaver - Eric S. Raymond - %prep %setup -q rm -f Ada95/src/terminal_interface-curses.adb rm -f mkinstalldirs -tar xfj %{S:1} +tar -xjf %{S:1} set +x for patch in patches/ncurses*.patch do @@ -294,11 +217,11 @@ do done set -x rm -rf patches/ -find -name '*.orig' | xargs -r rm -f +find -name '*.orig' -delete # replace tack from ncurses tarball with the latest version in # separate tarball rm -fr tack -tar xfz %{S:5} +tar -xzf %{S:5} mv tack-* tack %patch1 -p0 -b .327x %patch4 -p0 -b .hs @@ -554,7 +477,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # # Now rebuild libncurses and do the rest of this job # - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c make -C c++ etip.h make %{?_smp_mflags} @@ -565,7 +488,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src EOF %endif # must not use %jobs here (would lead to: ln: ncurses.h already exists) - find man/ -name '*.[1-8]x.*' | xargs -r rm -vf + find man/ -name '*.[1-8]x.*' -print -delete make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir} ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config @@ -606,7 +529,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src sleep 1 kill $pid %if !0%{?_crossbuild} - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif make -C c++ etip.h @@ -654,7 +577,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src sleep 1 kill $pid %if !0%{?_crossbuild} - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif make -C c++ etip.h @@ -688,7 +611,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src sleep 1 kill $pid %if !0%{?_crossbuild} - find -name fallback.o | xargs -r rm -vf + find -name fallback.o -print -delete cp fallback.c.build ncurses/fallback.c %endif make -C c++ etip.h @@ -927,6 +850,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src %doc %{_mandir}/man1/tput.1.gz %doc %{_mandir}/man1/tset.1.gz %doc %{_mandir}/man5/*.gz +%doc AUTHORS %files -n libncurses5 %defattr(-,root,root)