From 9a58a3148032b00e35e178aac96a4b9d5ace33d6bd0ee82e631bcb598d9514f6 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 9 Jul 2019 10:52:07 +0000 Subject: [PATCH 1/2] Update to ncurses-6.1-20190706 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=433 --- ncurses-5.9-ibm327x.dif | 2 +- ncurses-6.1-patches.tar.bz2 | 4 +- ncurses-6.1.dif | 168 ++++++++++++++++-------------------- ncurses.changes | 20 +++++ ncurses.spec | 2 +- 5 files changed, 99 insertions(+), 97 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 00ab4d5..480a798 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -16864,8 +16864,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -16991,8 +16991,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 4c3500c..7920e48 100644 --- a/ncurses-6.1-patches.tar.bz2 +++ b/ncurses-6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96a532990194d93375c3be783173792f301cc21b675e3980110da4820328005b -size 1533662 +oid sha256:a4cbaa3ec794917cd515be49b9ba7a2661b5bfbd3d054bef6989f19c7f5362b1 +size 1603637 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 2f7edd9..972723e 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -11,17 +11,17 @@ ncurses/Makefile.in | 2 ncurses/curses.priv.h | 2 ncurses/run_cmd.sh | 11 +++ - ncurses/tinfo/MKfallback.sh | 10 ++- + ncurses/tinfo/MKfallback.sh | 6 + ncurses/tinfo/access.c | 28 ++++++++ ncurses/tinfo/lib_setup.c | 3 ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_termcap.c | 21 ++++-- progs/Makefile.in | 4 - test/test.priv.h | 4 - - 19 files changed, 248 insertions(+), 80 deletions(-) + 19 files changed, 246 insertions(+), 78 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2019-06-24 09:21:19.443796673 +0000 ++++ aclocal.m4 2019-07-01 07:36:31.909290868 +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,8 +150,8 @@ esac done --- configure -+++ configure 2019-06-24 09:21:19.447796599 +0000 -@@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti ++++ configure 2019-07-01 07:36:31.913290795 +0000 +@@ -5487,7 +5487,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; (linux*|gnu*|k*bsd*-gnu|freebsd*) @@ -160,7 +160,7 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -13642,12 +13642,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 -@@ -13772,9 +13775,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <. @@ -427,7 +427,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 -@@ -1029,6 +1037,7 @@ linux2.6|linux 2.6.x console, +@@ -1027,6 +1035,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwx xyyzz{{||}c~~, enacs=\E)0, rmacs=^O, @@ -435,7 +435,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, -@@ -2486,6 +2495,7 @@ vt132|DEC vt132, +@@ -2484,6 +2493,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. @@ -443,7 +443,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -2496,7 +2506,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -2494,7 +2504,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, @@ -452,7 +452,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, -@@ -2657,6 +2667,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -2655,6 +2665,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -460,7 +460,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -2666,7 +2677,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -2664,7 +2675,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, @@ -469,7 +469,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, -@@ -4087,6 +4098,7 @@ mintty+common|shared capabilities for mi +@@ -4084,6 +4095,7 @@ mintty+common|shared capabilities for mi # 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. @@ -477,7 +477,7 @@ teraterm2.3|Tera Term Pro, km, ncv#43, vt@, -@@ -4095,7 +4107,7 @@ teraterm2.3|Tera Term Pro, +@@ -4092,7 +4104,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, @@ -486,7 +486,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -4319,6 +4331,7 @@ xterm-old|antique xterm version, +@@ -4394,6 +4406,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. @@ -494,7 +494,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@, -@@ -4328,7 +4341,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4403,7 +4416,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, @@ -503,7 +503,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, -@@ -4965,8 +4978,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5040,8 +5053,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -530,7 +530,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5310,7 +5341,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5385,7 +5416,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -539,7 +539,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5561,10 +5592,14 @@ mgt|Multi GNOME Terminal, +@@ -5636,10 +5667,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). @@ -555,7 +555,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -5776,14 +5811,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5851,14 +5886,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, @@ -571,9 +571,9 @@ + cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, + dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=, 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, + ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, -@@ -5839,6 +5874,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5915,6 +5950,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". @@ -581,7 +581,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5850,13 +5886,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5926,13 +5962,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, @@ -599,7 +599,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, -@@ -5867,7 +5904,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5943,7 +5980,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, @@ -608,7 +608,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5950,8 +5987,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6026,8 +6063,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, @@ -619,7 +619,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~, -@@ -6042,6 +6079,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6118,6 +6155,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -658,7 +658,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, -@@ -6088,7 +6157,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -6164,7 +6233,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -667,7 +667,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 -@@ -6102,13 +6171,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6178,13 +6247,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, @@ -683,7 +683,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=, -@@ -6969,7 +7038,7 @@ pty|4bsd pseudo teletype, +@@ -7100,7 +7169,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 @@ -692,7 +692,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -6982,6 +7051,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7113,6 +7182,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, @@ -706,16 +706,16 @@ # 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, -@@ -7104,7 +7180,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7235,7 +7311,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, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, -- ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z, -+ ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^?, kcbt=\E[Z, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 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, -@@ -7225,6 +7301,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +- ind=\n, is2=\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, ++ ind=\n, is2=\E)0, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, 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~, +@@ -7356,6 +7432,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -729,7 +729,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, -@@ -7312,7 +7395,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -7443,7 +7526,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, @@ -738,7 +738,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, -@@ -9216,7 +9299,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9346,7 +9429,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, @@ -747,7 +747,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, -@@ -12447,6 +12530,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12576,6 +12659,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) @@ -755,7 +755,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, -@@ -12456,7 +12540,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12585,7 +12669,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, @@ -764,7 +764,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, -@@ -16874,7 +16958,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17001,7 +17085,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, @@ -773,8 +773,8 @@ 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 -@@ -17132,7 +17216,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De - tbc=\E[3g, +@@ -17259,7 +17343,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De + tbc=\E[3g, use=ecma+index, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. -ibm5081|hft|IBM Megapel Color display, @@ -783,18 +783,18 @@ 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 2019-06-24 09:21:19.451796524 +0000 -@@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) : ++++ ncurses/Makefile.in 2019-07-01 07:43:17.653787717 +0000 +@@ -222,7 +222,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ ./fallback.c : $(tinfo)/MKfallback.sh -- $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ -+ $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@ +- $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@ ++ $(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@ ./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 2019-06-24 09:21:19.451796524 +0000 ++++ ncurses/curses.priv.h 2019-07-01 07:36:31.917290721 +0000 @@ -2246,6 +2246,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); @@ -805,7 +805,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 2019-06-24 09:21:19.451796524 +0000 ++++ ncurses/run_cmd.sh 2019-07-01 07:36:31.917290721 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -819,40 +819,22 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2019-06-24 09:21:19.451796524 +0000 -@@ -68,6 +68,12 @@ else ++++ ncurses/tinfo/MKfallback.sh 2019-07-01 07:44:43.332194169 +0000 +@@ -71,6 +71,12 @@ else tmp_info= fi +if test -n "$TERMINFO" -a -d "$TERMINFO" ; then -+ infocmp="infocmp -v1 -A $TERMINFO" ++ infocmp_path="$infocmp_path -v1 -A $TERMINFO" +else -+ infocmp="infocmp -v1" ++ infocmp_path="$infocmp_path -v1" +fi + cat </NCURSES_INT2/g' -+ $infocmp -E $x | sed -e 's/\/NCURSES_INT2/g' - done - - cat <= 0) { result = value; /* use extension feature */ @@ -908,7 +890,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2019-06-24 09:21:19.451796524 +0000 ++++ ncurses/tinfo/read_entry.c 2019-07-01 07:36:31.917290721 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -926,7 +908,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2019-06-24 09:21:19.451796524 +0000 ++++ ncurses/tinfo/read_termcap.c 2019-07-01 07:36:31.917290721 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -973,7 +955,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2019-06-24 09:21:19.451796524 +0000 ++++ progs/Makefile.in 2019-07-01 07:36:31.917290721 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -993,7 +975,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2019-06-24 09:21:19.451796524 +0000 ++++ test/test.priv.h 2019-07-01 07:36:31.917290721 +0000 @@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *, #endif diff --git a/ncurses.changes b/ncurses.changes index 916ad25..31e55c6 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Jul 9 10:45:50 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190706 + + add domterm -TD + + improve comments for recent changes, add alias xterm.js -TD + +------------------------------------------------------------------- +Mon Jul 1 07:35:28 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190630 + + add --with-tic-path and --with-infocmp-path to work around problems + building fallback source using pre-6.0 tic/infocmp. + + add a check in tic for paired indn/rin + + correct a buffer-limit in write_entry.c for systems that use caseless + filenames. + + add ms-terminal -TD + + add vscode, vscode-direct -TD +* Adopt patch ncurses-5.9-ibm327x.dif and ncurses-6.1.dif + ------------------------------------------------------------------- Mon Jun 24 09:20:53 UTC 2019 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 0efb4ce..5ec00c6 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -564,7 +564,7 @@ mv tack-* tack . ${PWD}/../.build_tic $BUILD_TIC -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src $BUILD_TIC -o $TERMINFO -s terminfo.src - sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $BUILD_TIC ${FALLBK//,/ } > fallback.c + sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $BUILD_TIC $BUILD_INFOCMP ${FALLBK//,/ } > fallback.c rm -rf $TERMINFO unset TERMINFO cp -p fallback.c ../fallback.c.build From 07c6faa545b02277b1691e20987a686d8cca61730d41a81c07ce7d5e2fc8c267 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 15 Jul 2019 11:42:02 +0000 Subject: [PATCH 2/2] Update to ncurses-6.1-20190713 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=435 --- ncurses-6.1-patches.tar.bz2 | 4 ++-- ncurses.changes | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 7920e48..2942638 100644 --- a/ncurses-6.1-patches.tar.bz2 +++ b/ncurses-6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4cbaa3ec794917cd515be49b9ba7a2661b5bfbd3d054bef6989f19c7f5362b1 -size 1603637 +oid sha256:1ff3ad75cda7ff18aa7e66afe2e380cffad2d8919785624abb56e8a436fe1b25 +size 1609366 diff --git a/ncurses.changes b/ncurses.changes index 31e55c6..08da374 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 15 11:40:20 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190713 + + change reset's behavior for margins to simply clear soft-margins if + possible, rather than clearing and then setting them according to the + terminal's width (suggested by Thomas Wolff). + + correct order of one wbkgd versus start_color call in test/padview.c + ------------------------------------------------------------------- Tue Jul 9 10:45:50 UTC 2019 - Dr. Werner Fink