ncurses 6.0 - patch 20171111

+ add "op" to xterm+256setaf -TD
+ reviewed terminology 1.0.0 -TD
+ reviewed st 0.7 -TD
+ suppress debug-package for ncurses-examples rpm build.

diff --git a/NEWS b/NEWS
index 16890bade192361d4520bcd08e13a282c9fd9c17..401484d69041ea682e9b7357b71a4cb59a0665c9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.2995 2017/10/30 22:20:57 tom Exp $
+-- $Id: NEWS,v 1.2998 2017/11/11 20:35:53 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,12 @@ 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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20171111
+       + add "op" to xterm+256setaf -TD
+       + reviewed terminology 1.0.0 -TD
+       + reviewed st 0.7 -TD
+       + suppress debug-package for ncurses-examples rpm build.
+

 20171104
        + check for interrupt in color-pair initialization of dots_curses.c,
          dots_xcurses.c
 20171104
        + check for interrupt in color-pair initialization of dots_curses.c,
          dots_xcurses.c

diff --git a/VERSION b/VERSION
index 39e14246bc7da89feb3ace1ee9802d30e4637ed7..1407c7b8f3c36a42e4c6736bb0dc6eb1b98021c5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20171104
+5:0:9  6.0     20171111

diff --git a/dist.mk b/dist.mk
index f027962feffd3ec791ae03092eda5ffe487f5926..1bd77efcefea8ab64433ce9c548d76401ca889b5 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1190 2017/10/29 16:32:06 tom Exp $
+# $Id: dist.mk,v 1.1191 2017/11/05 11:30:20 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # 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 = 6
 NCURSES_MINOR = 0
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0

-NCURSES_PATCH = 20171104
+NCURSES_PATCH = 20171111

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/misc/terminfo.src b/misc/terminfo.src
index ae734f6f0478846ef0c4d91f1eac336cd7649ca7..e3a6079e8f83883891bcf53e946a1f6fd1ce0143 100644 (file)
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #

-#      $Revision: 1.617 $
-#      $Date: 2017/08/26 21:07:47 $
+#      $Revision: 1.623 $
+#      $Date: 2017/11/11 20:24:40 $

 #
 # 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
 #
 # 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


@@ -4521,7 +4521,7 @@ xterm+256color|xterm 256-color feature,
 xterm+256setaf|xterm 256-color (set-only),
        ccc@,
        colors#0x100, pairs#0x7fff,
 xterm+256setaf|xterm 256-color (set-only),
        ccc@,
        colors#0x100, pairs#0x7fff,

