From 15725f3e115f1b57557f191c58cf4e39ce491a451d204d67e0b7d815a55b524e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 18 Jul 2017 07:05:39 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=317 --- ncurses-5.7-tack.dif | 11 ---- ncurses-5.9-ibm327x.dif | 4 +- ncurses-6.0-patches.tar.bz2 | 4 +- ncurses-6.0.dif | 110 +++++++++++++++++++----------------- ncurses.changes | 21 ++++++- 5 files changed, 83 insertions(+), 67 deletions(-) diff --git a/ncurses-5.7-tack.dif b/ncurses-5.7-tack.dif index 1845de7..e75caaf 100644 --- a/ncurses-5.7-tack.dif +++ b/ncurses-5.7-tack.dif @@ -9,14 +9,3 @@ LDFLAGS = @EXTRA_LDFLAGS@ @TICS_LDFLAGS@ @TINFO_LDFLAGS@ \ @LDFLAGS@ @LD_MODEL@ @TICS_LIBS@ @TINFO_LIBS@ @LIBS@ ---- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2017-04-24 07:47:15.533617238 +0000 -@@ -752,7 +752,7 @@ _nc_read_entry2(const char *const name, - return code; - } - --#if NCURSES_EXT_NUMBERS -+#if !NCURSES_EXT_NUMBERS - /* - * This entrypoint is used by tack. - */ diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index b938a65..c0744f8 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-04-24 06:51:39.870170103 +0000 -@@ -15971,8 +15971,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv ++++ misc/terminfo.src 2017-07-17 08:46:19.868878686 +0000 +@@ -15972,8 +15972,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 8c55ed0..6034e61 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:f869069485b656d189d240520e05463ead60bba34e15126bf9b5362ebd28aad1 -size 2638856 +oid sha256:497a46bd491a4e43cc3e89e8d2384429f01768e3a3a78fd8d7dc357d45afc9b6 +size 2646387 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index fbc827b..2442180 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-03 07:09:04.699399144 +0000 ++++ aclocal.m4 2017-07-17 08:46:48.052363543 +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 @@ -150,7 +150,7 @@ esac done --- configure -+++ configure 2017-07-03 07:09:04.699399144 +0000 ++++ configure 2017-07-17 08:46:48.056363470 +0000 @@ -5925,7 +5925,7 @@ case $cf_cv_system_name in fi ;; @@ -287,7 +287,7 @@ # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} --- include/curses.h.in -+++ include/curses.h.in 2017-07-03 07:09:04.699399144 +0000 ++++ include/curses.h.in 2017-07-17 08:46:48.056363470 +0000 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -299,7 +299,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- include/termcap.h.in -+++ include/termcap.h.in 2017-07-03 07:09:04.699399144 +0000 ++++ include/termcap.h.in 2017-07-17 08:46:48.056363470 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,7 +310,7 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2017-07-03 07:09:04.699399144 +0000 ++++ include/tic.h 2017-07-17 08:46:48.056363470 +0000 @@ -205,12 +205,12 @@ struct alias */ @@ -327,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2017-07-03 07:09:04.703399070 +0000 ++++ man/man_db.renames 2017-07-17 08:46:48.056363470 +0000 @@ -163,6 +163,7 @@ term.7 term.7 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -345,7 +345,7 @@ # getty.1 getty.8 --- man/ncurses.3x -+++ man/ncurses.3x 2017-07-03 07:09:04.703399070 +0000 ++++ man/ncurses.3x 2017-07-17 08:46:48.056363470 +0000 @@ -137,6 +137,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -358,7 +358,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-07-03 07:09:04.703399070 +0000 ++++ misc/gen-pkgconfig.in 2017-07-17 08:46:48.056363470 +0000 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" fi @@ -398,7 +398,7 @@ echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2017-07-03 07:09:04.703399070 +0000 ++++ misc/ncurses-config.in 2017-07-17 08:46:48.056363470 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -409,7 +409,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2017-07-03 07:09:04.763397957 +0000 ++++ misc/terminfo.src 2017-07-17 08:46:48.060363396 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -421,7 +421,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1350,7 +1352,7 @@ nsterm|Apple_Terminal|AppKit Terminal.ap +@@ -1351,7 +1353,7 @@ nsterm|Apple_Terminal|AppKit Terminal.ap # # NOTE: When tack tests (csr) + (nel) iTerm.app crashes, so (csr) is # disabled. @@ -430,7 +430,7 @@ bce, bw@, csr@, dim@, kend=\EOF, khome=\EOH, sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%? -@@ -1740,9 +1742,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -1741,9 +1743,15 @@ linux-c|linux console 1.3.6+ for older n # The 2.2.x kernels add a private mode that sets the cursor type; use that to # get a block cursor for cvvis. # reported by Frank Heckenbach . @@ -447,7 +447,7 @@ # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: # http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html -@@ -1757,6 +1765,7 @@ linux2.6|linux 2.6.x console, +@@ -1758,6 +1766,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx xyyzz{{||}c~~, enacs=\E)0, rmacs=^O, @@ -455,7 +455,7 @@ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=linux2.2, -@@ -3215,6 +3224,7 @@ vt132|DEC vt132, +@@ -3216,6 +3225,7 @@ vt132|DEC vt132, # at the top of the keyboard. The "DO" key is used as F10 to avoid conflict # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping. # PF1--PF4 are used as F1--F4. @@ -463,7 +463,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -3225,7 +3235,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -3226,7 +3236,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, @@ -472,7 +472,7 @@ dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>, is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B, -@@ -3386,6 +3396,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -3387,6 +3397,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -480,7 +480,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -3395,7 +3406,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -3396,7 +3407,7 @@ vt320|vt300|dec vt320 7 bit terminal, 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, @@ -489,7 +489,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, -@@ -3866,6 +3877,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, +@@ -3867,6 +3878,7 @@ putty+fnkeys+sco|SCO fn-keys for PuTTY, # retrieving the window title, and for setting the window size (i.e., using # "resize -s"), though it does not pass SIGWINCH to the application if the # user resizes the window with the mouse. @@ -497,7 +497,7 @@ teraterm2.3|Tera Term Pro, km, xon@, ncv#43, vt@, -@@ -3874,7 +3886,7 @@ teraterm2.3|Tera Term Pro, +@@ -3875,7 +3887,7 @@ teraterm2.3|Tera Term Pro, \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J, cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, @@ -506,7 +506,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -4080,6 +4092,7 @@ xterm-old|antique xterm version, +@@ -4081,6 +4093,7 @@ xterm-old|antique xterm version, use=xterm-r6, # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # The name has been changed and some aliases have been removed. @@ -514,7 +514,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, XT, cols#80, it#8, lines#24, ncv@, -@@ -4089,7 +4102,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4090,7 +4103,7 @@ xterm-xf86-v32|xterm terminal emulator ( 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, @@ -523,7 +523,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -4583,8 +4596,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4584,8 +4597,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 -@@ -4927,7 +4958,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -4928,7 +4959,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, -@@ -5103,10 +5134,14 @@ mgt|Multi GNOME Terminal, +@@ -5104,10 +5135,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) # -@@ -5237,14 +5272,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5238,14 +5273,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=^?, -@@ -5300,6 +5335,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5301,6 +5336,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 -@@ -5311,13 +5347,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5312,13 +5348,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, -@@ -5328,7 +5365,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5329,7 +5366,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 -@@ -5411,8 +5448,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5412,8 +5449,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~, -@@ -5473,6 +5510,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5474,6 +5511,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, -@@ -5519,7 +5588,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5520,7 +5589,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 -@@ -5533,13 +5602,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5534,13 +5603,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=, -@@ -6143,7 +6212,7 @@ pty|4bsd pseudo teletype, +@@ -6144,7 +6213,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, -@@ -6156,6 +6225,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -6157,6 +6226,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, -@@ -6278,7 +6354,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6279,7 +6355,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~, -@@ -6396,6 +6472,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -6397,6 +6473,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, -@@ -6478,7 +6561,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6479,7 +6562,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, -@@ -8337,7 +8420,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -8338,7 +8421,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, -@@ -11558,6 +11641,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -11559,6 +11642,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, -@@ -11567,7 +11651,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -11568,7 +11652,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, -@@ -15981,7 +16065,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15982,7 +16066,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 -@@ -16239,7 +16323,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16240,7 +16324,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-03 07:09:04.707398995 +0000 ++++ ncurses/Makefile.in 2017-07-17 08:46:48.060363396 +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-03 07:09:04.707398995 +0000 ++++ ncurses/curses.priv.h 2017-07-17 08:46:48.060363396 +0000 @@ -2122,6 +2122,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-03 07:09:04.707398995 +0000 ++++ ncurses/run_cmd.sh 2017-07-17 08:46:48.060363396 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -839,7 +839,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2017-07-03 07:09:04.707398995 +0000 ++++ ncurses/tinfo/MKfallback.sh 2017-07-17 08:46:48.060363396 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -872,7 +872,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2017-07-03 07:09:04.707398995 +0000 ++++ ncurses/tinfo/access.c 2017-07-17 08:46:48.060363396 +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-03 07:09:04.707398995 +0000 ++++ ncurses/tinfo/lib_setup.c 2017-07-17 08:46:48.060363396 +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-03 07:09:04.711398921 +0000 ++++ ncurses/tinfo/read_entry.c 2017-07-17 08:46:48.060363396 +0000 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -944,8 +944,16 @@ return (code); } +|@@ -712,6 +714,7 @@ _nc_read_tic_entry(char *filename, +| * We take pains here to make sure no combination of environment variables and +| * terminal type name can be used to overrun the file buffer. +| */ +|+#undef _nc_read_entry2 +| NCURSES_EXPORT(int) +| _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const tp) +| { --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2017-07-03 07:09:04.711398921 +0000 ++++ ncurses/tinfo/read_termcap.c 2017-07-17 08:46:48.060363396 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -992,7 +1000,7 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2017-07-03 07:09:04.711398921 +0000 ++++ test/test.priv.h 2017-07-17 08:46:48.060363396 +0000 @@ -805,12 +805,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 7ba940d..5521153 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,7 +1,26 @@ +------------------------------------------------------------------- +Tue Jul 18 06:49:37 UTC 2017 - werner@suse.de + +- Fix build by removing workaround in patch ncurses-5.7-tack.dif + which was required since patch 20170415 but had become obsolete + with patch 20170715 + +------------------------------------------------------------------- +Mon Jul 17 08:44:28 UTC 2017 - werner@suse.de + +- Add ncurses patch 20170715 + + modify command-line parameters for "convert" used in picsmap to work + with ImageMagick 6.8 and newer. + + fix build-problem with tack and ABI-5 (Debian #868328). + + repair termcap-format from tic/infocmp broken in 20170701 fixes + (Debian #868266). + + reformat terminfo.src with 20170513 updates. + + improve test-packages to address lintian warnings. + ------------------------------------------------------------------- Mon Jul 10 07:17:16 UTC 2017 - werner@suse.de -- Add Ncurses patch 20170708 +- Add ncurses patch 20170708 + add a note to tic manual page about -W versus -f options. + correct a limit-check in fixes from 20170701 (report by Sven Joachim). - This also for bug bsc#1047964 and bug bsc#1047965