From 15c38bd475f58db111a8f66d90414ec76afdf6600bed54841cee869f223b4a15 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 13 Nov 2017 08:38:04 +0000 Subject: [PATCH] Update to ncurses 6.0 20171104 and 6.0 20171111 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=338 --- ncurses-5.9-ibm327x.dif | 4 +-- ncurses-6.0-patches.tar.bz2 | 4 +-- ncurses-6.0.dif | 60 ++++++++++++++++++------------------- ncurses.changes | 19 ++++++++++++ 4 files changed, 53 insertions(+), 34 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 819c91e..48a303f 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -3,8 +3,8 @@ 1 file changed, 2 insertions(+), 2 deletions(-) --- misc/terminfo.src -+++ misc/terminfo.src 2017-08-27 13:31:59.993779178 +0000 -@@ -16086,8 +16086,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2017-11-13 08:35:26.818919331 +0000 +@@ -16137,8 +16137,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index b708069..0b9e21f 100644 --- a/ncurses-6.0-patches.tar.bz2 +++ b/ncurses-6.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87c2dc3a09b3a45006c7e5e8668c6e88e78f0bd336cb2e0c40c74c5bf8c8f70a -size 3015203 +oid sha256:e59e641cbcd5e7e20b26fd8ff28926db67668d20bc89124bc0a9ba388a56c7a7 +size 3020437 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 8f317bf..e4a1a4f 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -22,7 +22,7 @@ 20 files changed, 248 insertions(+), 81 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2017-10-16 10:00:42.326486502 +0000 ++++ aclocal.m4 2017-11-13 08:36:13.126034549 +0000 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -151,7 +151,7 @@ esac done --- configure -+++ configure 2017-10-16 10:00:42.330486427 +0000 ++++ configure 2017-11-13 08:36:13.130034473 +0000 @@ -5950,7 +5950,7 @@ case $cf_cv_system_name in fi ;; @@ -288,7 +288,7 @@ # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} --- include/curses.h.in -+++ include/curses.h.in 2017-10-16 10:00:42.330486427 +0000 ++++ include/curses.h.in 2017-11-13 08:36:13.130034473 +0000 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -300,7 +300,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2017-10-16 10:00:42.330486427 +0000 ++++ include/termcap.h.in 2017-11-13 08:36:13.130034473 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -311,7 +311,7 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2017-10-16 10:00:42.330486427 +0000 ++++ include/tic.h 2017-11-13 08:36:13.130034473 +0000 @@ -207,12 +207,12 @@ struct alias */ @@ -328,7 +328,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2017-10-16 10:00:42.330486427 +0000 ++++ man/man_db.renames 2017-11-13 08:36:13.130034473 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -346,7 +346,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2017-10-16 10:00:42.330486427 +0000 ++++ man/ncurses.3x 2017-11-13 08:36:13.130034473 +0000 @@ -137,6 +137,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -359,7 +359,7 @@ called \fIwindows\fR, which can be thought of as two-dimensional arrays of characters representing all or part of a CRT screen. --- misc/gen-pkgconfig.in -+++ misc/gen-pkgconfig.in 2017-10-16 10:00:42.330486427 +0000 ++++ misc/gen-pkgconfig.in 2017-11-13 08:36:13.130034473 +0000 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" fi @@ -399,7 +399,7 @@ echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2017-10-16 10:00:42.330486427 +0000 ++++ misc/ncurses-config.in 2017-11-13 08:36:13.130034473 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -410,7 +410,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2017-10-16 10:00:42.334486353 +0000 ++++ misc/terminfo.src 2017-11-13 08:36:13.134034396 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -695,7 +695,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -6245,7 +6314,7 @@ pty|4bsd pseudo teletype, +@@ -6296,7 +6365,7 @@ pty|4bsd pseudo teletype, # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el # # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -704,7 +704,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -6258,6 +6327,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -6309,6 +6378,13 @@ eterm|gnu emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -718,7 +718,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -6380,7 +6456,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6431,7 +6507,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E)0, @@ -727,7 +727,7 @@ kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, -@@ -6499,6 +6575,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -6550,6 +6626,13 @@ screen.xterm-xfree86|screen.xterm-new|sc E3@, use=screen+italics, use=screen+fkeys, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -741,7 +741,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, -@@ -6581,7 +6664,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6632,7 +6715,7 @@ screen2|old VT 100/ANSI X3.64 virtual te cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -750,7 +750,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -8452,7 +8535,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -8503,7 +8586,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -759,7 +759,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -11673,6 +11756,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -11724,6 +11807,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # (vt320-k3: I added / based on the init string -- esr) @@ -767,7 +767,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -11682,7 +11766,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -11733,7 +11817,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -776,7 +776,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ ?5l, -@@ -16096,7 +16180,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -16147,7 +16231,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -785,7 +785,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -16354,7 +16438,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16405,7 +16489,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. @@ -795,7 +795,7 @@ s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in -+++ ncurses/Makefile.in 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/Makefile.in 2017-11-13 08:36:13.134034396 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -806,7 +806,7 @@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/curses.priv.h 2017-11-13 08:36:13.134034396 +0000 @@ -2146,6 +2146,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); @@ -817,7 +817,7 @@ extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); --- ncurses/run_cmd.sh -+++ ncurses/run_cmd.sh 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/run_cmd.sh 2017-11-13 08:36:13.134034396 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -831,7 +831,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-11-13 08:36:13.134034396 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -864,7 +864,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/tinfo/access.c 2017-11-13 08:36:13.134034396 +0000 @@ -35,6 +35,9 @@ #include @@ -907,7 +907,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-11-13 08:36:13.134034396 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -919,7 +919,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/tinfo/read_entry.c 2017-11-13 08:36:13.134034396 +0000 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -937,7 +937,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-10-16 10:00:42.334486353 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-11-13 08:36:13.138034320 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -984,7 +984,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2017-10-16 10:00:42.334486353 +0000 ++++ progs/Makefile.in 2017-11-13 08:36:13.138034320 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -1004,7 +1004,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2017-10-16 10:00:42.334486353 +0000 ++++ test/test.priv.h 2017-11-13 08:36:13.138034320 +0000 @@ -891,12 +891,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 31d404e..278ee25 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Nov 13 08:34:19 UTC 2017 - werner@suse.de + +- Add ncurses 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. + +------------------------------------------------------------------- +Mon Nov 6 14:12:21 UTC 2017 - werner@suse.de + +- Add ncurses patch 20171104 + + check for interrupt in color-pair initialization of dots_curses.c, + dots_xcurses.c + + add z/Z zoom feature to test/ncurses.c C/c screens. + + add '<' and '>' commands to test/ncurses.c S/s screens, to better + test off-by-ones in the overlap/copywin functions. + ------------------------------------------------------------------- Sun Oct 29 18:19:12 UTC 2017 - werner@suse.de