diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 5344253..78838ab 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 -@@ -18095,8 +18095,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -18105,8 +18105,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.4-patches.tar.bz2 b/ncurses-6.4-patches.tar.bz2 index a67b55d..bb878a7 100644 --- a/ncurses-6.4-patches.tar.bz2 +++ b/ncurses-6.4-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b87f2414fa0cb4a1378a576a58a7539ae01686fa639607ddfdef1994f52feaab -size 1370280 +oid sha256:b8940c0679a5a12464d504e2899a93f7918ba87412f9bd4ae2cf68fc77c6a6f7 +size 1641956 diff --git a/ncurses-6.4.dif b/ncurses-6.4.dif index 8a25306..aa654b7 100644 --- a/ncurses-6.4.dif +++ b/ncurses-6.4.dif @@ -18,8 +18,8 @@ 16 files changed, 203 insertions(+), 72 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2023-07-31 08:53:05.149222032 +0000 -@@ -6065,12 +6065,12 @@ 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_manpage_compress" ; then -@@ -6204,9 +6204,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <&6 +@@ -8055,7 +8055,7 @@ echo "${ECHO_T}$with_pcre2" >&6 if test "x$with_pcre2" != xno ; then cf_with_pcre2_ok=no @@ -174,7 +174,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -15242,12 +15242,12 @@ 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_manpage_compress" ; then -@@ -15381,9 +15381,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <. @@ -481,7 +481,7 @@ # release 2.6: 2003/12 - 2004/12 # -@@ -1097,6 +1105,7 @@ linux2.6|Linux 2.6.x console, +@@ -1100,6 +1108,7 @@ linux2.6|Linux 2.6.x console, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, enacs=\E)0, rmacs=^O, @@ -489,7 +489,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, -@@ -5038,7 +5047,7 @@ xterm-new|modern xterm terminal emulator +@@ -5041,7 +5050,7 @@ xterm-new|modern xterm terminal emulator # set it to BS (standard) or DEL (Linux's notion of "vt220"). xterm provides # either, depending on how the pseudoterminals are configured. xterm+kbs|fragment for backspace key, @@ -498,7 +498,7 @@ # Use this fragment for terminals that always use DEL for "backspace". linux+kbs|fragment for "backspace" key, -@@ -5424,7 +5433,7 @@ xterm+88color2|xterm 88-color feature, +@@ -5427,7 +5436,7 @@ xterm+88color2|xterm 88-color feature, # These variants of XFree86 3.9.16 xterm are built as a configure option. xterm-256color|xterm with 256 colors, @@ -507,7 +507,7 @@ xterm-88color|xterm with 88 colors, use=xterm+osc104, use=xterm+88color, use=xterm-256color, -@@ -5702,9 +5711,25 @@ xterm-noapp|xterm with cursor keys in no +@@ -5705,9 +5714,25 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator 24-line (X Window System), lines#24, use=xterm-old, @@ -534,7 +534,7 @@ # This entry assumes that xterm's handling of VT100 SI/SO is disabled by # setting the vt100Graphics resource to false. -@@ -6133,7 +6158,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -6143,7 +6168,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=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=linux+kbs, use=xterm-color, -@@ -6422,11 +6447,15 @@ mgt|Multi GNOME Terminal, +@@ -6432,11 +6457,15 @@ 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). @@ -560,7 +560,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6680,7 +6709,7 @@ mlterm3|multi lingual terminal emulator +@@ -6690,7 +6719,7 @@ mlterm3|multi lingual terminal emulator mlterm2|multi lingual terminal emulator 2.x, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -569,7 +569,7 @@ bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, 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, -@@ -6756,7 +6785,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6766,7 +6795,7 @@ rxvt-basic|rxvt terminal base (X Window enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, @@ -578,7 +578,7 @@ kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, 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, -@@ -6850,8 +6879,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6860,8 +6889,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|rxvt fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, @@ -589,7 +589,7 @@ 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~, kf2=\E[12~, kf20=\E[34~, -@@ -6939,6 +6968,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6949,6 +6978,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -628,7 +628,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, -@@ -7003,7 +7064,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -7013,7 +7074,7 @@ Eterm|Eterm-color|Eterm with xterm-style 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, is1=\E[?47l\E>\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@, @@ -637,7 +637,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, rmir=\E[4l, rmkx=, rmso=\E[27m, rmul=\E[24m, -@@ -8119,7 +8180,7 @@ pty|4bsd pseudo teletype, +@@ -8129,7 +8190,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 @@ -646,7 +646,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -8131,6 +8192,13 @@ eterm|GNU Emacs term.el terminal emulati +@@ -8141,6 +8202,13 @@ eterm|GNU Emacs term.el terminal emulati il=\E[%p1%dL, il1=\E[L, ind=\n, rev=\E[7m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, use=xterm+alt47, use=ansi+cpr, @@ -660,7 +660,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, -@@ -8379,11 +8447,18 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -8389,11 +8457,18 @@ screen.xterm-xfree86|screen.xterm-new|sc E3@, use=screen+italics, use=screen+fkeys, use=xterm+x11mouse, use=ecma+index, use=ansi+rep, use=ecma+strikeout, use=xterm+pcfkeys, @@ -680,7 +680,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. -@@ -8474,7 +8549,7 @@ screen2|VT 100/ANSI X3.64 virtual termin +@@ -8484,7 +8559,7 @@ screen2|VT 100/ANSI X3.64 virtual termin 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, @@ -689,7 +689,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, -@@ -10451,7 +10526,7 @@ hp700-wy|HP 700/41 emulating Wyse30, +@@ -10461,7 +10536,7 @@ hp700-wy|HP 700/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, @@ -698,7 +698,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, -@@ -18105,7 +18180,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -18115,7 +18190,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, @@ -707,7 +707,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 -@@ -18363,7 +18438,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -18373,7 +18448,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. @@ -786,8 +786,8 @@ done --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2023-01-23 13:00:47.043268809 +0000 -@@ -745,6 +745,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) ++++ ncurses/tinfo/lib_setup.c 2023-10-23 07:50:44.759971397 +0000 +@@ -747,6 +747,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ } else if ((env = getenv("TERM")) != 0) { diff --git a/ncurses.changes b/ncurses.changes index 9c5c39b..42dab96 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Oct 23 07:49:13 UTC 2023 - Dr. Werner Fink + +- Add ncurses patch 20231021 + + use oldxterm+sm+1006 in vte-2014 (report by Benno Schulenberg) -TD + + add ansi+apparrows -TD + + change defaults for configure opaque and widec options (prompted by + discussion with Branden Robinson). + + minor cleanup of compiler- and manpage-warnings. +- Correct offsets off some hunks in patches + * ncurses-5.9-ibm327x.dif + * ncurses-6.4.dif + +------------------------------------------------------------------- +Tue Oct 17 06:04:24 UTC 2023 - Dr. Werner Fink + +- Add ncurses patch 20231016 + + make the recent change to setupterm optional "--enable-check-size" + (Debian #1054022). + +------------------------------------------------------------------- +Mon Oct 16 07:20:05 UTC 2023 - Dr. Werner Fink + +- Add ncurses patch 20231014 + + improve formatting/style of manpages (patches by Branden Robinson). + + updated configure script macro CF_XOPEN_SOURCE, for uClibc-ng + + update config.guess, config.sub + ------------------------------------------------------------------- Mon Oct 9 07:54:55 UTC 2023 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index fa44007..f80a63f 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -576,6 +576,7 @@ export CFLAGS_SHARED --disable-wgetch-events \ --enable-pthreads-eintr \ --enable-string-hacks \ + --enable-check-size \ --prefix=%{_prefix} \ --exec-prefix=%{_prefix}\ --libdir=%{_libdir} \