diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2 index bd26ca3..1500fe0 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:71ce140b1c93f61f37c58e242452bc85226b027bd56694392bf65179d4c7298c -size 559417 +oid sha256:4a3c8b4e6e71e6c801f068af7a8e0607f79cb4795a70cdbb1131bbf45c296df1 +size 562246 diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif index 01fc31f..493c86a 100644 --- a/ncurses-6.0.dif +++ b/ncurses-6.0.dif @@ -21,7 +21,7 @@ 19 files changed, 239 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2016-04-18 08:38:10.132512940 +0000 ++++ aclocal.m4 2016-04-26 11:40:45.161925098 +0000 @@ -564,7 +564,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 2016-04-18 08:38:10.140512792 +0000 ++++ configure 2016-04-26 11:40:45.165925024 +0000 @@ -5867,7 +5867,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 2016-04-18 08:38:10.140512792 +0000 ++++ include/curses.h.in 2016-04-26 11:40:45.165925024 +0000 @@ -165,6 +165,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 2016-04-18 08:38:10.140512792 +0000 ++++ include/termcap.h.in 2016-04-26 11:40:45.165925024 +0000 @@ -46,6 +46,8 @@ extern "C" { #endif /* __cplusplus */ @@ -310,7 +310,7 @@ #undef NCURSES_CONST --- include/tic.h -+++ include/tic.h 2016-04-18 08:38:10.140512792 +0000 ++++ include/tic.h 2016-04-26 11:40:45.165925024 +0000 @@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias */ @@ -327,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- man/man_db.renames -+++ man/man_db.renames 2016-04-18 08:38:10.140512792 +0000 ++++ man/man_db.renames 2016-04-26 11:40:45.165925024 +0000 @@ -167,6 +167,8 @@ tput.1 tput.1 tset.1 tset.1 vprintf.3s vprintf.3 @@ -338,7 +338,7 @@ # Other: tack.1m tack.1 --- man/ncurses.3x -+++ man/ncurses.3x 2016-04-18 08:38:10.140512792 +0000 ++++ man/ncurses.3x 2016-04-26 11:40:45.165925024 +0000 @@ -121,6 +121,10 @@ after the shell environment variable \fB [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -351,7 +351,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 2016-04-18 08:38:10.140512792 +0000 ++++ misc/gen-pkgconfig.in 2016-04-26 11:40:45.165925024 +0000 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include" fi @@ -391,7 +391,7 @@ echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2016-04-18 08:38:10.140512792 +0000 ++++ misc/ncurses-config.in 2016-04-26 11:40:45.165925024 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -402,7 +402,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2016-04-18 08:38:10.200511681 +0000 ++++ misc/terminfo.src 2016-04-26 11:40:45.229923816 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -507,7 +507,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, -@@ -4400,8 +4412,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4401,8 +4413,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -534,7 +534,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -4736,7 +4766,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -4737,7 +4767,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -543,7 +543,7 @@ bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -4905,10 +4935,14 @@ mgt|Multi GNOME Terminal, +@@ -4906,10 +4936,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). @@ -559,7 +559,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -5038,14 +5072,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5039,14 +5073,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, @@ -577,7 +577,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>, -@@ -5100,6 +5134,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5101,6 +5135,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". @@ -585,7 +585,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5111,13 +5146,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5112,13 +5147,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, @@ -603,7 +603,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, -@@ -5126,7 +5162,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5127,7 +5163,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, @@ -612,7 +612,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5209,8 +5245,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5210,8 +5246,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, @@ -623,7 +623,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~, -@@ -5267,6 +5303,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5268,6 +5304,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, @@ -662,7 +662,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, -@@ -5313,7 +5381,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5314,7 +5382,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -671,7 +671,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 -@@ -5327,13 +5395,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5328,13 +5396,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, @@ -687,7 +687,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=, -@@ -5907,7 +5975,7 @@ pty|4bsd pseudo teletype, +@@ -5908,7 +5976,7 @@ pty|4bsd pseudo teletype, #### Emacs # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -696,7 +696,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -5920,6 +5988,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -5921,6 +5989,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, @@ -710,7 +710,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, -@@ -6020,7 +6095,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -6021,7 +6096,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, @@ -719,7 +719,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~, -@@ -6216,7 +6291,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6217,7 +6292,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, @@ -728,7 +728,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, -@@ -7959,7 +8034,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -7960,7 +8035,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, @@ -737,7 +737,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, -@@ -11094,6 +11169,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -11095,6 +11170,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) @@ -745,7 +745,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, -@@ -11103,7 +11179,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -11104,7 +11180,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, @@ -754,7 +754,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, -@@ -15379,7 +15455,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15380,7 +15456,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, @@ -763,7 +763,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, -@@ -15620,7 +15696,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -15621,7 +15697,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,7 +773,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 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/Makefile.in 2016-04-26 11:40:45.173924873 +0000 @@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -784,7 +784,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 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/curses.priv.h 2016-04-26 11:40:45.173924873 +0000 @@ -2024,6 +2024,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); @@ -795,7 +795,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 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/run_cmd.sh 2016-04-26 11:40:45.173924873 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -809,7 +809,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/tinfo/MKfallback.sh 2016-04-26 11:40:45.173924873 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -842,7 +842,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/tinfo/access.c 2016-04-26 11:40:45.173924873 +0000 @@ -35,6 +35,9 @@ #include @@ -885,7 +885,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/tinfo/lib_setup.c 2016-04-26 11:40:45.177924797 +0000 @@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -897,7 +897,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/tinfo/read_entry.c 2016-04-26 11:40:45.177924797 +0000 @@ -435,6 +435,7 @@ _nc_read_file_entry(const char *const fi int limit; char buffer[MAX_ENTRY_SIZE + 1]; @@ -915,7 +915,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2016-04-18 08:38:10.144512718 +0000 ++++ ncurses/tinfo/read_termcap.c 2016-04-26 11:40:45.177924797 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -962,7 +962,7 @@ } if (copied != 0) --- test/test.priv.h -+++ test/test.priv.h 2016-04-18 08:38:10.144512718 +0000 ++++ test/test.priv.h 2016-04-26 11:40:45.177924797 +0000 @@ -728,12 +728,12 @@ extern char *strnames[], *strcodes[], *s #endif diff --git a/ncurses.changes b/ncurses.changes index 5242057..5377d7d 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 26 11:39:18 UTC 2016 - werner@suse.de + +- Add ncurses patch 20160423 + + modify test/ncurses.c 'd' edit-color menu to optionally read xterm + color palette directly from terminal, as well as handling KEY_RESIZE + and screen-repainting with control/L and control/R. + + add 'oc' capability to xterm+256color, allowing palette reset for + xterm -TD + ------------------------------------------------------------------- Mon Apr 18 08:34:22 UTC 2016 - werner@suse.de