From fb27bae17514a453e1259d6379b85fa96acb377b88ba3b4a61117138bb5b9542 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 23 Jan 2024 21:55:03 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/ncurses revision 257 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=d2fa1e3180a8b465da1dc70e4f8e88c0 --- ncurses-6.4-patches.tar.bz2 | 4 +- ncurses-6.4.dif | 88 +++++++++++++++---------------------- ncurses.changes | 12 +++++ ncurses.spec | 9 ---- 4 files changed, 49 insertions(+), 64 deletions(-) diff --git a/ncurses-6.4-patches.tar.bz2 b/ncurses-6.4-patches.tar.bz2 index 9b90f24..8164d27 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:aea914ffefc9a780c74299e538e37489af846c4306569a1d0d07a5cb30667b72 -size 2490378 +oid sha256:8648fafa81c207233534279ab546a30ab1d458de1624683cb8d26cda1f1dc91d +size 2596534 diff --git a/ncurses-6.4.dif b/ncurses-6.4.dif index 69be01f..0819bb7 100644 --- a/ncurses-6.4.dif +++ b/ncurses-6.4.dif @@ -144,7 +144,7 @@ esac done --- configure -+++ configure 2024-01-08 12:23:15.661598107 +0000 ++++ configure 2024-01-22 07:24:19.892787328 +0000 @@ -6443,7 +6443,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; @@ -174,7 +174,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -15290,12 +15290,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 -@@ -15429,9 +15429,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < #undef GCC_NORETURN #define GCC_NORETURN _Noreturn -@@ -226,6 +226,9 @@ typedef @cf_cv_typeof_chtype@ chtype; +@@ -240,6 +240,9 @@ typedef @cf_cv_typeof_chtype@ chtype; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -451,7 +451,7 @@ if [ $name = $MAIN_LIBRARY ] --- misc/terminfo.src -+++ misc/terminfo.src 2024-01-08 12:43:33.690969798 +0000 ++++ misc/terminfo.src 2024-01-22 07:33:23.942613573 +0000 @@ -305,7 +305,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -463,7 +463,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1044,9 +1046,15 @@ linux-c|Linux console 1.3.6+ for older n +@@ -1043,9 +1045,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 . @@ -480,7 +480,7 @@ # release 2.6: 2003/12 - 2004/12 # -@@ -1081,6 +1089,7 @@ linux2.6|Linux 2.6.x console, +@@ -1080,6 +1088,7 @@ linux2.6|Linux 2.6.x console, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, enacs=\E)0, rmacs=^O, @@ -488,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, -@@ -5009,7 +5018,7 @@ xterm-new|modern xterm terminal emulator +@@ -4987,7 +4996,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, @@ -497,7 +497,7 @@ # Use this fragment for terminals that always use DEL for "backspace". linux+kbs|fragment for "backspace" key, -@@ -5391,7 +5400,7 @@ xterm+88color2|xterm 88-color feature, +@@ -5366,7 +5375,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, @@ -506,7 +506,7 @@ xterm-88color|xterm with 88 colors, use=xterm+osc104, use=xterm+88color, use=xterm-256color, -@@ -5666,9 +5675,25 @@ xterm-noapp|xterm with cursor keys in no +@@ -5639,9 +5648,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, @@ -533,7 +533,7 @@ # This entry assumes that xterm's handling of VT100 SI/SO is disabled by # setting the vt100Graphics resource to false. -@@ -6115,7 +6140,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -6089,7 +6114,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of GNOME terminal shipped with Redhat 6.0 @@ -542,7 +542,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=linux+kbs, use=xterm-color, -@@ -6400,11 +6425,15 @@ mgt|Multi GNOME Terminal, +@@ -6374,11 +6399,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). @@ -559,7 +559,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6658,7 +6687,7 @@ mlterm3|multi lingual terminal emulator +@@ -6632,7 +6661,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, @@ -568,27 +568,18 @@ 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, -@@ -6824,8 +6853,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6795,8 +6824,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, - kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B, -- kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, kf1=\E[11~, +- kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, + kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\EOD, kcud1=\EOB, -+ kcuf1=\EOC, kcuu1=\EOA, kel=\E[8\^, 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~, kf2=\E[12~, kf20=\E[34~, -@@ -6913,6 +6942,38 @@ rxvt-cygwin-native|rxvt terminal emulato ++ kcuf1=\EOC, kcuu1=\EOA, kel=\E[8\^, kend=\E[8~, + kf21=\E[23$, kf22=\E[24$, kf23=\E[11\^, kf24=\E[12\^, + kf25=\E[13\^, kf26=\E[14\^, kf27=\E[15\^, kf28=\E[17\^, + kf29=\E[18\^, kf30=\E[19\^, kf31=\E[20\^, kf32=\E[21\^, +@@ -6880,6 +6909,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -627,16 +618,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, -@@ -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@, -- kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H, -+ kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^?, - 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, -@@ -8198,7 +8259,7 @@ pty|4bsd pseudo teletype, +@@ -8134,7 +8195,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 @@ -645,7 +627,7 @@ am, mir, xenl, cols#80, lines#24, 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 +@@ -8144,6 +8205,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=ansi+local, use=xterm+alt47, @@ -659,7 +641,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, -@@ -8452,11 +8520,18 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -8387,11 +8455,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, @@ -679,7 +661,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. -@@ -8541,7 +8616,7 @@ screen-w|VT 100/ANSI X3.64 virtual termi +@@ -8476,7 +8551,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, @@ -688,7 +670,7 @@ 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, -@@ -10479,7 +10554,7 @@ hp700-wy|HP 700/41 emulating Wyse30, +@@ -10409,7 +10484,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, @@ -697,7 +679,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, -@@ -18026,7 +18101,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17925,7 +18000,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, @@ -706,7 +688,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 -@@ -18263,7 +18338,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -18161,7 +18236,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 5378ec5..3c4d42c 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Jan 22 07:20:53 UTC 2024 - Dr. Werner Fink + +- Add ncurses patch 20240120 + + improve formatting/style of manpages (patches by Branden Robinson). + + amend discussion of aliases in tput.1 + + use ansi+sgrbold, ansi+sgrdim, ansi+sgrso, ansi+sgrul, ansi+tabs + ecma+color, ecma+sgr, vt100+4bsd, vt100+pfkeys, vt220+pcedit + xterm+256color, xterm+acs, xterm+nopcfkeys, xterm+pcf2 to trim -TD + + modify configure scripts/makefiles to omit KEY_RESIZE if the + corresponding SIGWINCH feature is disabled. + ------------------------------------------------------------------- Mon Jan 15 08:07:35 UTC 2024 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 420c8d9..2cfab76 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1199,14 +1199,6 @@ 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 @@ -1273,7 +1265,6 @@ 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}