From 0118529067ac41c1b7ead52be6111abe5f80d9276996108d6461241fdfb83239 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 2 Aug 2021 07:29:07 +0000 Subject: [PATCH 1/3] Update to ncurses 6.2 patch 20210731 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=560 --- ncurses-5.9-ibm327x.dif | 2 +- ncurses-6.2-patches.tar.bz2 | 4 ++-- ncurses-6.2.dif | 36 ++++++++++++++++++------------------ ncurses.changes | 9 +++++++++ 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 3d6e50f..968529b 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 -@@ -17560,8 +17560,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17624,8 +17624,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 47560da..bace6bf 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:297caf38f283c314752e73bb8475fc0798858cca9a3fcda94d1b2fcd2c39aa99 -size 3223666 +oid sha256:139f4ae153922f08ad50da259e7c3de8e9eba393e0a485b26448ebd808bd3e00 +size 3225249 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index b6eca53..0324866 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -418,7 +418,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1013,9 +1015,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -1015,9 +1017,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 . @@ -435,7 +435,7 @@ # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: # http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html -@@ -1048,6 +1056,7 @@ linux2.6|linux 2.6.x console, +@@ -1050,6 +1058,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, enacs=\E)0, rmacs=^O, @@ -443,7 +443,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, -@@ -5402,8 +5411,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5410,8 +5419,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -470,7 +470,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5748,7 +5775,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5756,7 +5783,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -479,7 +479,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -6020,10 +6047,14 @@ mgt|Multi GNOME Terminal, +@@ -6028,10 +6055,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). @@ -495,7 +495,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6275,7 +6306,7 @@ mlterm3|multi lingual terminal emulator, +@@ -6283,7 +6314,7 @@ 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, @@ -504,7 +504,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, -@@ -6352,7 +6383,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6360,7 +6391,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, @@ -513,7 +513,7 @@ kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, -@@ -6447,8 +6478,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6455,8 +6486,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, @@ -524,7 +524,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~, -@@ -6538,6 +6569,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6546,6 +6577,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -563,7 +563,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, -@@ -6602,7 +6665,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6610,7 +6673,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@, @@ -572,7 +572,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=, -@@ -7640,7 +7703,7 @@ pty|4bsd pseudo teletype, +@@ -7704,7 +7767,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 @@ -581,7 +581,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7653,6 +7716,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7717,6 +7780,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, @@ -595,7 +595,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, -@@ -7780,7 +7850,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7844,7 +7914,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, @@ -604,7 +604,7 @@ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, 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~, -@@ -7900,6 +7970,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -7964,6 +8034,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -618,7 +618,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, -@@ -7987,7 +8064,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -8051,7 +8128,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, @@ -627,7 +627,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, -@@ -9923,7 +10000,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9987,7 +10064,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, @@ -636,7 +636,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, -@@ -17570,7 +17647,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17634,7 +17711,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, @@ -645,7 +645,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 -@@ -17828,7 +17905,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17892,7 +17969,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. diff --git a/ncurses.changes b/ncurses.changes index e947462..913e4e7 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 2 07:25:37 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210731 + + add extensions in xterm+tmux and ecma+strikeout to ms-terminal, + but cancel the non-working Cr and Ms capabilities -TD + + add foot and foot-direct -TD +- Correct offsets of patch ncurses-6.2.dif + ------------------------------------------------------------------- Mon Jul 26 06:46:16 UTC 2021 - Dr. Werner Fink From 9c8cce4806cb9937ef21fb1e2ef2aadf9c4d4912258221ad63a0a168d99b9795 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 10 Aug 2021 13:24:18 +0000 Subject: [PATCH 2/3] repair OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=566 --- ncurses-6.2-patches.tar.bz2 | 4 ++-- ncurses-6.2.dif | 24 ++++++++++++------------ ncurses.changes | 9 +++++++++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index bace6bf..6f4aec3 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:139f4ae153922f08ad50da259e7c3de8e9eba393e0a485b26448ebd808bd3e00 -size 3225249 +oid sha256:a68c9c59e53312eefa93e9d0c030f6d54bc7a606a623a75fe52135d4cfb109d1 +size 3279091 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 0324866..b838f90 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -157,7 +157,7 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -7514,7 +7514,7 @@ echo "${ECHO_T}$with_pcre2" >&6 +@@ -7525,7 +7525,7 @@ echo "${ECHO_T}$with_pcre2" >&6 if test "x$with_pcre2" != xno ; then cf_with_pcre2_ok=no @@ -166,7 +166,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -14635,12 +14635,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 -@@ -14765,9 +14768,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}" @@ -396,7 +396,7 @@ desc="$desc add-on library" fi -@@ -205,6 +211,8 @@ do +@@ -208,6 +214,8 @@ do [ $NEED_TINFO != yes ] ; then [ -n "$reqs" ] && reqs="$reqs, " reqs="${reqs}${SUB_LIBRARY}${suffix}" diff --git a/ncurses.changes b/ncurses.changes index 913e4e7..6fb314d 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 9 06:52:26 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210807 + + ignore "--dynamic-linker" option in generated pkg/config files, + adapted from "distr1" patch. + + add CF_SHARED_OPTS case for Haiku, from patch in haikuports. +- Correct offsets of patch ncurses-6.2.dif + ------------------------------------------------------------------- Mon Aug 2 07:25:37 UTC 2021 - Dr. Werner Fink From f3c447aeb1f9eff6c6f8d43b273a2a4a7faecc18b447b63451f497581f5e9645 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 16 Aug 2021 07:13:06 +0000 Subject: [PATCH 3/3] Update to ncurses-6.2 patch 20210814 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=567 --- ncurses-6.2-patches.tar.bz2 | 4 ++-- ncurses-6.2.dif | 16 ++++++++-------- ncurses.changes | 7 +++++++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 6f4aec3..c8f8cba 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a68c9c59e53312eefa93e9d0c030f6d54bc7a606a623a75fe52135d4cfb109d1 -size 3279091 +oid sha256:df4473b7d9f606a00457b96b1aa0ab52ad78e4a361da541f260dbf4aa92b6bcf +size 3322249 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index b838f90..8ecfd9f 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -166,7 +166,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -14646,12 +14646,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 -@@ -14776,9 +14779,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < + +- Add ncurses patch 20210814 + + add workaround for broken pcre2 package in Debian 10, from xterm #369. +- Correct offsets of patch ncurses-6.2.dif + ------------------------------------------------------------------- Mon Aug 9 06:52:26 UTC 2021 - Dr. Werner Fink