From aeb30c4eaa07a1dc2ab95eaa6e9426c867e9ff2ac648ca6de9dc284c6c424f2d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 1 Jun 2015 08:44:39 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=203 --- ncurses-5.9-patches.tar.bz2 | 4 +-- ncurses-5.9.dif | 53 ++++++++++++++++++------------------- ncurses.changes | 22 +++++++++++++++ ncurses.spec | 14 +++++++++- 4 files changed, 63 insertions(+), 30 deletions(-) diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index 9eeaeff..d294df8 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c8d773a5a7f803d8ce6b5ead76bde992f4eb38f56e93cc2b9d3b8b666d64597 -size 4838421 +oid sha256:1013f5bab80b0af2d7c8c8c17499920a5614f2d3448a42635dde249eccd2c7d0 +size 4916819 diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index 25e1073..abd3b7d 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -413,7 +413,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2015-04-27 10:38:20.000000000 +0000 ++++ misc/terminfo.src 2015-06-01 08:26:54.890018864 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -476,7 +476,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, -@@ -3619,13 +3629,14 @@ putty-sco|putty with SCO function keys, +@@ -3654,13 +3664,14 @@ 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. @@ -492,7 +492,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~, -@@ -3828,6 +3839,7 @@ xterm-old|antique xterm version, +@@ -3863,6 +3874,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. @@ -500,7 +500,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@, -@@ -3837,7 +3849,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -3872,7 +3884,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=^J, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -509,7 +509,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, -@@ -4305,8 +4317,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4340,8 +4352,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -536,7 +536,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -4641,7 +4671,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -4676,7 +4706,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -545,7 +545,7 @@ bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -4805,10 +4835,14 @@ mgt|Multi GNOME Terminal, +@@ -4846,10 +4876,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). @@ -561,7 +561,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -4939,14 +4973,14 @@ mlterm3|multi lingual terminal emulator, +@@ -4980,14 +5014,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, @@ -579,7 +579,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=^J, indn=\E[%p1%dS, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, -@@ -5001,6 +5035,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5042,6 +5076,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". @@ -587,7 +587,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5012,13 +5047,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5053,13 +5088,14 @@ rxvt-basic|rxvt terminal base (X Window clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, @@ -605,7 +605,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, -@@ -5027,7 +5063,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5068,7 +5104,7 @@ rxvt-basic|rxvt terminal base (X Window sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%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, @@ -614,7 +614,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5110,8 +5146,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5151,8 +5187,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, @@ -625,12 +625,12 @@ 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~, -@@ -5168,6 +5204,39 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5209,6 +5245,38 @@ rxvt-cygwin-native|rxvt terminal emulato acsc=+\257\,\256-\^0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, +# From: Thomas Dickey 04 Oct 1997 -+# Updated: Özgür Kesim 02 Nov 1997 ++# Updated: Özgür Kesim 02 Nov 1997 +# Updated: Marc Lehmann , 17 Feb 2005 +# Updated: Marc Lehmann , 04 Nov 2008: change init/reset sequences +# @@ -660,12 +660,11 @@ + colors#256, + pairs#32767, + use=rxvt-unicode, -+ + # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... - rxvt-16color|xterm with 16 colors like aixterm, -@@ -5214,7 +5283,7 @@ mrxvt-256color|multitabbed rxvt with 256 + rxvt-16color|rxvt with 16 colors like aixterm, +@@ -5255,7 +5323,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -674,7 +673,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 -@@ -5228,13 +5297,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5269,13 +5337,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, @@ -690,7 +689,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=, -@@ -5803,7 +5872,7 @@ pty|4bsd pseudo teletype, +@@ -5844,7 +5912,7 @@ pty|4bsd pseudo teletype, #### Emacs # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -699,7 +698,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -5816,6 +5885,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -5857,6 +5925,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, @@ -713,7 +712,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, -@@ -5916,7 +5992,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -5957,7 +6032,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=^J, is2=\E)0, @@ -722,7 +721,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~, -@@ -6096,7 +6172,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6153,7 +6228,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, @@ -731,7 +730,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=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -7839,7 +7915,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -7896,7 +7971,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, @@ -740,7 +739,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, -@@ -10973,6 +11049,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -11030,6 +11105,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) @@ -748,7 +747,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, -@@ -10982,7 +11059,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -11039,7 +11115,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=^J, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -757,7 +756,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, -@@ -15258,7 +15335,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15315,7 +15391,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=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH, @@ -766,7 +765,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%{80}%|%;%c%?%p9%t\E>A%e\E>B%;, sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162, -@@ -15499,7 +15576,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -15556,7 +15632,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. diff --git a/ncurses.changes b/ncurses.changes index 472faa0..796c6de 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Jun 1 08:37:16 UTC 2015 - werner@suse.de + +- Add ncurses patch 20150530 + + change private type for Event_Mask in Ada95 binding to work when + mmask_t is set to 32-bits. + + remove spurious "%;" from st entry (report by Daniel Pitts) -TD + + add vte-2014, update vte to use that -TD + + modify tic and infocmp to "move" a diagnostic for tparm strings that + have a syntax error to tic's "-c" option (report by Daniel Pitts). + + fix two problems with configure script macros (Debian #786436, + cf: 20150425, cf: 20100529). +- Add ncurses patch 20150523 + + add 'P' menu item to test/ncurses.c, to show pad in color. + + improve discussion in curs_color.3x about color rendering (prompted + by comment on Stack Overflow forum): + + remove screen-bce.mlterm, since mlterm does not do "bce" -TD + + add several screen.XXX entries to support the respective variations + for 256 colors -TD + + add putty+fnkeys* building-block entries -TD + + add smkx/rmkx to capabilities analyzed with infocmp "-i" option. + ------------------------------------------------------------------- Mon May 18 13:55:40 UTC 2015 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index 803e520..106e161 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -276,7 +276,19 @@ rm -fr tack rm -f Ada95/src/terminal_interface-curses.adb rm -f Ada95/src/library.gpr rm -f mkinstalldirs -tar Oxfj %{S:1} | patch -p1 -s +tar xfj %{S:1} +set +x +for patch in patches/ncurses*.patch +do + case "$patch" in + */ncurses-5.9-20150516.patch) + cat "$patch" | sh + esac + patch -f -T -p1 -s < $patch +done +set -x +rm -rf patches/ +find -name '*.orig' | xargs -r rm -f tar xfj %{S:5} mv tack-* tack %patch -P 1 -p0 -b .327x