From 09d0581c1a424199ad538d62b8bc5360ade0135a4931254ce3d808969d6efbb3 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 17 Sep 2012 12:57:29 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=93 --- ncurses-5.9-overflow.dif | 11 ---------- ncurses-5.9-overwrite.dif | 8 +++---- ncurses-5.9-patches.tar.bz2 | 4 ++-- ncurses-5.9.dif | 2 +- ncurses.changes | 44 +++++++++++++++++++++++++++++++++++++ ncurses.spec | 2 -- 6 files changed, 51 insertions(+), 20 deletions(-) delete mode 100644 ncurses-5.9-overflow.dif diff --git a/ncurses-5.9-overflow.dif b/ncurses-5.9-overflow.dif deleted file mode 100644 index 029a4fe..0000000 --- a/ncurses-5.9-overflow.dif +++ /dev/null @@ -1,11 +0,0 @@ ---- ncurses/base/lib_getch.c -+++ ncurses/base/lib_getch.c 2012-07-31 09:50:17.972509406 +0000 -@@ -174,7 +174,7 @@ static NCURSES_INLINE int - fifo_pull(SCREEN *sp) - { - int ch; -- ch = sp->_fifo[head]; -+ ch = (head != -1) ? sp->_fifo[head] : ERR; - TR(TRACE_IEVENT, ("pulling %s from %d", _nc_tracechar(sp, ch), head)); - - if (peek == head) { diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index e348d35..bc5bd37 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -1,6 +1,6 @@ --- configure.in +++ configure.in 2010-10-12 08:14:31.000000000 +0000 -@@ -413,6 +413,7 @@ AC_ARG_ENABLE(overwrite, +@@ -422,6 +422,7 @@ AC_ARG_ENABLE(overwrite, [with_overwrite=$enableval], [if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi]) AC_MSG_RESULT($with_overwrite) @@ -10,11 +10,11 @@ AC_ARG_ENABLE(database, --- configure +++ configure 2012-05-30 13:36:24.274067433 +0200 -@@ -6173,6 +6173,7 @@ else +@@ -6211,6 +6211,7 @@ else fi; - echo "$as_me:6174: result: $with_overwrite" >&5 + echo "$as_me:6212: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6177: checking if external terminfo-database is used" >&5 + echo "$as_me:6215: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index 81e9e21..aef70d2 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a554ad4f4054cb16e54bd714caca7a51d0f6aa516bbace7f4606fea1807fea0 -size 1326959 +oid sha256:78c83b2e13fda7fc16b43465e095d0c81db89306887266b46e497dfae9a97c5f +size 1496058 diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index 526339f..988698f 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -791,7 +791,7 @@ +# include +#endif - MODULE_ID("$Id: access.c,v 1.22 2012/02/22 22:34:31 tom Exp $") + MODULE_ID("$Id: access.c,v 1.23 2012/09/01 19:21:29 tom Exp $") @@ -112,6 +115,30 @@ _nc_basename(char *path) return path + _nc_pathlast(path); diff --git a/ncurses.changes b/ncurses.changes index e4fe314..5c1bda0 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Mon Sep 17 12:50:12 UTC 2012 - werner@suse.de + +- Add ncurses patch 5.9.20120908 + + add test-screens to test/ncurses to show 256-characters at a time, + to help with mingw port. +- Add ncurses patch 5.9.20120903 + + simplify varargs logic in lib_printw.c; va_copy is no longer needed + there. + + modifications for mingw port to make wide-character display usable. +- Add ncurses patch 5.9.20120902 + + regenerate configure script (report by Sven Joachim, cf: 20120901). +- Add ncurses patch 5.9.20120901 + + add a null-pointer check in _nc_flush (cf: 20120825). + + fix a case in _nc_scroll_optimize() where the _oldnums_list array + might not be allocated. + + improve comparisons in configure.in for unset shell variables. +- Add ncurses patch 5.9.20120826 + + increase size of ncurses' output-buffer, in case of very small + initial screen-sizes. + + fix evaluation of TERMINFO and TERMINFO_DIRS default values as needed + after changes to use --datarootdir (reports by Gabriele Balducci, + Roumen Petrov). +- Add ncurses patch 5.9.20120825 + + change output buffering scheme, using buffer maintained by ncurses + rather than stdio, to avoid problems with SIGTSTP handling (report + by Brian Bloniarz). +- Add ncurses patch 5.9.20120811 + + update autoconf patch to 2.52.20120811, adding --datarootdir + (prompted by discussion with Erwin Waterlander). + + improve description of --enable-reentrant option in README and the + INSTALL file. + + add nsterm-256color, make this the default nsterm -TD + + remove bw from nsterm-bce, per testing with tack -TD +- Add ncurses patch 5.9.20120804 + + update test/configure, adding check for tinfo library. + + improve limit-checks for the getch fifo (report by Werner Fink). + + fix a remaining mismatch between $with_echo and the symbols updated + by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by + Sven Joachim, cf: 20120317). + + modify followup check for pkg-config's library directory in the + --enable-pc-files option to validate syntax (report by Sven Joachim, + cf: 20110716). + ------------------------------------------------------------------- Tue Jul 31 09:57:02 UTC 2012 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index c3700e8..fd915d4 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -46,7 +46,6 @@ Source5: tack-1.07-20120303.tar.bz2 Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-%{version}.dif -Patch1: ncurses-5.9-overflow.dif Patch3: ncurses-5.9-overwrite.dif Patch4: ncurses-5.7-tack.dif Patch5: ncurses-5.9-environment.dif @@ -264,7 +263,6 @@ rm -f mkinstalldirs tar Oxfj %{S:1} | patch -p1 -s tar xfj %{S:5} mv tack-* tack -%patch -P 1 -p0 -b .of %patch -P 3 -p0 -b .ow %patch -P 4 -p0 -b .hs %patch -P 5 -p0 -b .lc