From: Thomas E. Dickey Date: Sun, 23 Mar 2014 00:28:32 +0000 (+0000) Subject: ncurses 5.9 - patch 20140322 X-Git-Tag: v6.0~66 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=e3509ece56de67169d250c040b36309f72e13292 ncurses 5.9 - patch 20140322 + use types from in sample build-scripts for chtype, etc. + modify configure script and curses.h.in to allow the types specified using --with-chtype and related options to be defined in + add terminology entry -TD + add mlterm3 entry, use that as "mlterm" -TD + inherit mlterm-256color from mlterm -TD --- diff --git a/NEWS b/NEWS index 329d3b8a..b8875b55 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2180 2014/03/15 20:39:44 tom Exp $ +-- $Id: NEWS,v 1.2183 2014/03/22 23:03:23 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,14 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20140322 + + use types from in sample build-scripts for chtype, etc. + + modify configure script and curses.h.in to allow the types specified + using --with-chtype and related options to be defined in + + add terminology entry -TD + + add mlterm3 entry, use that as "mlterm" -TD + + inherit mlterm-256color from mlterm -TD + 20140315 + modify _nc_New_TopRow_and_CurrentItem() to ensure that the menu's top-row is adjusted as needed to ensure that the current item is diff --git a/configure b/configure index c8368523..2a9bb7d0 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.577 . +# From configure.in Revision: 1.578 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20121002. # @@ -20937,6 +20937,12 @@ else HAVE_TCGETATTR=0 fi +if test "x$ac_cv_header_stdint_h" = xyes ; then + HAVE_STDINT_H=1 +else + HAVE_STDINT_H=0 +fi + if test "x$ac_cv_header_termio_h" = xyes ; then HAVE_TERMIO_H=1 else @@ -20965,7 +20971,7 @@ fi # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:20968: checking for $ac_word" >&5 +echo "$as_me:20974: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TIC_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -20982,7 +20988,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TIC_PATH="$ac_dir/$ac_word" - echo "$as_me:20985: found $ac_dir/$ac_word" >&5 + echo "$as_me:20991: found $ac_dir/$ac_word" >&5 break fi done @@ -20994,10 +21000,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:20997: result: $TIC_PATH" >&5 + echo "$as_me:21003: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:21000: result: no" >&5 + echo "$as_me:21006: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21005,7 +21011,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:21008: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:21014: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -21031,7 +21037,7 @@ solaris2*) #(vi *-D_XOPEN_SOURCE_EXTENDED*) test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 -echo "${as_me:-configure}:21034: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:21040: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` @@ -21054,6 +21060,18 @@ cat >>confdefs.h <&5 +{ echo "$as_me:21158: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -21313,7 +21331,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:21316: error: ambiguous option: $1 + { { echo "$as_me:21334: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -21332,7 +21350,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:21335: error: unrecognized option: $1 + -*) { { echo "$as_me:21353: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -21443,7 +21461,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:21446: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:21464: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -21752,6 +21770,7 @@ s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t s,@DIRS_TO_MAKE@,$DIRS_TO_MAKE,;t t s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t +s,@HAVE_STDINT_H@,$HAVE_STDINT_H,;t t s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t @@ -21877,7 +21896,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:21880: creating $ac_file" >&5 + { echo "$as_me:21899: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -21895,7 +21914,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:21898: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21917: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21908,7 +21927,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21911: error: cannot find input file: $f" >&5 + { { echo "$as_me:21930: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21924,7 +21943,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:21927: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:21946: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -21933,7 +21952,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:21936: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:21955: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -21970,7 +21989,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:21973: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:21992: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -21981,7 +22000,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:21984: WARNING: Some variables may not be substituted: + { echo "$as_me:22003: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -22030,7 +22049,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:22033: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:22052: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -22041,7 +22060,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:22044: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22063: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -22054,7 +22073,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:22057: error: cannot find input file: $f" >&5 + { { echo "$as_me:22076: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -22112,7 +22131,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:22115: $ac_file is unchanged" >&5 + { echo "$as_me:22134: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -22415,7 +22434,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ cygdll|msysdll|mingw) #(vi test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:22418: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:22437: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index c14ebe79..4f1e37b9 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.577 2013/12/15 00:03:02 tom Exp $ +dnl $Id: configure.in,v 1.578 2014/03/22 22:58:09 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.577 $) +AC_REVISION($Revision: 1.578 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1898,6 +1898,7 @@ CF_ADD_CFLAGS($EXTRA_CFLAGS) ### Define substitutions for header files to avoid name-pollution CF_SUBST_IF(["x$cf_cv_have_tcgetattr" = xyes], HAVE_TCGETATTR, 1, 0) +CF_SUBST_IF(["x$ac_cv_header_stdint_h" = xyes], HAVE_STDINT_H, 1, 0) CF_SUBST_IF(["x$ac_cv_header_termio_h" = xyes], HAVE_TERMIO_H, 1, 0) CF_SUBST_IF(["x$ac_cv_header_termios_h" = xyes], HAVE_TERMIOS_H, 1, 0) @@ -1972,6 +1973,18 @@ case "x$NCURSES_OSPEED" in #(vi esac AC_DEFINE_UNQUOTED(NCURSES_OSPEED_COMPAT,$cf_compatible,[Define to 1 if termcap variable ospeed is short]) +case "x$cf_cv_typeof_chtype" in +xshort|xint|xlong) + cf_cv_typeof_chtype="unsigned $cf_cv_typeof_chtype" + ;; +esac + +case "x$cf_cv_typeof_mmask_t" in +xshort|xint|xlong) + cf_cv_typeof_mmask_t="unsigned $cf_cv_typeof_mmask_t" + ;; +esac + SUB_SCRIPTS= AC_OUTPUT( \ diff --git a/dist.mk b/dist.mk index 2dcbe1cb..9933f6e2 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.976 2014/03/15 16:53:42 tom Exp $ +# $Id: dist.mk,v 1.977 2014/03/22 15:46:30 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20140315 +NCURSES_PATCH = 20140322 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/curses.h.in b/include/curses.h.in index 30da31a5..e9f8d75a 100644 --- a/include/curses.h.in +++ b/include/curses.h.in @@ -32,7 +32,7 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: curses.h.in,v 1.238 2014/03/15 19:04:15 tom Exp $ */ +/* $Id: curses.h.in,v 1.239 2014/03/22 22:57:35 tom Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -59,6 +59,10 @@ */ #include +#if @HAVE_STDINT_H@ +#include +#endif + /* * User-definable tweak to disable the include of . */ @@ -156,8 +160,8 @@ typedef unsigned chtype; typedef unsigned mmask_t; #else -typedef unsigned @cf_cv_typeof_chtype@ chtype; -typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t; +typedef @cf_cv_typeof_chtype@ chtype; +typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif /* diff --git a/misc/terminfo.src b/misc/terminfo.src index 514feca6..c67ccae1 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.484 $ -# $Date: 2014/02/22 21:03:37 $ +# $Revision: 1.486 $ +# $Date: 2014/03/22 18:26:51 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -4752,6 +4752,19 @@ konsole-256color|KDE console window with xterm 256-colors, initc@, use=xterm+256color, use=konsole, #### MLTERM +# http://mlterm.sourceforge.net/ + +mlterm|multi lingual terminal emulator, + use=mlterm, + +# Tested mlterm 3.2.2: +# mlterm 3.x has made changes, but they are not reflected in the included +# mlterm.ti; this entry is based on testing with tack and vttest -TD +mlterm3|multi lingual terminal emulator, + kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, + use=xterm+app, use=xterm+pcf0, use=xterm+pcc2, + use=xterm+pce2, use=mlterm2, + # This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD # # It is nominally a vt102 emulator, with features borrowed from rxvt and @@ -4771,7 +4784,7 @@ konsole-256color|KDE console window with xterm 256-colors, # control/alt kf1 to kf12 \E[11;7~ to \E[24;7~ # control/shift/alt kf1 to kf12 \E[11;8~ to \E[24;8~ # -mlterm|multi lingual terminal emulator, +mlterm2|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, @@ -4815,7 +4828,7 @@ mlterm+pcfkeys|fragment for PC-style fkeys, kUP4=\EO1;4A, kUP5=\EO1;5A, kUP6=\EO1;6A, kUP7=\EO1;7A, mlterm-256color|mlterm 3.0 with xterm 256-colors, - use=xterm+256color, use=rxvt, + use=xterm+256color, use=mlterm, #### RXVT # From: Thomas Dickey 04 Oct 1997 @@ -5438,6 +5451,66 @@ terminator|Terminator no line wrap, smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=xterm+sl-twm, +#### TERMINOLOGY +# http://enlightenment.org +# +# Tested terminology-0.3.0, using tack and vttest. This is not a vt100 +# emulator, nor is it compatible with xterm, but it uses a few features from +# both -TD +# +# General comments: +# cursor does not fill on focus +# there are pervasive problems with clearing/erasing parts of the screen +# resizing the window causes it to stop listening to the keyboard +# tack - +# doesn't understand vt100 CPR needed for resize +# no CBT +# no cvvis +# has invis +# no blink +# uses bce model for colors, but (see below) fails the vttest screens +# has partial support for 256color feature. +# tack cursor-keys: +# ctrl+shift (ignored) +# 2 shift +# shift-alt modifier -> shift (2) +# 3 alt +# 4 +# 5 ctrl +# tack modifiers do not work for fkeys +# ctrl + khome/kend works - none of the other modifiers do +# vttest - +# spits lots of messages from termptyesc.c especially in vttest. +# no 132-column mode +# fails menu 1, 2 (definitely not vt100-compatible) +# primary and +# secondary report says (perhaps... vt420): \E[>41;285;0c +# CHA, HPR, VPA, CNL, CPL work +# BCE with ED/EL - fail +# BCE with ECH/indexing - fail +# SD/SU work +# unlike teken, background light/dark works +# can set title +# X10 and Normal mouse work +# Any-event mouse works +# Mouse button-event works +terminology|EFL-based terminal emulator, + ccc@, mc5i@, xon@, + blink@, ed@, el@, el1@, initc@, invis=\E[8m, kLFT=\E[1;2D, + kRIT=\E[1;2C, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, + kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + kind=\E[1;2B, kri=\E[1;2A, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<2>, + vpa=\E[%i%p1%dd, kDC3=\E[3;3~, kDC4=\E[3;4~, + kDC5=\E[3;5~, kDC6=\E[3;6~, kDC7=\E[3;7~, kDN=\E[1;2B, + kDN3=\E[1;3B, kDN4=\E[1;4B, kDN5=\E[1;5B, kDN6=\E[1;6B, + kDN7=\E[1;7B, kEND5=\E[1;5F, kHOM5=\E[1;5H, + kLFT3=\E[1;3D, kLFT4=\E[1;4D, kLFT5=\E[1;5D, + kLFT6=\E[1;6D, kLFT7=\E[1;7D, kRIT3=\E[1;3C, + kRIT4=\E[1;4C, kRIT5=\E[1;5C, kRIT6=\E[1;6C, + kRIT7=\E[1;7C, kUP=\E[1;2A, use=vt100, + use=xterm+256color, + ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS # @@ -23126,4 +23199,9 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * add teken entry to show actual properties of FreeBSD's "xterm" # console -TD # +# 2014-03-22 +# * add terminology entry -TD +# * add mlterm3 entry, use that as "mlterm" -TD +# * inherit mlterm-256color from mlterm -TD +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index cff4790c..52c57f98 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140315) unstable; urgency=low +ncurses6 (5.9-20140322) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 15 Mar 2014 12:53:42 -0400 + -- Thomas E. Dickey Sat, 22 Mar 2014 11:46:30 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules index 35dacc04..ba40251c 100644 --- a/package/debian-mingw/rules +++ b/package/debian-mingw/rules @@ -40,6 +40,8 @@ CONFIG_OPTIONS = \ --enable-warnings \ --enable-widec \ --verbose \ + --with-chtype=uint32_t \ + --with-mmask_t=uint32_t \ --with-cxx-shared \ --with-develop \ --with-fallbacks=unknown,rxvt \ diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index cff4790c..52c57f98 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140315) unstable; urgency=low +ncurses6 (5.9-20140322) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 15 Mar 2014 12:53:42 -0400 + -- Thomas E. Dickey Sat, 22 Mar 2014 11:46:30 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules index 864ff654..da793d92 100644 --- a/package/debian-mingw64/rules +++ b/package/debian-mingw64/rules @@ -40,6 +40,8 @@ CONFIG_OPTIONS = \ --enable-warnings \ --enable-widec \ --verbose \ + --with-chtype=uint32_t \ + --with-mmask_t=uint32_t \ --with-cxx-shared \ --with-develop \ --with-fallbacks=unknown,rxvt \ diff --git a/package/debian/changelog b/package/debian/changelog index c0f99aed..a10c782e 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140315) unstable; urgency=low +ncurses6 (5.9-20140322) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 15 Mar 2014 12:53:42 -0400 + -- Thomas E. Dickey Sat, 22 Mar 2014 11:46:30 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/debian/rules b/package/debian/rules index e4cb1090..c8b96d13 100644 --- a/package/debian/rules +++ b/package/debian/rules @@ -56,6 +56,8 @@ configure-stamp: --enable-warnings \ --enable-widec \ --verbose \ + --with-chtype=uint32_t \ + --with-mmask_t=uint32_t \ --with-develop \ --with-shared \ --with-termlib \ diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index e78e4e74..a7099fa1 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.31 2014/03/15 16:53:42 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.32 2014/03/22 15:46:30 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 "0315" +!define VERSION_MMDD "0322" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index cd8ad641..f16839f6 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 5.9 -Release: 20140315 +Release: 20140322 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 9bac0f44..2322b01d 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 5.9 -Release: 20140315 +Release: 20140322 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz @@ -50,6 +50,8 @@ RPATH_LIST=../lib:%{_prefix}/lib \ --enable-warnings \ --enable-widec \ --verbose \ + --with-chtype=uint32_t \ + --with-mmask_t=uint32_t \ --with-develop \ --with-shared \ --with-termlib \