diff --git a/ncurses-5.7-tack.dif b/ncurses-5.7-tack.dif index 30aa196..ab5501f 100644 --- a/ncurses-5.7-tack.dif +++ b/ncurses-5.7-tack.dif @@ -3,8 +3,8 @@ 1 file changed, 5 insertions(+), 5 deletions(-) --- tack/Makefile.in -+++ tack/Makefile.in 2018-01-22 11:17:39.717358930 +0000 -@@ -84,7 +84,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) ++++ tack/Makefile.in 2020-02-12 11:04:53.991231022 +0000 +@@ -85,7 +85,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_PROFILE = $(CCFLAGS) -pg @@ -13,7 +13,7 @@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) -@@ -93,7 +93,7 @@ ABI_VERSION = @cf_cv_abi_version@ +@@ -94,7 +94,7 @@ ABI_VERSION = @cf_cv_abi_version@ LOCAL_LIBDIR = @top_builddir@/lib LD = @LD@ @@ -22,7 +22,7 @@ LDFLAGS = @EXTRA_LDFLAGS@ @TINFO_LDFLAGS@ \ @LDFLAGS@ @LD_MODEL@ @TINFO_LIBS@ @LIBS@ -@@ -101,7 +101,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI +@@ -102,7 +102,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG) LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) @@ -31,7 +31,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) -@@ -165,10 +165,10 @@ DEPS_TACK = \ +@@ -166,10 +166,10 @@ DEPS_TACK = \ $(MODEL)/tack$o tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index f832fd7..4f3133c 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 -@@ -17044,8 +17044,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17051,8 +17051,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 deleted file mode 100644 index ce6a5c2..0000000 --- a/ncurses-6.1-patches.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b58c0c1f395e26837ef5ac61108bfd63cb57f5be2ed1207b5099492d7773f11a -size 2033554 diff --git a/ncurses-6.1.tar.gz b/ncurses-6.1.tar.gz deleted file mode 100644 index 8acbf8a..0000000 --- a/ncurses-6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 -size 3365395 diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 new file mode 100644 index 0000000..83acd9e --- /dev/null +++ b/ncurses-6.2-patches.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9baa9af598a438ab2ff39172f40f63a52604067983c033a811a9d591224a2689 +size 10048 diff --git a/ncurses-6.1.dif b/ncurses-6.2.dif similarity index 87% rename from ncurses-6.1.dif rename to ncurses-6.2.dif index 878c44d..c154c45 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.2.dif @@ -21,8 +21,8 @@ 19 files changed, 248 insertions(+), 77 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2019-11-11 09:30:23.206670737 +0000 -@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) ++++ aclocal.m4 2020-02-12 11:05:15.034837378 +0000 +@@ -583,7 +583,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out AC_TRY_RUN([ @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -5280,12 +5280,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 -@@ -5410,9 +5413,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 -@@ -14212,9 +14215,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man </dev/null ; then reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" @@ -389,7 +389,7 @@ desc="$desc add-on library" fi -@@ -153,6 +159,8 @@ do +@@ -163,6 +169,8 @@ do [ $NEED_TINFO != yes ] ; then [ -n "$reqs" ] && reqs="$reqs, " reqs="${reqs}${SUB_LIBRARY}${suffix}" @@ -399,7 +399,7 @@ if [ $name = $MAIN_LIBRARY ] --- misc/terminfo.src -+++ misc/terminfo.src 2019-11-11 09:30:23.214670585 +0000 ++++ misc/terminfo.src 2020-02-12 11:05:15.042837228 +0000 @@ -305,7 +305,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -531,7 +531,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5406,7 +5437,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5407,7 +5438,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -540,7 +540,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5657,10 +5688,14 @@ mgt|Multi GNOME Terminal, +@@ -5658,10 +5689,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). @@ -556,7 +556,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -5872,14 +5907,14 @@ mlterm3|multi lingual terminal emulator, +@@ -5873,14 +5908,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, @@ -574,7 +574,7 @@ 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, is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?, -@@ -5936,6 +5971,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5937,6 +5972,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". @@ -582,7 +582,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5947,13 +5983,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5948,13 +5984,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, @@ -600,7 +600,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, -@@ -5964,7 +6001,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5965,7 +6002,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, @@ -609,7 +609,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -6047,8 +6084,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6048,8 +6085,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, @@ -620,7 +620,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~, -@@ -6139,6 +6176,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6140,6 +6177,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -659,7 +659,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, -@@ -6185,7 +6254,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -6186,7 +6255,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -668,7 +668,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 -@@ -6199,12 +6268,12 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6200,12 +6269,12 @@ 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=, -@@ -7151,7 +7220,7 @@ pty|4bsd pseudo teletype, +@@ -7158,7 +7227,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, -@@ -7164,6 +7233,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7171,6 +7240,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,7 +706,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, -@@ -7292,7 +7368,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7299,7 +7375,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, @@ -715,7 +715,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, -@@ -7413,6 +7489,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -7420,6 +7496,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, -@@ -7500,7 +7583,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -7507,7 +7590,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, -@@ -9403,7 +9486,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9410,7 +9493,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, -@@ -12633,6 +12716,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12640,6 +12723,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, -@@ -12642,7 +12726,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12649,7 +12733,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, -@@ -17054,7 +17138,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17061,7 +17145,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,7 +773,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 -@@ -17312,7 +17396,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17319,7 +17403,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. @@ -783,8 +783,8 @@ 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-11-11 09:30:23.214670585 +0000 -@@ -222,7 +222,7 @@ $(DESTDIR)$(libdir) : ++++ ncurses/Makefile.in 2020-02-12 11:05:15.042837228 +0000 +@@ -224,7 +224,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ ./fallback.c : $(tinfo)/MKfallback.sh @@ -794,8 +794,8 @@ ./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-11-11 09:30:23.214670585 +0000 -@@ -2244,6 +2244,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2020-02-12 11:05:15.042837228 +0000 +@@ -2245,6 +2245,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); @@ -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-11-11 09:30:23.214670585 +0000 ++++ ncurses/run_cmd.sh 2020-02-12 11:05:15.042837228 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -819,8 +819,8 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2019-11-11 09:30:23.214670585 +0000 -@@ -71,6 +71,12 @@ else ++++ ncurses/tinfo/MKfallback.sh 2020-02-12 11:05:15.042837228 +0000 +@@ -72,6 +72,12 @@ else tmp_info= fi @@ -834,8 +834,8 @@ /* This file was generated by $0 */ --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2019-11-11 09:30:23.214670585 +0000 -@@ -30,6 +30,10 @@ ++++ ncurses/tinfo/access.c 2020-02-12 11:05:15.042837228 +0000 +@@ -31,6 +31,10 @@ * Author: Thomas E. Dickey * ****************************************************************************/ @@ -846,7 +846,7 @@ #include #include -@@ -104,6 +108,30 @@ _nc_basename(char *path) +@@ -105,6 +109,30 @@ _nc_basename(char *path) return path + _nc_pathlast(path); } @@ -878,8 +878,8 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2019-11-11 09:30:23.214670585 +0000 -@@ -604,6 +604,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) ++++ ncurses/tinfo/lib_setup.c 2020-02-12 11:05:15.042837228 +0000 +@@ -605,6 +605,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ } else if ((env = getenv("TERM")) != 0) { @@ -890,8 +890,8 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2019-11-11 09:30:23.214670585 +0000 -@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi ++++ ncurses/tinfo/read_entry.c 2020-02-12 11:05:15.042837228 +0000 +@@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -899,7 +899,7 @@ if (_nc_access(filename, R_OK) < 0 || (fp = fopen(filename, BIN_R)) == 0) { TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); -@@ -571,6 +572,7 @@ _nc_read_file_entry(const char *const fi +@@ -572,6 +573,7 @@ _nc_read_file_entry(const char *const fi } fclose(fp); } @@ -908,8 +908,8 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2019-11-11 09:30:23.214670585 +0000 -@@ -322,14 +322,18 @@ _nc_getent( ++++ ncurses/tinfo/read_termcap.c 2020-02-12 11:05:15.042837228 +0000 +@@ -323,14 +323,18 @@ _nc_getent( */ if (fd >= 0) { (void) lseek(fd, (off_t) 0, SEEK_SET); @@ -935,7 +935,7 @@ myfd = TRUE; } lineno = 0; -@@ -1122,8 +1126,10 @@ _nc_read_termcap_entry(const char *const +@@ -1123,8 +1127,10 @@ _nc_read_termcap_entry(const char *const for (i = 0; i < filecount; i++) { TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i])); @@ -946,7 +946,7 @@ _nc_set_source(termpaths[i]); /* -@@ -1135,6 +1141,7 @@ _nc_read_termcap_entry(const char *const +@@ -1136,6 +1142,7 @@ _nc_read_termcap_entry(const char *const (void) fclose(fp); } @@ -955,8 +955,8 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2019-11-11 09:30:23.214670585 +0000 -@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) ++++ progs/Makefile.in 2020-02-12 11:05:15.042837228 +0000 +@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_PROFILE = $(CCFLAGS) -pg @@ -965,7 +965,7 @@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) -@@ -117,7 +117,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI +@@ -118,7 +118,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG) LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) @@ -975,8 +975,8 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2019-11-11 09:30:23.214670585 +0000 -@@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *, ++++ test/test.priv.h 2020-02-12 11:05:15.042837228 +0000 +@@ -994,12 +994,12 @@ extern char *_nc_strstr(const char *, co #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses-6.2.tar.gz b/ncurses-6.2.tar.gz new file mode 100644 index 0000000..06243b2 --- /dev/null +++ b/ncurses-6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d +size 3425862 diff --git a/ncurses.changes b/ncurses.changes index 326016e..154de9e 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Mon Feb 17 08:37:54 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200215 + + improve manual page for panel library, extending the portability + section as well as documenting error-returns. + + show tic's version when installing terminal database in run_tic.sh + + correct check for gcc vs other compilers used in ncurses 6.0, from + FreeBSD patch by Kyle Evans (cf: 20150725). + + add notes for 6.2 to INSTALL. + +------------------------------------------------------------------- +Wed Feb 12 10:55:11 UTC 2020 - Dr. Werner Fink + +- Update to ncurses 6.2 (patch 20200212) + * Add 20200212 6.2 release for upload to ftp.gnu.org + + update release notes + + minor build-fixes, mostly to test-package scripts + * Add ncurses patch20200208 + + modify check for sizeof(wchar_t) to ensure it gives useful result + when cross-compiling. + + drop assumption in configure script that Cygwin's linker is broken. + + define NCURSES_BROKEN_LINKER if the broken-linker feature is used, + to simplify configure-checks for ncurses-examples. + * Add ncurses patch20200202 + + reassert copyright on ncurses, per discussion in ncurses FAQ: + https://invisible-island.net/ncurses/ncurses.faq.html#relicensed + * Add ncurses patch20200201 + + modify comparison in make_hash.c to correct a special case in + collision handling for Caps-hpux11 + + add testing utility report_hashing to check hash-tables used for + terminfo and termcap names. + + fix a missing prototype for _nc_free_and_exit(). + + update a few comments about tack 1.07 + + use an awk script to split too-long pathnames used in Ada95 sample + programs for explain.txt +- Update to tack 1.9 (patch 20200202) + * Update copyright and license. Also, portability fixes. +- Adopt patch ncurses-5.7-tack.dif +- Adopt patch ncurses-6.1.dif which is now ncurses-6.2.dif + +------------------------------------------------------------------- +Mon Jan 20 07:14:28 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200118 + + expanded description of XM in user_caps.5 + + improve xm example for xterm+x11mouse, xterm+sm+1006 -TD + + add history section to curs_slk.3x and curs_terminfo.3x manpages. + + update alacritty entries for 0.4.0 (prompted by patch by + Christian Durr) -TD + + correct spelling errors found with codespell. + + fix for test/configure, from xterm #352. + +------------------------------------------------------------------- +Mon Jan 13 09:14:28 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20200111 + + improve configure macros which check for the X11/Intrinsic.h header, + to accommodate recent MacOS changes. + + suppress gcc's -Winline warning; it has not been useful for some time + + update config.guess, config.sub + ------------------------------------------------------------------- Tue Jan 7 09:12:06 UTC 2020 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index efea475..49d91d2 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -56,23 +56,23 @@ Obsoletes: ncurses-64bit # but also build the ABI version 5 as this is part of the source # tar ball including the latest upstream fixes for ABI 5. # -Version: 6.1 +Version: 6.2 Release: 0 Summary: Terminal control library #Git: http://ncurses.scripts.mit.edu License: MIT Group: System/Base URL: http://www.invisible-island.net/ncurses/ncurses.html -Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.1.tar.gz -Source1: ncurses-6.1-patches.tar.bz2 +Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.2.tar.gz +Source1: ncurses-6.2-patches.tar.bz2 Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc # Latest tack can be found at ftp://ftp.invisible-island.net/pub/ncurses/current/ -Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.08-20190721.tgz +Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.09-20200202.tgz Source6: edit.sed Source7: baselibs.conf -Patch0: ncurses-6.1.dif +Patch0: ncurses-6.2.dif Patch1: ncurses-5.9-ibm327x.dif Patch2: ncurses-5.7-tack.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1044,7 +1044,13 @@ includedir5=%{_incdir}/ncurses5' "$pc" sed "s@^%{buildroot}@@g" | \ grep -v -F -x -f default.list -f screen.list -f iterm.list \ > extension.list +# +# Remove backward compatibilty link if any +# rm -f %{buildroot}%{_prefix}/lib/terminfo +# +# Store pkg-config files +# cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ %if 0%{?qemu_user_space_build:1}%{?_crossbuild} diff --git a/tack-1.08-20190721.tgz b/tack-1.08-20190721.tgz deleted file mode 100644 index 2b2608a..0000000 --- a/tack-1.08-20190721.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f480c8df1b706f0d65d04fca0486e327cde68acd1a8b819e9860b62a7c9aa7ac -size 232840 diff --git a/tack-1.09-20200202.tgz b/tack-1.09-20200202.tgz new file mode 100644 index 0000000..f2cc523 --- /dev/null +++ b/tack-1.09-20200202.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6117f8045e55302cbdc16217342b6169384ddd51873d072c60ca80846f0ea0e0 +size 237953