From 930d5e59aba918bc9cd3577b5ae60721e5425eefbc27eea78f82d8609976fa25 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 1 Aug 2017 07:45:52 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=320 --- ncurses-5.9-ibm327x.dif | 4 +- ncurses-6.0-patches.tar.bz2 | 4 +- ncurses-6.0.dif | 116 ++++++++++++++++++------------------ ncurses.changes | 33 ++++++++++ 4 files changed, 95 insertions(+), 62 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index c0744f8..bebe80c 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-07-17 08:46:19.868878686 +0000 -@@ -15972,8 +15972,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2017-07-31 12:13:00.613650108 +0000 +@@ -15986,8 +15986,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 7235850..9d6571c 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:0d9a81703709ccc9b541f23800d5b9bfd3c62a945d22dd11542efce294aed41b -size 2650616 +oid sha256:62578e06a2297bfe5a142964a4a10349c83fbc384734c72fc2b1ac5583bb55fd +size 2711478 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index d658fed..95ddef4 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,7 +21,7 @@ 19 files changed, 247 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2017-07-24 07:18:46.968450937 +0000 ++++ aclocal.m4 2017-07-31 12:13:25.217204635 +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 @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -4754,12 +4754,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -4884,9 +4887,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -12021,9 +12024,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -4584,8 +4597,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4585,8 +4598,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -550,7 +550,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -4928,7 +4959,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -4929,7 +4960,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -559,7 +559,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5104,10 +5135,14 @@ mgt|Multi GNOME Terminal, +@@ -5105,10 +5136,14 @@ mgt|Multi GNOME Terminal, #### KDE # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -575,7 +575,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -5238,14 +5273,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5239,14 +5274,14 @@ mlterm3|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, @@ -593,7 +593,7 @@ home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, -@@ -5301,6 +5336,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5302,6 +5337,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. # Since rxvt is not really compatible with xterm, it should be configured as # "rxvt" or "rxvt-color". @@ -601,7 +601,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5312,13 +5348,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5313,13 +5349,14 @@ rxvt-basic|rxvt terminal base (X Window clear=\E[H\E[2J, cnorm=\E[?25h, cr=\r, 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, @@ -619,7 +619,7 @@ rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, -@@ -5329,7 +5366,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5330,7 +5367,7 @@ rxvt-basic|rxvt terminal base (X Window %p9%t\016%e\017%;, sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, @@ -628,7 +628,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5412,8 +5449,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5413,8 +5450,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -639,7 +639,7 @@ kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, -@@ -5474,6 +5511,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5475,6 +5512,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -678,7 +678,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|rxvt with 16 colors like aixterm, -@@ -5520,7 +5589,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5521,7 +5590,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -687,7 +687,7 @@ # Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT # but does otherwise follow the rxvt+pcfkeys model -TD # remove nonworking flash -TD -@@ -5534,13 +5603,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5535,13 +5604,13 @@ Eterm|Eterm-color|Eterm with xterm-style csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -703,7 +703,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=, -@@ -6144,7 +6213,7 @@ pty|4bsd pseudo teletype, +@@ -6145,7 +6214,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 @@ -712,7 +712,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -6157,6 +6226,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -6158,6 +6227,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, @@ -726,7 +726,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, -@@ -6279,7 +6355,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6280,7 +6356,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, @@ -735,7 +735,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~, -@@ -6397,6 +6473,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -6399,6 +6475,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, @@ -749,7 +749,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, -@@ -6479,7 +6562,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6481,7 +6564,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, @@ -758,7 +758,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, -@@ -8338,7 +8421,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -8352,7 +8435,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, @@ -767,7 +767,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, -@@ -11559,6 +11642,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -11573,6 +11656,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) @@ -775,7 +775,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, -@@ -11568,7 +11652,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -11582,7 +11666,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, @@ -784,7 +784,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, -@@ -15982,7 +16066,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15996,7 +16080,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, @@ -793,7 +793,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 -@@ -16240,7 +16324,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16254,7 +16338,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. @@ -803,7 +803,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-07-24 07:18:46.980450715 +0000 ++++ ncurses/Makefile.in 2017-07-31 12:13:25.225204490 +0000 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -814,7 +814,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-07-24 07:18:46.980450715 +0000 ++++ ncurses/curses.priv.h 2017-07-31 12:13:25.225204490 +0000 @@ -2130,6 +2130,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); @@ -825,7 +825,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-07-24 07:18:46.980450715 +0000 ++++ ncurses/run_cmd.sh 2017-07-31 12:13:25.225204490 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -839,7 +839,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-07-24 07:18:46.980450715 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-07-31 12:13:25.225204490 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -872,7 +872,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-07-24 07:18:46.980450715 +0000 ++++ ncurses/tinfo/access.c 2017-07-31 12:13:25.225204490 +0000 @@ -35,6 +35,9 @@ #include @@ -915,7 +915,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2017-07-24 07:18:46.980450715 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-07-31 12:13:25.225204490 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -927,7 +927,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-07-24 07:18:46.980450715 +0000 ++++ ncurses/tinfo/read_entry.c 2017-07-31 12:13:25.225204490 +0000 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -945,7 +945,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-07-24 07:18:46.980450715 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-07-31 12:13:25.225204490 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -992,7 +992,7 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2017-07-24 07:18:46.980450715 +0000 ++++ test/test.priv.h 2017-07-31 12:13:25.225204490 +0000 @@ -805,12 +805,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 1e1b1d3..15b2fa2 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Jul 31 12:14:36 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170729 + + update interix entry using tack and SFU on Windows 7 Ultimate -TD + + use ^? for kdch1 in interix (reported by Jonathan de Boyne Pollard) + + add "rep" to xterm-new, available since 1997/01/26 -TD + + move SGR 24 and 27 from vte-2014 to vte-2012 (request by Alain + Williams) -TD + + add a check in newline_forces_scroll() in case a program moves the + cursor outside scrolling margins (report by Robert King). + + improve _nc_tparm_analyze, using that to extend the checks made by + tic for reporting inconsistencies between the expected number of + parameters for a capability and the actual. + + amend handling of repeat_char capability in EmitRange (adapted from + report/patch by Dick Wesseling): + + translate the character to the alternate character set when the + alternate character set is enabled. + + do not use repeat_char for characters past 255. + + document "_nc_free_tinfo" in manual page, because it could be used in + tack for memory-leak checking. + + add "--without-tack" configure option to refine "--with-progs" + configure option. Normally tack is no longer built in-tree, but + a few packagers combine it during the build. If term_entry.h is + installed, there is no advantage to in-tree builds. + + adjust configure-script to define HAVE_CURSES_DATA_BOOLNAMES symbol + needed for tack 1.08 when built in-tree. Rather than relying upon + internal "_nc_" functions, tack now uses the boolean, number and + string capability name-arrays provided by ncurses and SVr4 Unix + curses. It still uses term_entry.h for the definitions of the + extended capability arrays. + + add an overlooked null-pointer check in mvcur changes from 20170722 + ------------------------------------------------------------------- Mon Jul 24 07:17:59 UTC 2017 - werner@suse.de