diff --git a/ncurses-6.4-patches.tar.bz2 b/ncurses-6.4-patches.tar.bz2 index e827778..9b90f24 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:7818f0684167542fb03adb5a77088d71faad3707e457b5ebf3799708b4c53d9e -size 2323846 +oid sha256:aea914ffefc9a780c74299e538e37489af846c4306569a1d0d07a5cb30667b72 +size 2490378 diff --git a/ncurses-6.4.dif b/ncurses-6.4.dif index 589f2dd..69be01f 100644 --- a/ncurses-6.4.dif +++ b/ncurses-6.4.dif @@ -4,7 +4,7 @@ include/curses.h.in | 5 + include/termcap.h.in | 2 include/tic.h | 4 - - man/man_db.renames.in | 1 + man/man_db.renames.in | 2 man/ncurses.3x | 6 +- misc/gen-pkgconfig.in | 25 +++++++++ misc/terminfo.src | 111 ++++++++++++++++++++++++++++++++++++-------- @@ -349,6 +349,13 @@ --- man/man_db.renames.in +++ man/man_db.renames.in 2024-01-08 12:25:15.355376927 +0000 + form_win.3x win.3form + infocmp.1m infocmp.1 + infotocap.1m infotocap.1 ++init.1 init.1ncurses + key_defined.3x key_defined.3ncurses + keybound.3x keybound.3ncurses + keyok.3x keyok.3ncurses @@ -266,6 +266,7 @@ wsetscrreg.3x wsetscrreg.3ncurses wtimeout.3x wtimeout.3ncurses # @@ -359,19 +366,17 @@ ttys.5 ttys.4 --- man/ncurses.3x +++ man/ncurses.3x 2024-01-08 12:35:28.107996289 +0000 -@@ -295,7 +295,11 @@ translates these into unique +@@ -295,6 +295,10 @@ translates these into unique .I "key codes." See \fB\%getch\fP(3X). .SS "Effects of GUIs and Environment Variables" --The selection of an approprate value of +Beware: the terminal your program is running may or may not have +the features you expect. Ncurses makes no attempt to check available +features in advance. This is upon the user. +.PP -+The selection of an appropriate value of + The selection of an appropriate value of .I TERM in the process environment is essential to correct - .I curses --- misc/gen-pkgconfig.in +++ misc/gen-pkgconfig.in 2024-01-08 12:23:15.665598033 +0000 @@ -83,6 +83,8 @@ if [ "$includedir" != "/usr/include" ]; @@ -458,7 +463,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1053,9 +1055,15 @@ linux-c|Linux console 1.3.6+ for older n +@@ -1044,9 +1046,15 @@ linux-c|Linux console 1.3.6+ for older n # The 2.2.x kernels add a private mode that sets the cursor type; use that to # get a block cursor for cvvis. # reported by Frank Heckenbach . @@ -475,7 +480,7 @@ # release 2.6: 2003/12 - 2004/12 # -@@ -1090,6 +1098,7 @@ linux2.6|Linux 2.6.x console, +@@ -1081,6 +1089,7 @@ linux2.6|Linux 2.6.x console, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, enacs=\E)0, rmacs=^O, @@ -483,7 +488,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, -@@ -5048,7 +5057,7 @@ xterm-new|modern xterm terminal emulator +@@ -5009,7 +5018,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, @@ -492,7 +497,7 @@ # Use this fragment for terminals that always use DEL for "backspace". linux+kbs|fragment for "backspace" key, -@@ -5431,7 +5440,7 @@ xterm+88color2|xterm 88-color feature, +@@ -5391,7 +5400,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, @@ -501,7 +506,7 @@ xterm-88color|xterm with 88 colors, use=xterm+osc104, use=xterm+88color, use=xterm-256color, -@@ -5706,9 +5715,25 @@ xterm-noapp|xterm with cursor keys in no +@@ -5666,9 +5675,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, @@ -528,7 +533,7 @@ # This entry assumes that xterm's handling of VT100 SI/SO is disabled by # setting the vt100Graphics resource to false. -@@ -6159,7 +6184,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -6115,7 +6140,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of GNOME terminal shipped with Redhat 6.0 @@ -537,7 +542,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=linux+kbs, use=xterm-color, -@@ -6444,11 +6469,15 @@ mgt|Multi GNOME Terminal, +@@ -6400,11 +6425,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). @@ -554,25 +559,25 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6702,7 +6731,7 @@ mlterm3|multi lingual terminal emulator +@@ -6658,7 +6687,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, lines#24, pairs#64, - acsc=00``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + acsc=++\,\,--..00II``aaffgghhjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, 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, -@@ -6775,7 +6804,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@, ind=\n, + bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r, cub1=^H, cud1=\n, + cup=\E[%i%p1%d;%p2%dH, dch=\E[%p1%dP, dch1=\E[P, + ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=, +@@ -6728,7 +6757,7 @@ rxvt-basic|rxvt terminal base (X Window + el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, + home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, 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, kbs=^H, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?, kcbt=\E[Z, kmous=\E[M, 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, -@@ -6870,8 +6899,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6824,8 +6853,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, @@ -583,7 +588,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~, -@@ -6959,6 +6988,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6913,6 +6942,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -622,7 +627,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, -@@ -7021,7 +7082,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6973,7 +7034,7 @@ Eterm|Eterm-color|Eterm with xterm-style home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, 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@, @@ -631,7 +636,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmkx=, rmso=\E[27m, rmul=\E[24m, -@@ -8263,7 +8324,7 @@ pty|4bsd pseudo teletype, +@@ -8198,7 +8259,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 @@ -639,11 +644,11 @@ +eterm-19|GNU Emacs term.el terminal emulation, am, mir, xenl, cols#80, lines#24, - bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr, -@@ -8274,6 +8335,13 @@ eterm|GNU Emacs term.el terminal emulati - rev=\E[7m, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, + bel=^G, bold=\E[1m, cr=\r, csr=\E[%i%p1%d;%p2%dr, cub1=^H, +@@ -8208,6 +8269,13 @@ eterm|GNU Emacs term.el terminal emulati smir=\E[4h, smso=\E[7m, smul=\E[4m, use=ansi+cpr, - use=ansi+erase, use=ansi+idl, use=xterm+alt47, + use=ansi+erase, use=ansi+idl, use=ansi+local, + use=xterm+alt47, +eterm|emacs|GNU Emacs term.el terminal emulation, + colors#8, pairs#64, + invis=\E[8m, kcub1=\EOD, kcud1=\EOB, @@ -654,7 +659,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, -@@ -8519,11 +8587,18 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -8452,11 +8520,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, @@ -674,16 +679,16 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. -@@ -8610,7 +8685,7 @@ screen2|VT 100/ANSI X3.64 virtual termin - clear=\E[2J\E[H, cr=\r, 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, ed=\E[J, -- el=\E[K, ich1=, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, -+ el=\E[K, ich1=, ind=\n, kbs=^?, kcub1=\ED, kcud1=\EB, +@@ -8541,7 +8616,7 @@ screen-w|VT 100/ANSI X3.64 virtual termi + screen2|VT 100/ANSI X3.64 virtual terminal (old 2.x), + cols#80, lines#24, + clear=\E[2J\E[H, cr=\r, cub1=^H, cup=\E[%i%p1%d;%p2%dH, +- ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^H, kcub1=\ED, kcud1=\EB, ++ ed=\E[J, el=\E[K, ich1=, ind=\n, kbs=^?, kcub1=\ED, kcud1=\EB, kcuf1=\EC, 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, rmso=\E[23m, -@@ -10562,7 +10637,7 @@ hp700-wy|HP 700/41 emulating Wyse30, +@@ -10479,7 +10554,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, @@ -692,7 +697,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, -@@ -18149,7 +18224,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -18026,7 +18101,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, @@ -701,7 +706,7 @@ is2=\E S, rmacs=\E>B, rs2=\E S, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -18389,7 +18464,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -18263,7 +18338,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De # "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 04e111a..5378ec5 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jan 15 08:07:35 UTC 2024 - Dr. Werner Fink + +- Add ncurses patch 20240113 + + improve formatting/style of manpages (patches by Branden Robinson). + + modify dist.mk to avoid passing developer's comments in manpages into + the generated html documentation. + + use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr + to trim -TD + + restore padding for wy520* and vt320-k311 (report by Sven Joachim). + ------------------------------------------------------------------- Tue Jan 9 10:06:22 UTC 2024 - Ludwig Nussel diff --git a/ncurses.spec b/ncurses.spec index 2cfab76..420c8d9 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1199,6 +1199,14 @@ pushd test install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses-examples/ popd +# +# Move manual page init.1 to init.1ncurses otherwise we conflict with +# systemd's anual page with same name +# +pushd %{buildroot}%{_mandir}/man1 + mv init.1 init.1ncurses +popd + %if 0%{?_crossbuild} # No test here %else @@ -1265,6 +1273,7 @@ popd %{_bindir}/tset %doc %{_mandir}/man1/clear.1%{ext_man} %doc %{_mandir}/man1/infocmp.1%{ext_man} +%doc %{_mandir}/man1/init.1*%{ext_man} %doc %{_mandir}/man1/reset.1%{ext_man} %doc %{_mandir}/man1/tabs.1%{ext_man} %doc %{_mandir}/man1/toe.1%{ext_man}