From dd85afdb61d678f63db3541eeee14f0753fa13b6dd57ba6751814babda106f67 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 20 Oct 2014 08:46:47 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=174 --- ncurses-5.9-patches.tar.bz2 | 4 +- ncurses-5.9.dif | 129 +++++++++++++++++++++--------------- ncurses.changes | 31 +++++++++ 3 files changed, 109 insertions(+), 55 deletions(-) diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index 8e41747..4eddf3d 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:0cd1185a3c20b46192fd391526e7797275a29e16236d1c3157512a1d7c3e4b2a -size 3916934 +oid sha256:819622fd8f7c7c8bb81d07b66e4c4cb6959d66fa1b52c161e10714a15f4c72bb +size 3932515 diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index a1f9713..157eb29 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -1,6 +1,29 @@ +--- + aclocal.m4 | 40 +++++++------ + configure | 41 +++++++------ + configure.in | 1 + include/curses.h.in | 3 + include/termcap.h.in | 2 + include/tic.h | 4 - + man/man_db.renames | 2 + man/ncurses.3x | 4 + + misc/gen-pkgconfig.in | 9 ++ + misc/ncurses-config.in | 2 + misc/terminfo.src | 131 ++++++++++++++++++++++++++++++++++--------- + ncurses/Makefile.in | 2 + ncurses/curses.priv.h | 2 + ncurses/run_cmd.sh | 11 +++ + ncurses/tinfo/MKfallback.sh | 10 ++- + ncurses/tinfo/access.c | 27 ++++++++ + ncurses/tinfo/lib_setup.c | 3 + ncurses/tinfo/read_entry.c | 2 + ncurses/tinfo/read_termcap.c | 21 ++++-- + test/test.priv.h | 4 - + 20 files changed, 241 insertions(+), 80 deletions(-) + --- aclocal.m4 +++ aclocal.m4 2010-10-11 13:57:42.000000000 +0000 -@@ -505,7 +505,7 @@ AC_MSG_CHECKING([for size of bool]) +@@ -523,7 +523,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out AC_TRY_RUN([ @@ -9,7 +32,7 @@ #include #if defined(__cplusplus) -@@ -4355,12 +4355,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 -@@ -4485,9 +4488,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 -@@ -10883,9 +10886,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, -@@ -3595,13 +3605,14 @@ putty-sco|putty with SCO function keys, +@@ -3606,13 +3616,14 @@ putty-sco|putty with SCO function keys, # 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. @@ -478,7 +501,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~, -@@ -3804,6 +3815,7 @@ xterm-old|antique xterm version, +@@ -3815,6 +3826,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. @@ -486,7 +509,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@, -@@ -3813,7 +3825,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -3824,7 +3836,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, @@ -495,7 +518,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, -@@ -4285,8 +4297,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4292,8 +4304,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -522,7 +545,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -4495,7 +4525,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -4628,7 +4658,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -531,7 +554,7 @@ bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -4656,10 +4686,14 @@ mgt|Multi GNOME Terminal, +@@ -4792,10 +4822,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). @@ -547,7 +570,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -4787,14 +4821,14 @@ mlterm3|multi lingual terminal emulator, +@@ -4926,14 +4960,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, @@ -565,7 +588,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>, -@@ -4849,6 +4883,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -4988,6 +5022,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". @@ -573,7 +596,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -4860,13 +4895,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4999,13 +5034,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, @@ -591,7 +614,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, -@@ -4875,7 +4911,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5014,7 +5050,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, @@ -600,7 +623,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -4958,8 +4994,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5097,8 +5133,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, @@ -611,7 +634,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~, -@@ -4997,6 +5033,39 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5155,6 +5191,39 @@ 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, @@ -651,7 +674,7 @@ # 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, -@@ -5026,7 +5095,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5201,7 +5270,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -660,7 +683,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 -@@ -5040,13 +5109,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5215,13 +5284,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, @@ -676,7 +699,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=, -@@ -5537,7 +5606,7 @@ pty|4bsd pseudo teletype, +@@ -5785,7 +5854,7 @@ pty|4bsd pseudo teletype, #### Emacs # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -685,7 +708,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -5550,6 +5619,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -5798,6 +5867,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, @@ -699,7 +722,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, -@@ -5600,7 +5676,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -5897,7 +5973,7 @@ screen|VT 100/ANSI X3.64 virtual termina cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, 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@, @@ -708,7 +731,7 @@ 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, -@@ -5779,7 +5855,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6078,7 +6154,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, @@ -717,7 +740,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, -@@ -7513,7 +7589,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -7812,7 +7888,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, @@ -726,7 +749,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, -@@ -10647,6 +10723,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -10946,6 +11022,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) @@ -734,7 +757,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, -@@ -10656,7 +10733,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -10955,7 +11032,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, @@ -743,7 +766,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, -@@ -14932,7 +15009,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15231,7 +15308,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, @@ -752,7 +775,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, -@@ -15162,7 +15239,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -15461,7 +15538,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. @@ -773,10 +796,10 @@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000 -@@ -1993,6 +1993,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ - extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int); ++++ ncurses/curses.priv.h 2014-10-13 12:22:30.203838763 +0000 +@@ -2015,6 +2015,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); extern NCURSES_EXPORT(int) _nc_access (const char *, int); +extern NCURSES_EXPORT(void) _nc_fsid(void); +extern NCURSES_EXPORT(void) _nc_fseid(void); @@ -887,7 +910,7 @@ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c +++ ncurses/tinfo/read_entry.c 2011-02-28 13:41:44.000000000 +0000 -@@ -406,6 +406,7 @@ _nc_read_file_entry(const char *const fi +@@ -435,6 +435,7 @@ _nc_read_file_entry(const char *const fi int limit; char buffer[MAX_ENTRY_SIZE + 1]; @@ -895,7 +918,7 @@ if (_nc_access(filename, R_OK) < 0 || (fp = fopen(filename, "rb")) == 0) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); -@@ -423,6 +424,7 @@ _nc_read_file_entry(const char *const fi +@@ -452,6 +453,7 @@ _nc_read_file_entry(const char *const fi } fclose(fp); } @@ -952,7 +975,7 @@ if (copied != 0) --- test/test.priv.h +++ test/test.priv.h 2006-05-18 14:07:19.000000000 +0000 -@@ -708,12 +708,12 @@ extern char *strnames[], *strcodes[], *s +@@ -724,12 +724,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index bf25852..ac01474 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Oct 20 08:44:14 UTC 2014 - werner@suse.de + +- Add ncurses patch 20141018 + + reviewed terminology 0.6.1, add function key definitions. None of + the vt100-compatibility issues were improved -TD + + improve infocmp conversion of extended capabilities to termcap by + correcting the limit check against parametrized[], as well as filling + in a check if the string happens to have parameters, e.g., "xm" + in recent changes. + + add check for zero/negative dimensions for resizeterm and resize_term + (report by Mike Gran). + +------------------------------------------------------------------- +Mon Oct 13 12:15:12 UTC 2014 - werner@suse.de + +- Add ncurses patch 20141011 + + add experimental support for xterm's 1005 mouse mode, to use in a + demonstration of its limitations. + + add experimental support for "%u" format to terminfo. + + modify test/ncurses.c to also show position reports in 'a' test. + + minor formatting fixes to _nc_trace_mmask_t, make this function + exported to help with debugging mouse changes. + + improve behavior of wheel-mice for xterm protocol, noting that there + are only button-presses for buttons "4" and "5", so there is no need + to wait to combine events into double-clicks (report/analysis by + Greg Field). + + provide examples xterm-1005 and xterm-1006 terminfo entries -TD + + implement decoder for xterm SGR 1006 mouse mode. +- Adapt patch ncurses-5.9.dif + ------------------------------------------------------------------- Tue Sep 30 14:15:11 UTC 2014 - werner@suse.de