Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2012-12-19 11:15:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2012-11-20 10:40:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2012-12-19 11:15:09.000000000 +0100 @@ -1,0 +2,42 @@ +Mon Dec 17 10:10:22 UTC 2012 - [email protected] + +- Add ncurses patch 5.9.20121215 + + fix several warnings from clang 3.1 --analyze, includes correcting + a null-pointer check in _nc_mvcur_resume. + + correct display of double-width characters with MinGW port (report + by Erwin Waterlander). + + replace MinGW's wcrtomb(), fixing a problem with _nc_viscbuf + + correct check for 8-bit value in _nc_insert_ch(). + + remove dead code in progs/tset.c, test/linedata.h + + add null-pointer checks in lib_tracemse.c, panel.priv.h, and some + test-programs. +- Add ncurses patch 5.9.20121208 + + modify test/knight.c to show the number of choices possible for + each position in automove option, e.g., to allow user to follow + Warnsdorff's rule to solve the puzzle. + + remove a few redundant checks. + + check return value from remove/unlink in tic. + + fix a null dereference in c++/cursesw.cc + + fix two instances of uninitialized variables when configuring for the + terminal driver. + + correct scope of variable used in SetSafeOutcWrapper macro. + + set umask when calling mkstemp in tic. + + initialize wbkgrndset() temporary variable when extended-colors are + used. +- Add ncurses patch 5.9.20121201 + + also replace MinGW's wctomb(), fixing a problem with setcchar(). +- Add ncurses patch 5.9.20121124 + + correct order of color initialization versus display in some of the + test-programs, e.g., test_addstr.c +- Add tack patch 1.07.20120916 + * tack.c: ensure that $TERM is set and is not too large + * edit.c: build-fix for g++ + * color.c: + corrected check for ncv (no_color_video), which did not handle + the case when all video attributes should work. + * color.c: + add/use init_palette() and reset_palette() to restore the 0-7 + ANSI colors to sane values after running the change-colors tests. + * charset.c: add a test for "eslok" capability + +------------------------------------------------------------------- Old: ---- tack-1.07-20120303.tar.bz2 New: ---- tack-1.07-20120916.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.AGaYjU/_old 2012-12-19 11:15:19.000000000 +0100 +++ /var/tmp/diff_new_pack.AGaYjU/_new 2012-12-19 11:15:19.000000000 +0100 @@ -42,7 +42,7 @@ Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc -Source5: tack-1.07-20120303.tar.bz2 +Source5: tack-1.07-20120916.tar.bz2 Source6: edit.sed Source7: baselibs.conf Patch0: ncurses-%{version}.dif ++++++ ncurses-5.9-patches.tar.bz2 ++++++ ++++ 3162 lines of diff (skipped) ++++++ tack-1.07-20120303.tar.bz2 -> tack-1.07-20120916.tar.bz2 ++++++ ++++ 7533 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/CHANGES new/tack-1.07-20120916/CHANGES --- old/tack-1.07-20120303/CHANGES 2012-03-04 00:44:25.000000000 +0100 +++ new/tack-1.07-20120916/CHANGES 2012-09-17 01:47:41.000000000 +0200 @@ -1,3 +1,76 @@ +2012-09-16 Thomas E. Dickey <[email protected]> + + * configure, configure.in: + add check for long filenames to define HAVE_LONG_FILE_NAMES, needed to choose + larger limit for MAX_ALIAS (the actual length of a terminal description's name) + + * edit.c: fix Solaris compiler warning + + * tack.c: ensure that $TERM is set and is not too large + + * configure, configure.in, aclocal.m4: + add --disable-rpath-hack to simplify ports to Solaris + + * edit.c: build-fix for g++ + + * configure, aclocal.m4: resync with my-autoconf: + - add CF_CLANG_COMPILER to tune strict warnings for clang + - modify CF_CURSES_LIBS to check for tinfo library + - modify CF_PATH_SYNTAX to allow for variables such as ${datadir} + + * configure, configure.in: remove unused checks for header-files + +2012-09-16 Adrian.Bunk + + * configure, configure.in, aclocal.m4, ncurses_tst.hin, sysdep.c, tack.h, Makefile.in: + - remove fallback definitions for "const" and "inline" from ncurses_tst.hin + - remove unused AC_HEADER_TIME configure check + - remove the obsolete CF_SYS_TIME_SELECT configure check + - change the autoconf prerequisite to "2.52" (noting that the patched 2.52 is + actually required) + - remove configure-checks for AWK and LN_S variables + +2012-09-16 Thomas E. Dickey <[email protected]> + + * Makefile.in: datarootdir is now needed for mandir + remove unused includedir and datadir + + * package/debian/changelog, package/tack.spec, tack.h: bump + + * configure: regen (will support --datarootdir with this) + +2012-04-29 Thomas E. Dickey <[email protected]> + + * package/debian/changelog, package/tack.spec, tack.h: bump + + * configure: regen + + * aclocal.m4: add CF_MAKE_DOCS + update CF_GCC_WARNINGS for old gcc's whose pointer-arithmetic warnings were bogus. + + * configure.in: + use CF_MAKE_DOCS rule in makefile for generating html/pdf/txt versions of manpages. + + * color.c: + corrected check for ncv (no_color_video), which did not handle the case when + all video attributes should work. + + * color.c: + add/use init_palette() and reset_palette() to restore the 0-7 ANSI colors + to sane values after running the change-colors tests. Without some specific + knowledge of the terminal (terminfo does not provide this), it is not possible + to restore the original colors. + +2012-04-28 Thomas E. Dickey <[email protected]> + + * charset.c: add a test for "eslok" capability + + * configure: regen + + * configure.in: + the last change could produce unbalanced quote with certain shells - check + for that and repair it (report by Samuel Bronson). + 2012-03-03 Thomas E. Dickey <[email protected]> * fun.c: gcc warning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/charset.c new/tack-1.07-20120916/charset.c --- old/tack-1.07-20120303/charset.c 2010-09-04 00:13:47.000000000 +0200 +++ new/tack-1.07-20120916/charset.c 2012-04-29 02:14:39.000000000 +0200 @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: charset.c,v 1.13 2010/09/03 22:13:47 tom Exp $") +MODULE_ID("$Id: charset.c,v 1.14 2012/04/29 00:14:39 tom Exp $") /* Menu definitions for alternate character set and SGR tests. @@ -33,6 +33,7 @@ static void charset_cvvis(struct test_list *t, int *state, int *ch); static void charset_cnorm(struct test_list *t, int *state, int *ch); static void charset_hs(struct test_list *t, int *state, int *ch); +static void charset_eslok(struct test_list *t, int *state, int *ch); static void charset_status(struct test_list *t, int *state, int *ch); static void charset_dsl(struct test_list *t, int *state, int *ch); static void charset_enacs(struct test_list *t, int *state, int *ch); @@ -50,6 +51,7 @@ {MENU_NEXT, 3, "cnorm", 0, 0, charset_cnorm, 0}, {MENU_NEXT, 3, "hs", 0, 0, charset_hs, 0}, {MENU_NEXT, 3, "tsl) (fsl) (wsl", "hs", 0, charset_status, 0}, + {MENU_NEXT, 3, "eslok", "hs", 0, charset_eslok, 0}, {MENU_NEXT, 3, "dsl", "hs", 0, charset_dsl, 0}, {MENU_NEXT, 0, "acsc) (enacs) (smacs) (rmacs", 0, 0, charset_enacs, 0}, {MENU_NEXT, 0, "smacs) (rmacs", 0, 0, charset_smacs, 0}, @@ -173,6 +175,51 @@ generic_done_message(t, state, ch); } +/* +** charset_eslok(test_list, status, ch) +** +** (eslok) test Status line with cursor addressing and erasure. +*/ +static void +charset_eslok( + struct test_list *t, + int *state, + int *ch) +{ + int i, max; + char *s; + static char m[] = "*** status line *** 123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789."; + + if (has_status_line != 1) { + return; + } + if (status_line_esc_ok != 1) { + ptextln("(eslok) status_line_esc_ok not present"); + return; + } + put_clear(); + max = width_status_line == -1 ? columns : width_status_line; + sprintf(temp, "Terminal has status line of %d characters", max); + ptextln(temp); + + put_str("This line s"); + s = TPARM_1(to_status_line, 10); + tc_putp(s); + for (i = 10; i < max; i++) + putchp(m[i]); + putchp('\r'); + for (i = 0; i < 10; i++) + putchp(m[i]); + if (cursor_address) { + tputs(TPARM_2(cursor_address, 4, 4), lines, tc_putch); + put_str("STATUS"); + } + tc_putp(from_status_line); + putln("hould not be broken."); + ptextln("If the previous line is not a complete sentence then the preceding test failed, or (eslok) status_line_esc_ok is incorrect. The status line should have \"STATUS\"."); + generic_done_message(t, state, ch); +} + /* ** charset_dsl(test_list, status, ch) ** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/color.c new/tack-1.07-20120916/color.c --- old/tack-1.07-20120303/color.c 2011-05-01 21:46:36.000000000 +0200 +++ new/tack-1.07-20120916/color.c 2012-04-29 16:09:45.000000000 +0200 @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: color.c,v 1.9 2011/05/01 19:46:36 tom Exp $") +MODULE_ID("$Id: color.c,v 1.11 2012/04/29 14:09:45 tom Exp $") /* * Color terminal tests. Has only one entry point: test_color(). @@ -35,14 +35,14 @@ static void color_bce(struct test_list *, int *, int *); /* *INDENT-OFF* */ struct test_list color_test_list[] = { - {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, - {MENU_NEXT, 2, "colors) (pairs", 0, 0, color_check, 0}, - {MENU_NEXT, 12, "setf) (setb) (scp", 0, 0, color_setf, 0}, - {MENU_NEXT, 24, "op", 0, 0, color_matrix, 0}, - {MENU_NEXT, 16, "ncv", 0, 0, color_ncv, 0}, - {MENU_NEXT, 0, "bce", 0, 0, color_bce, 0}, + {0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu}, + {MENU_NEXT, 2, "colors) (pairs", 0, 0, color_check, 0}, + {MENU_NEXT, 12, "setf) (setb) (scp", 0, 0, color_setf, 0}, + {MENU_NEXT, 24, "op", 0, 0, color_matrix, 0}, + {MENU_NEXT, 16, "ncv", 0, 0, color_ncv, 0}, + {MENU_NEXT, 0, "bce", 0, 0, color_bce, 0}, {MENU_NEXT | MENU_CLEAR, 0, "ccc) (initc) (initp", "hls op oc", 0, color_ccc, 0}, - {MENU_LAST, 0, 0, 0, 0, 0, 0} + {MENU_LAST, 0, 0, 0, 0, 0, 0} }; /* *INDENT-ON* */ @@ -63,26 +63,23 @@ int r, g, b; int h, l, s; }; - +/* *INDENT-OFF* */ static struct color_table def_colors[8] = { - {"black ", COLOR_BLACK, 0, 0, 0, 0, 0, 0}, - {"blue ", COLOR_BLUE, 0, 0, 1000, 330, 50, 100}, - {"green ", COLOR_GREEN, 0, 1000, 0, 240, 50, 100}, - {"cyan ", COLOR_CYAN, 0, 1000, 1000, 300, 50, 100}, - {"red ", COLOR_RED, 1000, 0, 0, 120, 50, 100}, - {"magenta", COLOR_MAGENTA, 1000, 0, 1000, 60, 50, 100}, - {"yellow ", COLOR_YELLOW, 1000, 1000, 0, 180, 50, 100}, - {"white ", COLOR_WHITE, 1000, 1000, 1000, 0, 100, 0} + {"black ", COLOR_BLACK, 0, 0, 0, 0, 0, 0}, + {"blue ", COLOR_BLUE, 0, 0, 1000, 330, 50, 100}, + {"green ", COLOR_GREEN, 0, 1000, 0, 240, 50, 100}, + {"cyan ", COLOR_CYAN, 0, 1000, 1000, 300, 50, 100}, + {"red ", COLOR_RED, 1000, 0, 0, 120, 50, 100}, + {"magenta", COLOR_MAGENTA, 1000, 0, 1000, 60, 50, 100}, + {"yellow ", COLOR_YELLOW, 1000, 1000, 0, 180, 50, 100}, + {"white ", COLOR_WHITE, 1000, 1000, 1000, 0, 100, 0} }; +/* *INDENT-ON* */ #define MAX_PAIR 256 -static int fg_color[MAX_PAIR] = -{COLOR_BLACK, COLOR_BLUE, COLOR_GREEN, - COLOR_CYAN, COLOR_RED, COLOR_MAGENTA, COLOR_YELLOW, COLOR_WHITE}; -static int bg_color[MAX_PAIR] = -{COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, - COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, COLOR_BLACK}; +static int fg_color[MAX_PAIR]; +static int bg_color[MAX_PAIR]; static int pairs_used = 8; static int a_bright_color, bright_value; static int cookie_monster, color_step, colors_per_line; @@ -275,6 +272,40 @@ } } +/* + * Initialize data used for palette; do not modify the terminal. + */ +static void +init_palette(void) +{ + static const int dft_fg_color[] = + { + COLOR_BLACK, + COLOR_BLUE, + COLOR_GREEN, + COLOR_CYAN, + COLOR_RED, + COLOR_MAGENTA, + COLOR_YELLOW, + COLOR_WHITE + }; + int n; + + pairs_used = 0; + R = G = B = 0; + + a_bright_color = 0; + bright_value = 0; + cookie_monster = 0; + color_step = 0; + colors_per_line = 0; + + for (n = 0; n < MAX_PAIR; ++n) { + fg_color[n] = (n < 8) ? dft_fg_color[n] : COLOR_BLACK; + bg_color[n] = COLOR_BLACK; + } +} + static int load_palette(int n) { /* load the color palette */ @@ -317,6 +348,33 @@ } } +static void +reset_palette(void) +{ + int n; + + reset_colors(); + init_palette(); + if (set_a_foreground || set_foreground) { + /* + * Reset the colors to a usable ANSI palette. Aside from xterm, none + * of the other terminals have a way to determine what the original + * colors actually were. + */ + for (n = 0; n < 8; ++n) { + if (n < max_colors) { + send_color(n, + (n & 1) ? 800 : 0, + (n & 2) ? 800 : 0, + (n & 4) ? 800 : 0); + } + } + } else { + /* this is only a guess - revisit if we ever find a working terminal */ + send_pair(0, 1000, 1000, 1000, 0, 0, 0); + } +} + static int rainbow(int n) { /* print the programmable color display */ @@ -648,10 +706,6 @@ { int i; - if (no_color_video == -1) { - /* I have no idea what this means */ - return; - } sprintf(temp, "According to no_color_video (ncv) which is %d, the following attributes should work correctly with color.", no_color_video); @@ -660,11 +714,13 @@ set_attr(0); ncv_display(0); for (i = 1; i <= 9; i++) { - if (((no_color_video >> (mode_map[i] - 1)) & 1) == 0) { + if (no_color_video < 0 || + ((no_color_video >> (mode_map[i] - 1)) & 1) == 0) { ncv_display(mode_map[i]); } } - if (no_color_video & 0x3ff) { + if (no_color_video > 0 && + (no_color_video & 0x3ff) != 0) { ptextln("\nThe following attributes should not work correctly with color. (ncv)\n"); for (i = 1; i <= 9; i++) { if ((no_color_video >> (mode_map[i] - 1)) & 1) { @@ -747,12 +803,11 @@ } generic_done_message(t, state, ch); if (*ch != 0 && *ch != 'n') { - reset_colors(); + reset_palette(); return; } - pairs_used = 0; - cookie_monster = 0; + init_palette(); if (magic_cookie_glitch > 0) { cookie_monster = ((set_a_foreground || set_foreground) @@ -771,12 +826,9 @@ } else if (colors_per_line > j) { colors_per_line = (j / i) * i; } - sprintf(temp, "RGB color step %d, cookies %d", color_step, - cookie_monster); + sprintf(temp, "RGB color step %d, cookies %d", color_step, cookie_monster); ptextln(temp); - R = G = B = 0; - pairs_used = 0; for (;;) { if (rainbow(colors_per_line)) { break; @@ -784,10 +836,10 @@ } generic_done_message(t, state, ch); if (*ch != 0 && *ch != 'n') { - reset_colors(); + reset_palette(); return; } dump_colors(); - reset_colors(); + reset_palette(); generic_done_message(t, state, ch); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/configure.in new/tack-1.07-20120916/configure.in --- old/tack-1.07-20120303/configure.in 2012-03-03 22:39:39.000000000 +0100 +++ new/tack-1.07-20120916/configure.in 2012-09-17 01:44:45.000000000 +0200 @@ -28,14 +28,14 @@ dnl dnl Author: Thomas E. Dickey 2007-on dnl -dnl $Id: configure.in,v 1.18 2012/03/03 21:39:39 tom Exp $ +dnl $Id: configure.in,v 1.24 2012/09/16 23:44:45 tom Exp $ dnl This is a simple configuration-script for tack which makes it simpler to dnl build outside the ncurses tree (provided that ncurses was configured using dnl the --with-ticlib option). dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl --------------------------------------------------------------------------- -AC_PREREQ(2.13.20020210) +AC_PREREQ(2.52) AC_INIT(tack.c) AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin) @@ -46,7 +46,6 @@ AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP -AC_PROG_LN_S CF_PROG_INSTALL CF_PROG_LINT @@ -88,6 +87,7 @@ AC_EXEEXT AC_OBJEXT +AC_SYS_LONG_FILE_NAMES CF_ANSI_CC_REQD CF_DISABLE_ECHO @@ -101,7 +101,6 @@ CF_XOPEN_SOURCE ### Checks for external-data -CF_ERRNO CF_LINK_DATAONLY dnl --------------------------------------------------------------------------- @@ -177,6 +176,7 @@ fi +CF_DISABLE_RPATH_HACK CF_DISABLE_LEAKS # look for curses-related headers @@ -187,29 +187,17 @@ term_entry.h \ ) -AC_TYPE_SIGNAL - -AC_STDC_HEADERS -AC_HEADER_TIME AC_CHECK_HEADERS( \ -getopt.h \ -locale.h \ -stdarg.h \ -sys/ioctl.h \ sys/select.h \ sys/time.h \ -termios.h \ -unistd.h \ ) AC_CHECK_FUNCS( \ _nc_free_tic \ gettimeofday \ select \ -strstr \ ) -CF_SYS_TIME_SELECT CF_SIG_ATOMIC_T TICS_LIBS="$LIBS" @@ -239,7 +227,8 @@ $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) $N.c TEST_EOF done +CF_MAKE_DOCS(tack,1) ],[], -[set | sed -e s%=%=\'% -e s%\$%\'% -e s%\'\'%\'%g |fgrep _CC= >>$CONFIG_STATUS +[set |fgrep _CC= |sed -e s%=%=\'% -e s%\$%\'% -e s%\'\'%\'%g -e s%=\'\$%=\'\'% >>$CONFIG_STATUS cat]) # vi:ts=4 sw=4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/edit.c new/tack-1.07-20120916/edit.c --- old/tack-1.07-20120303/edit.c 2012-03-03 17:03:23.000000000 +0100 +++ new/tack-1.07-20120916/edit.c 2012-09-17 00:23:46.000000000 +0200 @@ -23,7 +23,7 @@ #include <time.h> #include <tic.h> -MODULE_ID("$Id: edit.c,v 1.17 2012/03/03 16:03:23 tom Exp $") +MODULE_ID("$Id: edit.c,v 1.19 2012/09/16 22:23:46 tom Exp $") /* * Terminfo edit features @@ -166,7 +166,7 @@ send_info_string(buf, ch); } } - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { if (CUR Strings[i]) { sprintf(buf, "%s=%s", STR_NAME(i), print_expand(CUR Strings[i])); @@ -246,7 +246,7 @@ save_info_string(buf, fp); } } - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { if (CUR Strings[i]) { sprintf(buf, "%s=%s", STR_NAME(i), _nc_tic_expand(CUR Strings[i], TRUE, TRUE)); @@ -410,7 +410,7 @@ int i; if (value) { - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { if (CUR Strings[i] == value) { return i; } @@ -466,7 +466,7 @@ ptextln(temp); } } - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { a = original_term.Strings[i] ? original_term.Strings[i] : ""; b = CUR Strings[i] ? CUR Strings[i] : ""; if (strcmp(a, b)) { @@ -509,7 +509,7 @@ return TRUE; } } - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { a = original_term.Strings[i] ? original_term.Strings[i] : ""; b = CUR Strings[i] ? CUR Strings[i] : ""; if (strcmp(a, b)) { @@ -652,7 +652,7 @@ const char *names, const char *cap) { - char *s; + const char *s; int c, l, t; if (names) { @@ -702,7 +702,7 @@ nx[nc++] = numnames[i]; } } - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { if (flag_strings[i] & flag) { nx[nc++] = STR_NAME(i); } @@ -762,7 +762,7 @@ ptext(temp); } } - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { if (flag_strings[i] == 0 && CUR Strings[i]) { sprintf(temp, "%s ", STR_NAME(i)); ptext(temp); @@ -794,7 +794,7 @@ original_term.Numbers[i] = CUR Numbers[i]; } /* scan for labels */ - for (i = lc = 0; i < MAX_STRINGS; i++) { + for (i = lc = 0; i < (int) MAX_STRINGS; i++) { original_term.Strings[i] = CUR Strings[i]; if (strncmp(STR_NAME(i), "lf", (size_t) 2) == 0) { flag_strings[i] |= FLAG_LABEL; @@ -804,7 +804,7 @@ } } /* scan for function keys */ - for (i = 0; i < MAX_STRINGS; i++) { + for (i = 0; i < (int) MAX_STRINGS; i++) { const char *this_name = STR_NAME(i); if ((this_name[0] == 'k') && strcmp(this_name, "kmous")) { flag_strings[i] |= FLAG_FUNCTION_KEY; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/ncurses_tst.hin new/tack-1.07-20120916/ncurses_tst.hin --- old/tack-1.07-20120303/ncurses_tst.hin 1998-02-11 13:14:05.000000000 +0100 +++ new/tack-1.07-20120916/ncurses_tst.hin 2012-09-16 17:16:02.000000000 +0200 @@ -30,7 +30,7 @@ * Author: Thomas E. Dickey <[email protected]> 1998 * ****************************************************************************/ /* - * $Id: ncurses_tst.hin,v 1.1 1998/02/11 12:14:05 tom Exp $ + * $Id: ncurses_tst.hin,v 1.2 2012/09/16 15:16:02 Adrian.Bunk Exp $ * * This is a template-file used to generate the "ncurses_cfg.h" file. * @@ -42,15 +42,4 @@ #define NC_CONFIG_H @DEFS@ - /* The C compiler may not treat these properly but C++ has to */ -#ifdef __cplusplus -#undef const -#undef inline -#else -#if defined(lint) || defined(TRACE) -#undef inline -#define inline /* nothing */ -#endif -#endif - #endif /* NC_CONFIG_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/package/debian/changelog new/tack-1.07-20120916/package/debian/changelog --- old/tack-1.07-20120303/package/debian/changelog 2012-03-02 11:56:19.000000000 +0100 +++ new/tack-1.07-20120916/package/debian/changelog 2012-09-16 16:01:27.000000000 +0200 @@ -1,3 +1,19 @@ +tack (1.07-20120916) unstable; urgency=low + + * improvements for configure script + + -- Thomas E. Dickey <[email protected]> Sun, 16 Sep 2012 10:01:00 -0400 + +tack (1.07-20120429) unstable; urgency=low + + * add makefile rules for generated documentation. + * corrected ncv test to handle the default case. + * improve cleanup after color palette tests. + * add test for eslok. + * portability-fix for configure script. + + -- Thomas E. Dickey <[email protected]> Sun, 29 Apr 2012 11:17:02 -0400 + tack (1.07-20120303) unstable; urgency=low * code cleanup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/package/tack.spec new/tack-1.07-20120916/package/tack.spec --- old/tack-1.07-20120303/package/tack.spec 2012-03-02 11:55:45.000000000 +0100 +++ new/tack-1.07-20120916/package/tack.spec 2012-09-16 16:00:29.000000000 +0200 @@ -1,8 +1,8 @@ Summary: tack - terminfo action checker %define AppProgram tack %define AppVersion 1.07 -%define AppRelease 20120303 -# $XTermId: tack.spec,v 1.5 2012/03/02 10:55:45 tom Exp $ +%define AppRelease 20120916 +# $XTermId: tack.spec,v 1.7 2012/09/16 14:00:29 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/sysdep.c new/tack-1.07-20120916/sysdep.c --- old/tack-1.07-20120303/sysdep.c 2012-03-03 17:22:56.000000000 +0100 +++ new/tack-1.07-20120916/sysdep.c 2012-09-16 17:16:00.000000000 +0200 @@ -36,7 +36,7 @@ #endif #if HAVE_SELECT -#if HAVE_SYS_TIME_H && HAVE_SYS_TIME_SELECT +#if HAVE_SYS_TIME_H #include <sys/time.h> #endif #if HAVE_SYS_SELECT_H @@ -44,11 +44,7 @@ #endif #endif -MODULE_ID("$Id: sysdep.c,v 1.22 2012/03/03 16:22:56 tom Exp $") - -#if DECL_ERRNO -extern int errno; -#endif +MODULE_ID("$Id: sysdep.c,v 1.23 2012/09/16 15:16:00 Adrian.Bunk Exp $") #ifdef TERMIOS #define PUT_TTY(fd, buf) tcsetattr(fd, TCSAFLUSH, buf) @@ -445,7 +441,7 @@ * * onintr always exits fatally */ -static RETSIGTYPE +static void onintr(int sig GCC_UNUSED) { ignoresig(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/tack.c new/tack-1.07-20120916/tack.c --- old/tack-1.07-20120303/tack.c 2012-03-03 16:15:20.000000000 +0100 +++ new/tack-1.07-20120916/tack.c 2012-09-17 00:12:40.000000000 +0200 @@ -20,8 +20,9 @@ */ #include <tack.h> +#include <tic.h> -MODULE_ID("$Id: tack.c,v 1.13 2012/03/03 15:15:20 tom Exp $") +MODULE_ID("$Id: tack.c,v 1.14 2012/09/16 22:12:40 tom Exp $") /* This program is designed to test terminfo, not curses. Therefore @@ -608,7 +609,11 @@ term_variable = argv[i]; } } - (void) strcpy(tty_basename, term_variable); + sprintf(tty_basename, "%.*s", + MAX_ALIAS, + (term_variable + ? term_variable + : "unknown")); curses_setup(argv[0]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120303/tack.h new/tack-1.07-20120916/tack.h --- old/tack-1.07-20120303/tack.h 2012-03-03 17:02:55.000000000 +0100 +++ new/tack-1.07-20120916/tack.h 2012-09-16 17:16:00.000000000 +0200 @@ -19,7 +19,7 @@ ** Boston, MA 02110-1301, USA */ -/* $Id: tack.h,v 1.32 2012/03/03 16:02:55 tom Exp $ */ +/* $Id: tack.h,v 1.35 2012/09/16 15:16:00 Adrian.Bunk Exp $ */ #ifndef NCURSES_TACK_H_incl #define NCURSES_TACK_H_incl 1 @@ -28,28 +28,22 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 7 -#define PATCH_VERSION 20120303 +#define PATCH_VERSION 20120916 #ifdef HAVE_CONFIG_H #include <ncurses_cfg.h> #else -#define RETSIGTYPE void #define GCC_UNUSED /*nothing */ #define GCC_NORETURN /*nothing */ #define HAVE_GETTIMEOFDAY 1 #define HAVE_SELECT 1 #define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_TIME_SELECT 1 #endif #ifndef BROKEN_LINKER #define BROKEN_LINKER 0 #endif -#ifndef DECL_ERRNO -#define DECL_ERRNO 0 -#endif - #ifndef HAVE_LONG_FILE_NAMES #define HAVE_LONG_FILE_NAMES 0 #endif @@ -93,11 +87,6 @@ #define IGNORE_RC(func) (void) func #endif /* gcc workarounds */ -#if !HAVE_STRSTR -extern char *_nc_strstr(const char *, const char *); -#define strstr(h,n) _nc_strstr(h,n) -#endif - #if NO_LEAKS && defined(HAVE__NC_FREE_TIC) extern void _nc_free_tic(int) GCC_NORETURN; extern void tack_edit_leaks(void); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
