Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2014-07-19 11:04:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2014-06-25 11:47:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2014-07-19 11:04:14.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Jul 14 08:57:10 UTC 2014 - [email protected] + +- Add ncurses patch 20140712 + + correct Charable() macro check for A_ALTCHARSET in wide-characters. + + build-fix for position-debug code in tty_update.c, to work with or + without sp-funcs. +- Add ncurses patch 20140705 + + add w/W toggle to ncurses.c 'B' test, to demonstrate permutation of + video-attributes and colors with double-width character strings. + +------------------------------------------------------------------- +Mon Jun 30 07:09:05 UTC 2014 - [email protected] + +- Add ncurses patch 20140629 + + correct check in win_driver.c for saving screen contents, e.g., when + NCURSES_CONSOLE2 is set (cf: 20140503). + + reorganize b/B menu items in ncurses.c, putting the test-strings into + subwindows. This is needed for a planned change to use Unicode + fullwidth characters in the test-screens. + + correct update to form status for _NEWTOP, broken by fixes for + compiler warnings (patch by Leon Winter, cf: 20120616). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses-5.9-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-5.9-20140629.patch new/patches/ncurses-5.9-20140629.patch --- old/patches/ncurses-5.9-20140629.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-5.9-20140629.patch 2014-06-30 09:07:36.000000000 +0200 @@ -0,0 +1,613 @@ +# ncurses 5.9 - patch - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 5.9 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 5.9 are in the subdirectory +# ftp://invisible-island.net/ncurses/5.9 +# +# ------------------------------------------------------------------------------ +# ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20140629.patch.gz +# patch by Thomas E. Dickey <[email protected]> +# created Mon Jun 30 00:28:28 UTC 2014 +# ------------------------------------------------------------------------------ +# NEWS | 11 ++ +# dist.mk | 4 +# form/frm_driver.c | 4 +# ncurses/win32con/win_driver.c | 4 +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# test/dots_curses.c | 6 - +# test/ncurses.c | 154 ++++++++++++++++++++++++------------- +# 12 files changed, 130 insertions(+), 73 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.2229 +--- ncurses-5.9-20140621+/NEWS 2014-06-21 21:51:45.000000000 +0000 ++++ ncurses-5.9-20140629/NEWS 2014-06-29 23:43:38.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.2229 2014/06/21 21:51:45 tom Exp $ ++-- $Id: NEWS,v 1.2234 2014/06/29 23:43:38 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,15 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20140629 ++ + correct check in win_driver.c for saving screen contents, e.g., when ++ NCURSES_CONSOLE2 is set (cf: 20140503). ++ + reorganize b/B menu items in ncurses.c, putting the test-strings into ++ subwindows. This is needed for a planned change to use Unicode ++ fullwidth characters in the test-screens. ++ + correct update to form status for _NEWTOP, broken by fixes for ++ compiler warnings (patch by Leon Winter, cf: 20120616). ++ + 20140621 + + change shared-library suffix for AIX 5 and 6 to ".so", avoiding + conflict with the static library (report by Ben Lentz). +Index: dist.mk +Prereq: 1.992 +--- ncurses-5.9-20140621+/dist.mk 2014-06-21 14:35:14.000000000 +0000 ++++ ncurses-5.9-20140629/dist.mk 2014-06-28 21:47:46.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.992 2014/06/21 14:35:14 tom Exp $ ++# $Id: dist.mk,v 1.994 2014/06/28 21:47:46 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 5 + NCURSES_MINOR = 9 +-NCURSES_PATCH = 20140621 ++NCURSES_PATCH = 20140629 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: form/frm_driver.c +Prereq: 1.111 +--- ncurses-5.9-20140621+/form/frm_driver.c 2014-03-08 22:08:20.000000000 +0000 ++++ ncurses-5.9-20140629/form/frm_driver.c 2014-06-28 16:28:22.000000000 +0000 +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_driver.c,v 1.111 2014/03/08 22:08:20 Xin.Li Exp $") ++MODULE_ID("$Id: frm_driver.c,v 1.112 2014/06/28 16:28:22 Leon.Winter Exp $") + + /*---------------------------------------------------------------------------- + This is the core module of the form library. It contains the majority +@@ -1998,7 +1998,7 @@ + { + res = fct(form); + if (res == E_OK) +- SetStatus(form, _NEWTOP); ++ SetStatus(form->current, _NEWTOP); + } + return (res); + } +Index: ncurses/win32con/win_driver.c +Prereq: 1.38 +--- ncurses-5.9-20140621+/ncurses/win32con/win_driver.c 2014-05-10 21:50:00.000000000 +0000 ++++ ncurses-5.9-20140629/ncurses/win32con/win_driver.c 2014-06-29 22:48:17.000000000 +0000 +@@ -45,7 +45,7 @@ + + #define CUR my_term.type. + +-MODULE_ID("$Id: win_driver.c,v 1.38 2014/05/10 21:50:00 tom Exp $") ++MODULE_ID("$Id: win_driver.c,v 1.39 2014/06/29 22:48:17 tom Exp $") + + #ifndef __GNUC__ + # error We need GCC to compile for MinGW +@@ -1909,7 +1909,7 @@ + if (CON.hdl != INVALID_HANDLE_VALUE) { + CON.buffered = buffered; + get_SBI(); +- if (buffered) { ++ if (!buffered) { + save_original_screen(); + } + } +Index: package/debian-mingw/changelog +--- ncurses-5.9-20140621+/package/debian-mingw/changelog 2014-06-21 14:35:14.000000000 +0000 ++++ ncurses-5.9-20140629/package/debian-mingw/changelog 2014-06-28 21:47:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140621) unstable; urgency=low ++ncurses6 (5.9-20140629) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 21 Jun 2014 10:35:14 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 28 Jun 2014 17:47:47 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-5.9-20140621+/package/debian-mingw64/changelog 2014-06-21 14:35:14.000000000 +0000 ++++ ncurses-5.9-20140629/package/debian-mingw64/changelog 2014-06-28 21:47:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140621) unstable; urgency=low ++ncurses6 (5.9-20140629) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 21 Jun 2014 10:35:14 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 28 Jun 2014 17:47:47 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-5.9-20140621+/package/debian/changelog 2014-06-21 14:35:14.000000000 +0000 ++++ ncurses-5.9-20140629/package/debian/changelog 2014-06-28 21:47:47.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140621) unstable; urgency=low ++ncurses6 (5.9-20140629) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 21 Jun 2014 10:35:14 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 28 Jun 2014 17:47:47 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.47 +--- ncurses-5.9-20140621+/package/mingw-ncurses.nsi 2014-06-21 14:35:14.000000000 +0000 ++++ ncurses-5.9-20140629/package/mingw-ncurses.nsi 2014-06-28 21:47:47.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.47 2014/06/21 14:35:14 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.49 2014/06/28 21:47:47 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "5" + !define VERSION_MINOR "9" + !define VERSION_YYYY "2014" +-!define VERSION_MMDD "0621" ++!define VERSION_MMDD "0629" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-5.9-20140621+/package/mingw-ncurses.spec 2014-06-21 14:35:14.000000000 +0000 ++++ ncurses-5.9-20140629/package/mingw-ncurses.spec 2014-06-28 21:47:47.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 5.9 +-Release: 20140621 ++Release: 20140629 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-5.9-20140621+/package/ncurses.spec 2014-06-21 14:35:14.000000000 +0000 ++++ ncurses-5.9-20140629/package/ncurses.spec 2014-06-28 21:47:47.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 5.9 +-Release: 20140621 ++Release: 20140629 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/dots_curses.c +Prereq: 1.1 +--- ncurses-5.9-20140621+/test/dots_curses.c 2014-06-21 16:07:50.000000000 +0000 ++++ ncurses-5.9-20140629/test/dots_curses.c 2014-06-28 20:33:24.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: dots_curses.c,v 1.1 2014/06/21 16:07:50 tom Exp $ ++ * $Id: dots_curses.c,v 1.2 2014/06/28 20:33:24 tom Exp $ + * + * A simple demo of the curses interface used for comparison with termcap. + */ +@@ -106,7 +106,7 @@ + for (bg = 0; bg < COLORS; bg++) { + int pair = mypair(fg, bg); + if (pair > 0) +- init_pair(pair, fg, bg); ++ init_pair((short) pair, (short) fg, (short) bg); + } + } + } +@@ -142,7 +142,7 @@ + napms(1); + } + } +- addch(p); ++ addch((chtype) p); + refresh(); + ++total_chars; + } +Index: test/ncurses.c +Prereq: 1.401 +--- ncurses-5.9-20140621+/test/ncurses.c 2014-06-21 18:37:29.000000000 +0000 ++++ ncurses-5.9-20140629/test/ncurses.c 2014-06-28 21:45:40.000000000 +0000 +@@ -40,7 +40,7 @@ + Author: Eric S. Raymond <[email protected]> 1993 + Thomas E. Dickey (beginning revision 1.27 in 1996). + +-$Id: ncurses.c,v 1.401 2014/06/21 18:37:29 tom Exp $ ++$Id: ncurses.c,v 1.408 2014/06/28 21:45:40 tom Exp $ + + ***************************************************************************/ + +@@ -303,7 +303,7 @@ + + #if USE_WIDEC_SUPPORT + static wchar_t +-fullwidth_of(int ch) ++fullwidth_digit(int ch) + { + return (ch + 0xff10 - '0'); + } +@@ -313,7 +313,7 @@ + { + int ch; + while ((ch = *source++) != 0) { +- *target++ = fullwidth_of(ch); ++ *target++ = fullwidth_digit(ch); + } + *target = 0; + } +@@ -334,7 +334,7 @@ + { + wchar_t source[2]; + +- source[0] = fullwidth_of(digit + '0'); ++ source[0] = fullwidth_digit(digit + '0'); + source[1] = 0; + setcchar(target, source, A_NORMAL, 0, 0); + } +@@ -1252,8 +1252,13 @@ + #define termattrs() my_termattrs() + #endif + +-#define MAX_ATTRSTRING 31 +-#define LEN_ATTRSTRING 26 ++#define ATTRSTRING_1ST 32 /* ' ' */ ++#define ATTRSTRING_END 126 /* '~' */ ++ ++#define COL_ATTRSTRING 25 ++#define MARGIN_4_ATTRS (COL_ATTRSTRING + 8) ++#define LEN_ATTRSTRING (COLS - MARGIN_4_ATTRS) ++#define MAX_ATTRSTRING (ATTRSTRING_END + 1 - ATTRSTRING_1ST) + + static char attr_test_string[MAX_ATTRSTRING + 1]; + +@@ -1352,12 +1357,14 @@ + static void + adjust_attr_string(int adjust) + { +- int first = ((int) UChar(attr_test_string[0])) + adjust; +- int last = first + LEN_ATTRSTRING; +- +- if (first >= ' ' && last <= '~') { /* 32..126 */ +- int j, k; +- for (j = 0, k = first; j < MAX_ATTRSTRING && k <= last; ++j, ++k) { ++ char save = attr_test_string[0]; ++ int first = ((int) UChar(save)) + adjust; ++ int j, k; ++ ++ if (first >= ATTRSTRING_1ST) { ++ for (j = 0, k = first; j < MAX_ATTRSTRING; ++j, ++k) { ++ if (k > ATTRSTRING_END) ++ break; + attr_test_string[j] = (char) k; + if (((k + 1 - first) % 5) == 0) { + if (++j >= MAX_ATTRSTRING) +@@ -1365,23 +1372,40 @@ + attr_test_string[j] = ' '; + } + } +- while (j < MAX_ATTRSTRING) +- attr_test_string[j++] = ' '; +- attr_test_string[j] = '\0'; +- } else { +- beep(); ++ if ((LEN_ATTRSTRING - j) > 5) { ++ attr_test_string[0] = save; ++ adjust_attr_string(adjust - 1); ++ } else { ++ while (j < MAX_ATTRSTRING) ++ attr_test_string[j++] = ' '; ++ attr_test_string[j] = '\0'; ++ } + } + } + ++/* ++ * Prefer the right-end of the string for starting, since that maps to the ++ * VT100 line-drawing. ++ */ ++static int ++default_attr_string(void) ++{ ++ int result = (ATTRSTRING_END - LEN_ATTRSTRING); ++ result += (LEN_ATTRSTRING / 5); ++ if (result < ATTRSTRING_1ST) ++ result = ATTRSTRING_1ST; ++ return result; ++} ++ + static void + init_attr_string(void) + { +- attr_test_string[0] = 'a'; ++ attr_test_string[0] = (char) default_attr_string(); + adjust_attr_string(0); + } + + static int +-show_attr(int row, int skip, bool arrow, chtype attr, const char *name) ++show_attr(WINDOW *win, int row, int skip, bool arrow, chtype attr, const char *name) + { + int ncv = get_ncv(); + chtype test = attr & (chtype) (~A_ALTCHARSET); +@@ -1389,7 +1413,7 @@ + if (arrow) + MvPrintw(row, 5, "-->"); + MvPrintw(row, 8, "%s mode:", name); +- MvPrintw(row, 24, "|"); ++ MvPrintw(row, COL_ATTRSTRING - 1, "|"); + if (skip) + printw("%*s", skip, " "); + /* +@@ -1397,22 +1421,23 @@ + * character at a time (to pass its rendition directly), and use the + * string operation for the other attributes. + */ ++ wmove(win, 0, 0); + if (attr & A_ALTCHARSET) { + const char *s; + chtype ch; + + for (s = attr_test_string; *s != '\0'; ++s) { + ch = UChar(*s); +- addch(ch | attr); ++ (void) waddch(win, ch | attr); + } + } else { +- (void) attrset(attr); +- addstr(attr_test_string); +- attroff(attr); ++ (void) wattrset(win, attr); ++ (void) waddstr(win, attr_test_string); ++ (void) wattroff(win, attr); + } + if (skip) + printw("%*s", skip, " "); +- printw("|"); ++ MvPrintw(row, COL_ATTRSTRING + LEN_ATTRSTRING, "|"); + if (test != A_NORMAL) { + if (!(termattrs() & test)) { + printw(" (N/A)"); +@@ -1570,10 +1595,18 @@ + NCURSES_COLOR_T tx = -1; + int ac = 0; + unsigned j, k; ++ WINDOW *my_wins[SIZEOF(attrs_to_test)]; + ATTR_TBL my_list[SIZEOF(attrs_to_test)]; + unsigned my_size = init_attr_list(my_list, termattrs()); + + if (my_size > 1) { ++ for (j = 0; j < my_size; ++j) { ++ my_wins[j] = subwin(stdscr, ++ 1, LEN_ATTRSTRING, ++ 2 + (int) (2 * j), COL_ATTRSTRING); ++ scrollok(my_wins[j], FALSE); ++ } ++ + if (skip < 0) + skip = 0; + +@@ -1614,7 +1647,7 @@ + + for (j = 0; j < my_size; ++j) { + bool arrow = (j == k); +- row = show_attr(row, n, arrow, ++ row = show_attr(my_wins[j], row, n, arrow, + extras | + my_list[j].attr | + my_list[k].attr, +@@ -1645,12 +1678,14 @@ + static void + wide_adjust_attr_string(int adjust) + { +- int first = ((int) UChar(wide_attr_test_string[0])) + adjust; +- int last = first + LEN_ATTRSTRING; +- +- if (first >= ' ' && last <= '~') { /* 32..126 */ +- int j, k; +- for (j = 0, k = first; j < MAX_ATTRSTRING && k <= last; ++j, ++k) { ++ char save = (char) wide_attr_test_string[0]; ++ int first = ((int) UChar(save)) + adjust; ++ int j, k; ++ ++ if (first >= ATTRSTRING_1ST) { ++ for (j = 0, k = first; j < MAX_ATTRSTRING; ++j, ++k) { ++ if (k > ATTRSTRING_END) ++ break; + wide_attr_test_string[j] = k; + if (((k + 1 - first) % 5) == 0) { + if (++j >= MAX_ATTRSTRING) +@@ -1658,18 +1693,21 @@ + wide_attr_test_string[j] = ' '; + } + } +- while (j < MAX_ATTRSTRING) +- wide_attr_test_string[j++] = ' '; +- wide_attr_test_string[j] = '\0'; +- } else { +- beep(); ++ if ((LEN_ATTRSTRING - j) > 5) { ++ wide_attr_test_string[0] = save; ++ wide_adjust_attr_string(adjust - 1); ++ } else { ++ while (j < MAX_ATTRSTRING) ++ wide_attr_test_string[j++] = ' '; ++ wide_attr_test_string[j] = '\0'; ++ } + } + } + + static void + wide_init_attr_string(void) + { +- wide_attr_test_string[0] = 'a'; ++ wide_attr_test_string[0] = default_attr_string(); + wide_adjust_attr_string(0); + } + +@@ -1705,7 +1743,8 @@ + } + + static int +-wide_show_attr(int row, ++wide_show_attr(WINDOW *win, ++ int row, + int skip, + bool arrow, + chtype attr, +@@ -1718,7 +1757,7 @@ + if (arrow) + MvPrintw(row, 5, "-->"); + MvPrintw(row, 8, "%s mode:", name); +- MvPrintw(row, 24, "|"); ++ MvPrintw(row, COL_ATTRSTRING - 1, "|"); + if (skip) + printw("%*s", skip, " "); + +@@ -1727,6 +1766,7 @@ + * character at a time (to pass its rendition directly), and use the + * string operation for the other attributes. + */ ++ wmove(win, 0, 0); + if (attr & WA_ALTCHARSET) { + const wchar_t *s; + cchar_t ch; +@@ -1736,20 +1776,20 @@ + fill[0] = *s; + fill[1] = L'\0'; + setcchar(&ch, fill, attr, pair, 0); +- add_wch(&ch); ++ (void) wadd_wch(win, &ch); + } + } else { + attr_t old_attr = 0; + NCURSES_PAIRS_T old_pair = 0; + +- (void) (attr_get) (&old_attr, &old_pair, 0); +- (void) attr_set(attr, pair, 0); +- addwstr(wide_attr_test_string); +- (void) attr_set(old_attr, old_pair, 0); ++ (void) (wattr_get) (win, &old_attr, &old_pair, 0); ++ (void) wattr_set(win, attr, pair, 0); ++ (void) waddwstr(win, wide_attr_test_string); ++ (void) wattr_set(win, old_attr, old_pair, 0); + } + if (skip) + printw("%*s", skip, " "); +- printw("|"); ++ MvPrintw(row, COL_ATTRSTRING + LEN_ATTRSTRING, "|"); + if (test != A_NORMAL) { + if (!(term_attrs() & test)) { + printw(" (N/A)"); +@@ -1862,9 +1902,17 @@ + int ac = 0; + unsigned j, k; + ATTR_TBL my_list[SIZEOF(attrs_to_test)]; ++ WINDOW *my_wins[SIZEOF(attrs_to_test)]; + unsigned my_size = init_attr_list(my_list, term_attrs()); + + if (my_size > 1) { ++ for (j = 0; j < my_size; ++j) { ++ my_wins[j] = subwin(stdscr, ++ 1, LEN_ATTRSTRING, ++ 2 + (int) (2 * j), COL_ATTRSTRING); ++ scrollok(my_wins[j], FALSE); ++ } ++ + if (skip < 0) + skip = 0; + +@@ -1900,7 +1948,7 @@ + MvAddStr(0, 20, "Character attribute test display"); + + for (j = 0; j < my_size; ++j) { +- row = wide_show_attr(row, n, j == k, ++ row = wide_show_attr(my_wins[j], row, n, (j == k), + ((attr_t) ac | + my_list[j].attr | + my_list[k].attr), +@@ -4752,13 +4800,13 @@ + fill_panel(win) + --------------------------------------------------------------------------*/ + static void +-init_panel(void) ++init_panel(WINDOW *win) + { + register int y, x; + + for (y = 0; y < LINES - 1; y++) { + for (x = 0; x < COLS; x++) +- wprintw(stdscr, "%d", (y + x) % 10); ++ wprintw(win, "%d", (y + x) % 10); + } + } + +@@ -4784,7 +4832,7 @@ + + #if USE_WIDEC_SUPPORT + static void +-init_wide_panel(void) ++init_wide_panel(WINDOW *win) + { + int digit; + cchar_t temp[10]; +@@ -4796,7 +4844,7 @@ + int y, x; + getyx(stdscr, y, x); + digit = (y + x / 2) % 10; +- } while (add_wch(&temp[digit]) != ERR); ++ } while (wadd_wch(win, &temp[digit]) != ERR); + } + + static void +@@ -4850,7 +4898,7 @@ + } + + static void +-demo_panels(void (*InitPanel) (void), void (*FillPanel) (PANEL *)) ++demo_panels(void (*InitPanel) (WINDOW *), void (*FillPanel) (PANEL *)) + { + int count; + int itmp; +@@ -4859,7 +4907,7 @@ + scrollok(stdscr, FALSE); /* we don't want stdscr to scroll! */ + refresh(); + +- InitPanel(); ++ InitPanel(stdscr); + for (count = 0; count < 5; count++) { + px[1] = mkpanel(COLOR_RED, + LINES / 2 - 2, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-5.9-20140705.patch new/patches/ncurses-5.9-20140705.patch --- old/patches/ncurses-5.9-20140705.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-5.9-20140705.patch 2014-07-07 09:24:42.000000000 +0200 @@ -0,0 +1,283 @@ +# ncurses 5.9 - patch - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 5.9 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 5.9 are in the subdirectory +# ftp://invisible-island.net/ncurses/5.9 +# +# ------------------------------------------------------------------------------ +# ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20140705.patch.gz +# patch by Thomas E. Dickey <[email protected]> +# created Sun Jul 6 01:43:07 UTC 2014 +# ------------------------------------------------------------------------------ +# NEWS | 6 ++- +# dist.mk | 4 +- +# package/debian-mingw/changelog | 4 +- +# package/debian-mingw64/changelog | 4 +- +# package/debian/changelog | 4 +- +# package/mingw-ncurses.nsi | 4 +- +# package/mingw-ncurses.spec | 2 - +# package/ncurses.spec | 2 - +# test/ncurses.c | 62 ++++++++++++++++++++++++++++++++++--- +# 9 files changed, 75 insertions(+), 17 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.2234 +--- ncurses-5.9-20140629+/NEWS 2014-06-29 23:43:38.000000000 +0000 ++++ ncurses-5.9-20140705/NEWS 2014-07-05 20:39:04.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.2234 2014/06/29 23:43:38 tom Exp $ ++-- $Id: NEWS,v 1.2236 2014/07/05 20:39:04 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,10 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20140705 ++ + add w/W toggle to ncurses.c 'B' test, to demonstrate permutation of ++ video-attributes and colors with double-width character strings. ++ + 20140629 + + correct check in win_driver.c for saving screen contents, e.g., when + NCURSES_CONSOLE2 is set (cf: 20140503). +Index: dist.mk +Prereq: 1.994 +--- ncurses-5.9-20140629+/dist.mk 2014-06-28 21:47:46.000000000 +0000 ++++ ncurses-5.9-20140705/dist.mk 2014-07-05 18:50:25.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.994 2014/06/28 21:47:46 tom Exp $ ++# $Id: dist.mk,v 1.995 2014/07/05 18:50:25 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 5 + NCURSES_MINOR = 9 +-NCURSES_PATCH = 20140629 ++NCURSES_PATCH = 20140705 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: package/debian-mingw/changelog +--- ncurses-5.9-20140629+/package/debian-mingw/changelog 2014-06-28 21:47:47.000000000 +0000 ++++ ncurses-5.9-20140705/package/debian-mingw/changelog 2014-07-05 18:50:25.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140629) unstable; urgency=low ++ncurses6 (5.9-20140705) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 28 Jun 2014 17:47:47 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 05 Jul 2014 14:50:25 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-5.9-20140629+/package/debian-mingw64/changelog 2014-06-28 21:47:47.000000000 +0000 ++++ ncurses-5.9-20140705/package/debian-mingw64/changelog 2014-07-05 18:50:25.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140629) unstable; urgency=low ++ncurses6 (5.9-20140705) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 28 Jun 2014 17:47:47 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 05 Jul 2014 14:50:25 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-5.9-20140629+/package/debian/changelog 2014-06-28 21:47:47.000000000 +0000 ++++ ncurses-5.9-20140705/package/debian/changelog 2014-07-05 18:50:25.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140629) unstable; urgency=low ++ncurses6 (5.9-20140705) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 28 Jun 2014 17:47:47 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 05 Jul 2014 14:50:25 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.49 +--- ncurses-5.9-20140629+/package/mingw-ncurses.nsi 2014-06-28 21:47:47.000000000 +0000 ++++ ncurses-5.9-20140705/package/mingw-ncurses.nsi 2014-07-05 18:50:25.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.49 2014/06/28 21:47:47 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.50 2014/07/05 18:50:25 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "5" + !define VERSION_MINOR "9" + !define VERSION_YYYY "2014" +-!define VERSION_MMDD "0629" ++!define VERSION_MMDD "0705" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-5.9-20140629+/package/mingw-ncurses.spec 2014-06-28 21:47:47.000000000 +0000 ++++ ncurses-5.9-20140705/package/mingw-ncurses.spec 2014-07-05 18:50:25.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 5.9 +-Release: 20140629 ++Release: 20140705 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-5.9-20140629+/package/ncurses.spec 2014-06-28 21:47:47.000000000 +0000 ++++ ncurses-5.9-20140705/package/ncurses.spec 2014-07-05 18:50:25.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 5.9 +-Release: 20140629 ++Release: 20140705 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/ncurses.c +Prereq: 1.408 +--- ncurses-5.9-20140629+/test/ncurses.c 2014-06-28 21:45:40.000000000 +0000 ++++ ncurses-5.9-20140705/test/ncurses.c 2014-07-05 22:23:34.000000000 +0000 +@@ -40,7 +40,7 @@ + Author: Eric S. Raymond <[email protected]> 1993 + Thomas E. Dickey (beginning revision 1.27 in 1996). + +-$Id: ncurses.c,v 1.408 2014/06/28 21:45:40 tom Exp $ ++$Id: ncurses.c,v 1.410 2014/07/05 22:23:34 tom Exp $ + + ***************************************************************************/ + +@@ -1292,6 +1292,10 @@ + " a/A toggle ACS (alternate character set) mapping"); + MvWPrintw(helpwin, row, col, + " v/V toggle video attribute to combine with each line"); ++#if USE_WIDEC_SUPPORT ++ MvWPrintw(helpwin, row, col, ++ " w/W toggle normal/wide (double-width) test-characters"); ++#endif + } + + static void +@@ -1422,6 +1426,7 @@ + * string operation for the other attributes. + */ + wmove(win, 0, 0); ++ werase(win); + if (attr & A_ALTCHARSET) { + const char *s; + chtype ch; +@@ -1673,20 +1678,59 @@ + } + + #if USE_WIDEC_SUPPORT ++static bool use_fullwidth; + static wchar_t wide_attr_test_string[MAX_ATTRSTRING + 1]; + ++#define FULL_LO 0xff00 ++#define FULL_HI 0xff5e ++#define HALF_LO 0x20 ++ ++#define isFullWidth(ch) ((ch) >= FULL_LO && (ch) <= FULL_HI) ++#define ToNormalWidth(ch) (((ch) - FULL_LO) + HALF_LO) ++#define ToFullWidth(ch) (((ch) - HALF_LO) + FULL_LO) ++ ++/* ++ * Returns an ASCII code in [32..126] ++ */ ++static wchar_t ++normal_wchar(int ch) ++{ ++ wchar_t result = ch; ++ if (isFullWidth(ch)) ++ result = ToNormalWidth(ch); ++ return result; ++} ++ ++/* ++ * Returns either an ASCII code in in [32..126] or full-width in ++ * [0xff00..0xff5e], according to use_fullwidth setting. ++ */ ++static wchar_t ++target_wchar(int ch) ++{ ++ wchar_t result = ch; ++ if (use_fullwidth) { ++ if (!isFullWidth(ch)) ++ result = ToFullWidth(ch); ++ } else { ++ if (isFullWidth(ch)) ++ result = ToNormalWidth(ch); ++ } ++ return result; ++} ++ + static void + wide_adjust_attr_string(int adjust) + { +- char save = (char) wide_attr_test_string[0]; +- int first = ((int) UChar(save)) + adjust; ++ wchar_t save = wide_attr_test_string[0]; ++ int first = ((int) normal_wchar(save)) + adjust; + int j, k; + + if (first >= ATTRSTRING_1ST) { + for (j = 0, k = first; j < MAX_ATTRSTRING; ++j, ++k) { + if (k > ATTRSTRING_END) + break; +- wide_attr_test_string[j] = k; ++ wide_attr_test_string[j] = target_wchar(k); + if (((k + 1 - first) % 5) == 0) { + if (++j >= MAX_ATTRSTRING) + break; +@@ -1707,6 +1751,7 @@ + static void + wide_init_attr_string(void) + { ++ use_fullwidth = FALSE; + wide_attr_test_string[0] = default_attr_string(); + wide_adjust_attr_string(0); + } +@@ -1767,6 +1812,7 @@ + * string operation for the other attributes. + */ + wmove(win, 0, 0); ++ werase(win); + if (attr & WA_ALTCHARSET) { + const wchar_t *s; + cchar_t ch; +@@ -1872,6 +1918,14 @@ + if (*kc >= limit) + *kc = 0; + break; ++ case 'w': ++ use_fullwidth = FALSE; ++ wide_adjust_attr_string(0); ++ break; ++ case 'W': ++ use_fullwidth = TRUE; ++ wide_adjust_attr_string(0); ++ break; + case '<': + wide_adjust_attr_string(-1); + break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/ncurses-5.9-20140712.patch new/patches/ncurses-5.9-20140712.patch --- old/patches/ncurses-5.9-20140712.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/ncurses-5.9-20140712.patch 2014-07-14 08:51:32.000000000 +0200 @@ -0,0 +1,278 @@ +# ncurses 5.9 - patch - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 5.9 is at +# ftp.gnu.org:/pub/gnu +# +# Patches for ncurses 5.9 are in the subdirectory +# ftp://invisible-island.net/ncurses/5.9 +# +# ------------------------------------------------------------------------------ +# ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20140712.patch.gz +# patch by Thomas E. Dickey <[email protected]> +# created Sat Jul 12 23:53:41 UTC 2014 +# ------------------------------------------------------------------------------ +# NEWS | 7 ++++++- +# dist.mk | 4 ++-- +# ncurses/curses.priv.h | 8 ++++---- +# ncurses/tty/tty_update.c | 26 +++++++++++++++++--------- +# package/debian-mingw/changelog | 4 ++-- +# package/debian-mingw64/changelog | 4 ++-- +# package/debian/changelog | 4 ++-- +# package/mingw-ncurses.nsi | 4 ++-- +# package/mingw-ncurses.spec | 2 +- +# package/ncurses.spec | 2 +- +# 10 files changed, 39 insertions(+), 26 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.2236 +--- ncurses-5.9-20140705+/NEWS 2014-07-05 20:39:04.000000000 +0000 ++++ ncurses-5.9-20140712/NEWS 2014-07-12 20:24:13.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.2236 2014/07/05 20:39:04 tom Exp $ ++-- $Id: NEWS,v 1.2239 2014/07/12 20:24:13 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20140712 ++ + correct Charable() macro check for A_ALTCHARSET in wide-characters. ++ + build-fix for position-debug code in tty_update.c, to work with or ++ without sp-funcs. ++ + 20140705 + + add w/W toggle to ncurses.c 'B' test, to demonstrate permutation of + video-attributes and colors with double-width character strings. +Index: dist.mk +Prereq: 1.995 +--- ncurses-5.9-20140705+/dist.mk 2014-07-05 18:50:25.000000000 +0000 ++++ ncurses-5.9-20140712/dist.mk 2014-07-12 14:47:53.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.995 2014/07/05 18:50:25 tom Exp $ ++# $Id: dist.mk,v 1.996 2014/07/12 14:47:53 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 5 + NCURSES_MINOR = 9 +-NCURSES_PATCH = 20140705 ++NCURSES_PATCH = 20140712 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/curses.priv.h +Prereq: 1.537 +--- ncurses-5.9-20140705+/ncurses/curses.priv.h 2014-05-03 21:20:12.000000000 +0000 ++++ ncurses-5.9-20140712/ncurses/curses.priv.h 2014-07-12 20:06:11.000000000 +0000 +@@ -34,7 +34,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.537 2014/05/03 21:20:12 tom Exp $ ++ * $Id: curses.priv.h,v 1.538 2014/07/12 20:06:11 tom Exp $ + * + * curses.priv.h + * +@@ -1458,11 +1458,11 @@ + AttrOf(dst) |= (attr_t) (ext + 1) + + #define if_WIDEC(code) code +-#define Charable(ch) ((SP_PARM->_legacy_coding) \ ++#define Charable(ch) (((SP_PARM->_legacy_coding) \ + || (AttrOf(ch) & A_ALTCHARSET) \ +- || (!isWidecExt(ch) && \ ++ || (!isWidecExt(ch))) && \ + (ch).chars[1] == L'\0' && \ +- _nc_is_charable(CharOf(ch)))) ++ _nc_is_charable(CharOf(ch))) + + #define L(ch) L ## ch + #else /* }{ */ +Index: ncurses/tty/tty_update.c +Prereq: 1.277 +--- ncurses-5.9-20140705+/ncurses/tty/tty_update.c 2014-02-01 22:09:27.000000000 +0000 ++++ ncurses-5.9-20140712/ncurses/tty/tty_update.c 2014-07-12 23:16:30.000000000 +0000 +@@ -82,7 +82,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: tty_update.c,v 1.277 2014/02/01 22:09:27 tom Exp $") ++MODULE_ID("$Id: tty_update.c,v 1.279 2014/07/12 23:16:30 tom Exp $") + + /* + * This define controls the line-breakout optimization. Every once in a +@@ -179,7 +179,7 @@ + } + } + #else +-#define position_check(sp, expected_y, expected_x, legend) /* nothing */ ++#define position_check(expected_y, expected_x, legend) /* nothing */ + #endif /* POSITION_DEBUG */ + + /**************************************************************************** +@@ -194,13 +194,17 @@ + TR(TRACE_MOVE, ("GoTo(%p, %d, %d) from (%d, %d)", + (void *) SP_PARM, row, col, SP_PARM->_cursrow, SP_PARM->_curscol)); + +- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo"); ++ position_check(NCURSES_SP_ARGx ++ SP_PARM->_cursrow, ++ SP_PARM->_curscol, "GoTo"); + + TINFO_MVCUR(NCURSES_SP_ARGx + SP_PARM->_cursrow, + SP_PARM->_curscol, + row, col); +- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo2"); ++ position_check(NCURSES_SP_ARGx ++ SP_PARM->_cursrow, ++ SP_PARM->_curscol, "GoTo2"); + } + + static NCURSES_INLINE void +@@ -390,7 +394,7 @@ + + PutAttrChar(NCURSES_SP_ARGx ch); + SP_PARM->_curscol--; +- position_check(SP_PARM, ++ position_check(NCURSES_SP_ARGx + SP_PARM->_cursrow, + SP_PARM->_curscol, + "exit_am_mode"); +@@ -449,7 +453,7 @@ + } else { + SP_PARM->_curscol--; + } +- position_check(SP_PARM, ++ position_check(NCURSES_SP_ARGx + SP_PARM->_cursrow, + SP_PARM->_curscol, + "wrap_cursor"); +@@ -469,7 +473,9 @@ + if (SP_PARM->_curscol >= screen_columns(SP_PARM)) + wrap_cursor(NCURSES_SP_ARG); + +- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "PutChar"); ++ position_check(NCURSES_SP_ARGx ++ SP_PARM->_cursrow, ++ SP_PARM->_curscol, "PutChar"); + } + + /* +@@ -1570,7 +1576,7 @@ + UpdateAttrs(SP_PARM, blank); + NCURSES_PUTP2("clear_screen", clear_screen); + SP_PARM->_cursrow = SP_PARM->_curscol = 0; +- position_check(SP_PARM, ++ position_check(NCURSES_SP_ARGx + SP_PARM->_cursrow, + SP_PARM->_curscol, + "ClearScreen"); +@@ -1660,7 +1666,9 @@ + count--; + } + } +- position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "InsStr"); ++ position_check(NCURSES_SP_ARGx ++ SP_PARM->_cursrow, ++ SP_PARM->_curscol, "InsStr"); + } + + /* +Index: package/debian-mingw/changelog +--- ncurses-5.9-20140705+/package/debian-mingw/changelog 2014-07-05 18:50:25.000000000 +0000 ++++ ncurses-5.9-20140712/package/debian-mingw/changelog 2014-07-12 14:47:53.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140705) unstable; urgency=low ++ncurses6 (5.9-20140712) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 05 Jul 2014 14:50:25 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 12 Jul 2014 10:47:53 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-5.9-20140705+/package/debian-mingw64/changelog 2014-07-05 18:50:25.000000000 +0000 ++++ ncurses-5.9-20140712/package/debian-mingw64/changelog 2014-07-12 14:47:53.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140705) unstable; urgency=low ++ncurses6 (5.9-20140712) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 05 Jul 2014 14:50:25 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 12 Jul 2014 10:47:53 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-5.9-20140705+/package/debian/changelog 2014-07-05 18:50:25.000000000 +0000 ++++ ncurses-5.9-20140712/package/debian/changelog 2014-07-12 14:47:53.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (5.9-20140705) unstable; urgency=low ++ncurses6 (5.9-20140712) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <[email protected]> Sat, 05 Jul 2014 14:50:25 -0400 ++ -- Thomas E. Dickey <[email protected]> Sat, 12 Jul 2014 10:47:53 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.50 +--- ncurses-5.9-20140705+/package/mingw-ncurses.nsi 2014-07-05 18:50:25.000000000 +0000 ++++ ncurses-5.9-20140712/package/mingw-ncurses.nsi 2014-07-12 14:47:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.50 2014/07/05 18:50:25 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.51 2014/07/12 14:47:53 tom Exp $ + + ; TODO add examples + ; TODO bump ABI to 6 +@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "5" + !define VERSION_MINOR "9" + !define VERSION_YYYY "2014" +-!define VERSION_MMDD "0705" ++!define VERSION_MMDD "0712" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-5.9-20140705+/package/mingw-ncurses.spec 2014-07-05 18:50:25.000000000 +0000 ++++ ncurses-5.9-20140712/package/mingw-ncurses.spec 2014-07-12 14:47:53.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 5.9 +-Release: 20140705 ++Release: 20140712 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-5.9-20140705+/package/ncurses.spec 2014-07-05 18:50:25.000000000 +0000 ++++ ncurses-5.9-20140712/package/ncurses.spec 2014-07-12 14:47:53.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 5.9 +-Release: 20140705 ++Release: 20140712 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