-       initc@,
+       initc@, op=\E[39;49m,

        setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
              5;%p1%d%;m,
        setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
        setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
              5;%p1%d%;m,
        setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5


@@ -5944,6 +5944,31 @@ mgr-linux|Mgr window with Linux keyboard,
 
 #### SIMPLETERM
 # st.suckless.org
 
 #### SIMPLETERM
 # st.suckless.org

+
+st|stterm| simpleterm,
+       use=st-0.7,
+
+# Reviewed 0.7:
+#      dim is intermittent, sometimes works, sometimes does not
+#      italics may show up with yellow color 
+#      has control cursor-keys, alt cursor-keys, still no combinations
+#      has control pageup/down
+st-0.7|simpleterm 0.7,
+       ccc, Se, Ss,
+       dim=\E[2m,
+       initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
+             %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
+       kcbt@, kent@, oc=\E]104\007,
+       setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+            %=%t3%e%p1%d%;m,
+       setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+            %=%t3%e%p1%d%;m,
+       Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
+       kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
+       kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
+       kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
+       rmxx=\E[29m, smxx=\E[9m, use=st-0.6,
+

 # st-0.4.1
 #
 # This version uses a table which supports a single modifier (a subset of
 # st-0.4.1
 #
 # This version uses a table which supports a single modifier (a subset of


@@ -5972,7 +5997,7 @@ mgr-linux|Mgr window with Linux keyboard,
 # Tmux unofficial extensions, see TERMINFO EXTENSIONS in tmux(1)
 # still has no function keys past kf36 (no combinations of modifiers)
 # no application keypad mode, e.g, kent.
 # Tmux unofficial extensions, see TERMINFO EXTENSIONS in tmux(1)
 # still has no function keys past kf36 (no combinations of modifiers)
 # no application keypad mode, e.g, kent.

-st|stterm| simpleterm 0.4.1,
+st-0.6|simpleterm 0.6,

        am, bce, hs, mir, msgr, npc, xenl, Tc, XT,
        colors#8, cols#80, it#8, lines#24, pairs#64,
        acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy
        am, bce, hs, mir, msgr, npc, xenl, Tc, XT,
        colors#8, cols#80, it#8, lines#24, pairs#64,
        acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyy


@@ -6025,8 +6050,8 @@ st|stterm| simpleterm 0.4.1,
            %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
        sgr0=\E[0m, smacs=\E(0, smcup=\E[?1049h, smir=\E[4h,
        smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
            %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
        sgr0=\E[0m, smacs=\E(0, smcup=\E[?1049h, smir=\E[4h,
        smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,

-       tsl=\E]0;, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
-       vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q,
+       u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
+       vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q, use=xterm+sl,

        use=ecma+italics,
 #
 # st-0.1.1
        use=ecma+italics,
 #
 # st-0.1.1


@@ -6198,7 +6223,7 @@ terminator|Terminator no line wrap,
 # This description uses xterm+pcf0, which is misleading because the program
 # does not handle combinations of modifiers - but listing them all would
 # involve more effort than its developers spent -TD
 # This description uses xterm+pcf0, which is misleading because the program
 # does not handle combinations of modifiers - but listing them all would
 # involve more effort than its developers spent -TD

-terminology|EFL-based terminal emulator,
+terminology-0.6.1|EFL-based terminal emulator,

        mc5i@, xon@,
        blink@, ed@, el@, el1@, invis=\E[8m, kLFT=\E[1;2D,
        kRIT=\E[1;2C, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
        mc5i@, xon@,
        blink@, ed@, el@, el1@, invis=\E[8m, kLFT=\E[1;2D,
        kRIT=\E[1;2C, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,


@@ -6216,6 +6241,32 @@ terminology|EFL-based terminal emulator,
        kRIT7=\E[1;7C, kUP=\E[1;2A, use=xterm+pcf0, use=vt100,
        use=xterm+256setaf,
 
        kRIT7=\E[1;7C, kUP=\E[1;2A, use=xterm+pcf0, use=vt100,
        use=xterm+256setaf,
 

+# Tested terminology 1.0.0
+#
+# tack -
+#      Shifted cursor-keys send nothing, but xterm modifiers for control+shift
+#      and control+alt were added like xterm+pcc2
+#      Editing keys have some features from xterm+pce2
+#      Changed from xterm+pcf0 to xterm+pcf2
+#
+# vttest -
+#      REP, SL, SR fail
+#
+# Aside from the partial fixes for function/cursor/editing keys, no improvement
+# in other tests versus 0.6.1
+terminology-1.0.0|EFL-based terminal emulator,
+       civis=\E[?25l, cnorm=\E[?12l\E[?25h, dim=\E[2m,
+       flash=\E[?5h$<100/>\E[?5l, kend=\E[OF, khome=\E[OH,
+       rmacs=\E(B,
+       sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+           %?%p1%p3%|%t;7%;%?%p7%t;8%;m$<2>,
+       sgr0=\E(B\E[m, smacs=\E(0, use=ecma+italics,
+       use=xterm+x11mouse, use=xterm+pce2, use=xterm+pcf2,
+       use=xterm+pcc2, use=terminology-0.6.1,
+
+terminology|EFL-based terminal emulator,
+       use=terminology-1.0.0,
+

 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
 #
 
 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
 #
 


@@ -25251,4 +25302,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2017-08-26
 #      + fixes for "iterm2" (report by Leonardo Brondani Schenkel) -TD
 #
 # 2017-08-26
 #      + fixes for "iterm2" (report by Leonardo Brondani Schenkel) -TD
 #

+# 2017-11-11
+#      + add "op" to xterm+256setaf -TD
+#      + reviewed terminology 1.0.0 -TD
+#      + reviewed st 0.7 -TD
+#

 ######## SHANTIH!  SHANTIH!  SHANTIH!
 ######## SHANTIH!  SHANTIH!  SHANTIH!

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b24972621db1de80d4a03870d0c717a761b5db64..12d0323372dc87d76711a27eaf6f4624838c217e 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20171104) unstable; urgency=low
+ncurses6 (6.0+20171111) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Oct 2017 12:32:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Nov 2017 06:30:20 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b24972621db1de80d4a03870d0c717a761b5db64..12d0323372dc87d76711a27eaf6f4624838c217e 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20171104) unstable; urgency=low
+ncurses6 (6.0+20171111) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Oct 2017 12:32:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Nov 2017 06:30:20 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 9c4aebc6416a2c1388850e83bd57218bbe41e861..5c97579d401bfb559516929119ea6734a9540cdd 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20171104) unstable; urgency=low
+ncurses6 (6.0+20171111) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 29 Oct 2017 12:32:06 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 05 Nov 2017 06:30:20 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 345923420ff2788eb6b2de2464bf6527a1f0b6af..5814aabe60a701513106fba6dc59d67e45a649bc 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.238 2017/10/29 16:32:06 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.239 2017/11/05 11:30:20 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r

-!define VERSION_MMDD  "1104"\r
+!define VERSION_MMDD  "1111"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index dee2b28c8a825962d78b49bc2cd74a5b3d1baa1f..3db1ce7659efc90bf4a49ae047bf7a15372eb2e1 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0

-Release: 20171104
+Release: 20171111

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 98df7bfdc80725bc16b58fef2aa03fcc3db3879c..8117b167071bf5e6b98d310647eb22c0600af938 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0

-Release: 20171104
+Release: 20171111

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec
index 70b51a97734b6263f5fa7690f6736f654ffb000b..a182c40c8de56f5b5790df41c1f25df180b9fe43 100644 (file)
--- a/test/package/ncurses-examples.spec
+++ b/test/package/ncurses-examples.spec
@@ -1,8 +1,8 @@
 Summary: ncurses-examples - example/test programs from ncurses
 %define AppProgram ncurses-examples
 Summary: ncurses-examples - example/test programs from ncurses
 %define AppProgram ncurses-examples

-%define AppVersion MAJOR.MINOR
-%define AppRelease YYYYMMDD
-# $Id: ncurses-examples.spec,v 1.6 2017/08/11 00:12:20 tom Exp $
+%define AppVersion 6.0
+%define AppRelease 20171111
+# $Id: ncurses-examples.spec,v 1.7 2017/11/11 15:21:19 tom Exp $

 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: %{AppRelease}


@@ -13,8 +13,8 @@ Source0: %{AppProgram}-%{AppRelease}.tgz
 Packager: Thomas Dickey <dickey@invisible-island.net>
 
 %description
 Packager: Thomas Dickey <dickey@invisible-island.net>
 
 %description

-These are the example/test programs from the ncurses MAJOR.MINOR distribution,
-for patch-date YYYYMMDD.
+These are the example/test programs from the ncurses 6.0 distribution,
+for patch-date 20171111.

 
 This package installs in "bin/ncurses-examples" to avoid conflict with other
 packages.
 
 This package installs in "bin/ncurses-examples" to avoid conflict with other
 packages.


@@ -22,16 +22,18 @@ packages.
 
 %setup -q -n %{AppProgram}-%{AppRelease}
 
 
 %setup -q -n %{AppProgram}-%{AppRelease}
 

+%define debug_package %{nil}
+

 %build
 
 INSTALL_PROGRAM='${INSTALL}' \
 %build
 
 INSTALL_PROGRAM='${INSTALL}' \

-       ./configure \
-               --target %{_target_platform} \
-               --prefix=%{_prefix} \
-               --bindir=%{_bindir}/%{AppProgram} \
-               --datadir=%{_datadir}/%{AppProgram} \
-               --with-screen=ncursesw6 \
-               --disable-rpath-hack
+%configure \
+       --target %{_target_platform} \
+       --prefix=%{_prefix} \
+       --bindir=%{_bindir}/%{AppProgram} \
+       --datadir=%{_datadir}/%{AppProgram} \
+       --with-screen=ncursesw6 \
+       --disable-rpath-hack

 
 make
 
 
 make
 


@@ -48,9 +50,15 @@ strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram}/*
 %files
 %defattr(-,root,root)
 %{_bindir}/%{AppProgram}/*
 %files
 %defattr(-,root,root)
 %{_bindir}/%{AppProgram}/*

+%{_datadir}/%{AppProgram}/*

 
 %changelog
 # each patch should add its ChangeLog entries here
 
 
 %changelog
 # each patch should add its ChangeLog entries here
 

+* Sat Nov 11 2017 Thomas Dickey
+- add example data-files
+- use rpm built-in "configure"
+- suppress debug-package
+

 * Thu Mar 25 2010 Thomas Dickey
 - initial version
 * Thu Mar 25 2010 Thomas Dickey
 - initial version