From 90a4f99b4dcb384803f5b24c4a25b7924878e9fbfc026f53246a233177eac648 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 20 Mar 2017 08:52:32 +0000 Subject: [PATCH] WARNING: could break YaST ncurses GUI OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=294 --- ncurses-6.0-patches.tar.bz2 | 4 +-- ncurses-6.0.dif | 57 +++++++++++++++++++++---------------- ncurses.changes | 23 +++++++++++++++ ncurses.spec | 2 +- tack-1.07-20150606.tgz | 3 -- tack-1.07-20170318.tgz | 3 ++ 6 files changed, 61 insertions(+), 31 deletions(-) delete mode 100644 tack-1.07-20150606.tgz create mode 100644 tack-1.07-20170318.tgz diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index 33a31d7..cca0cd3 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:dc23faa810e55569acd30e9c2ff0b8cf244a738701f682dd7fc2c2eb6f0ae78e -size 1939350 +oid sha256:525ef6529046ab9b9bba461060e4d54a3fb0a0831141155419fb2ea1890a0e72 +size 1951598 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index bcb934c..87b975c 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,7 +21,7 @@ 19 files changed, 240 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2017-03-13 11:20:02.616209952 +0000 ++++ aclocal.m4 2017-03-20 08:37:36.264165063 +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 @@ -150,7 +150,7 @@ esac done --- configure -+++ configure 2017-03-13 11:20:02.620209877 +0000 ++++ configure 2017-03-20 08:37:36.268164988 +0000 @@ -5925,7 +5925,7 @@ case $cf_cv_system_name in 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 2017-03-13 11:20:02.620209877 +0000 ++++ include/curses.h.in 2017-03-20 08:37:36.268164988 +0000 @@ -177,6 +177,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 2017-03-13 11:20:02.620209877 +0000 ++++ include/termcap.h.in 2017-03-20 08:37:36.268164988 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,8 +310,8 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2017-03-13 11:20:02.620209877 +0000 -@@ -233,12 +233,12 @@ extern NCURSES_EXPORT(const struct alias ++++ include/tic.h 2017-03-20 08:37:36.268164988 +0000 +@@ -205,12 +205,12 @@ struct alias */ /* out-of-band values for representing absent capabilities */ @@ -327,18 +327,25 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2017-03-13 11:20:02.620209877 +0000 -@@ -168,6 +168,8 @@ tput.1 tput.1 - tset.1 tset.1 - vprintf.3s vprintf.3 - wresize.3x wresize.3ncurses ++++ man/man_db.renames 2017-03-20 08:40:12.013229223 +0000 +@@ -162,6 +162,7 @@ term.7 term.7 + term_variables.3x terminfo_variables.3ncurses + terminfo.5 terminfo.5 + terminfo.\\\*n terminfo.5 +curs_terminfo.\\\*n terminfo.5 -+tack.1 tack.1 + tic.1m tic.1 + toe.1m toe.1 + tput.1 tput.1 +@@ -170,6 +171,7 @@ vprintf.3 vprintf.3 + wresize.3x wresize.3ncurses # # Other: ++tack.1 tack.1 tack.1m tack.1 + # + getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2017-03-13 11:20:02.620209877 +0000 ++++ man/ncurses.3x 2017-03-20 08:37:36.268164988 +0000 @@ -134,6 +134,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -351,7 +358,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-03-13 11:20:02.624209801 +0000 ++++ misc/gen-pkgconfig.in 2017-03-20 08:37:36.268164988 +0000 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" fi @@ -391,7 +398,7 @@ echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2017-03-13 11:20:02.624209801 +0000 ++++ misc/ncurses-config.in 2017-03-20 08:37:36.268164988 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -402,7 +409,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2017-03-13 11:20:02.688208599 +0000 ++++ misc/terminfo.src 2017-03-20 08:37:36.272164913 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -782,7 +789,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-03-13 11:20:02.628209726 +0000 ++++ ncurses/Makefile.in 2017-03-20 08:37:36.272164913 +0000 @@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -793,7 +800,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-03-13 11:20:02.628209726 +0000 ++++ ncurses/curses.priv.h 2017-03-20 08:37:36.272164913 +0000 @@ -2038,6 +2038,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); @@ -804,7 +811,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-03-13 11:20:02.628209726 +0000 ++++ ncurses/run_cmd.sh 2017-03-20 08:37:36.272164913 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -818,7 +825,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-03-13 11:20:02.628209726 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-03-20 08:37:36.272164913 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -851,7 +858,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-03-13 11:20:02.628209726 +0000 ++++ ncurses/tinfo/access.c 2017-03-20 08:37:36.272164913 +0000 @@ -35,6 +35,9 @@ #include @@ -894,7 +901,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-03-13 11:20:02.628209726 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-03-20 08:37:36.272164913 +0000 @@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -906,7 +913,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-03-13 11:20:02.628209726 +0000 ++++ ncurses/tinfo/read_entry.c 2017-03-20 08:37:36.272164913 +0000 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -924,7 +931,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-03-13 11:20:02.628209726 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-03-20 08:37:36.272164913 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -971,7 +978,7 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2017-03-13 11:20:02.628209726 +0000 ++++ test/test.priv.h 2017-03-20 08:37:36.272164913 +0000 @@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 2a34a40..57bfee3 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Mon Mar 20 08:36:28 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170318 + + change TERMINAL structure in term.h to make it opaque. Some + applications misuse its members, e.g., directly modifying it + rather than using def_prog_mode(). + + modify utility headers such as tic.h to make it clearer which are + externals that are used by tack. + + improve curs_slk.3x in particular its discussion of portability. + + fix cut/paste in legacy_encoding.3x + + add prototype for find_pair() to new_pair.3x (report by Branden + Robinson). + + fix a couple of broken links in generated man-html documentation. + + regenerate man-html documentation. +- Add tack patch 1.07.20170318 + * init.c: + use def_prog_mode() to eliminate two internal details from ncurses + * edit.c, tack.h: accommodate opaque TERMINAL structure in ncurses + * tack.h: update copyright to match version + * config.sub: 2017-02-07 + * config.guess: 2017-03-05 + ------------------------------------------------------------------- Mon Mar 13 11:21:44 UTC 2017 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 3c34ba0..079fb18 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -60,7 +60,7 @@ Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc # Latest tack can be found at ftp://invisible-island.net/pub/ncurses/current/ -Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.07-20150606.tgz +Source5: ftp://invisible-island.net/pub/ncurses/current/tack-1.07-20170318.tgz Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-6.0.dif diff --git a/tack-1.07-20150606.tgz b/tack-1.07-20150606.tgz deleted file mode 100644 index db409bc..0000000 --- a/tack-1.07-20150606.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0315f3acabb13d6a2e567eba57a49de6314775d90604739aa4526784cc19ce23 -size 207582 diff --git a/tack-1.07-20170318.tgz b/tack-1.07-20170318.tgz new file mode 100644 index 0000000..1d2ad5b --- /dev/null +++ b/tack-1.07-20170318.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dca952b1eae20517f44b31865dc706e30869f19d01e3fab8ffbae85f883b521 +size 212340