From 118be40b4f1c1ac2999207a2496852c242fc197c13799aeaf2969384192d171a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 20 Nov 2020 13:11:28 +0000 Subject: [PATCH 1/4] Accepting request 849664 from home:lnussel:usrmove - install to /usr (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/849664 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=516 --- ncurses.changes | 5 +++++ ncurses.spec | 33 +++++++++++++++------------------ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ncurses.changes b/ncurses.changes index c98d940..181cfb2 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -12,6 +12,11 @@ Mon Nov 2 07:43:02 UTC 2020 - Dr. Werner Fink is supported. IBM's xlclang does not support it (report by Steven Pitman). +------------------------------------------------------------------- +Wed Oct 28 14:42:54 UTC 2020 - Ludwig Nussel + +- install to /usr (boo#1029961) + ------------------------------------------------------------------- Mon Oct 26 12:31:53 UTC 2020 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index f87123c..10042ac 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -878,14 +878,13 @@ includedir5=%{_incdir}/ncurses5' "$pc" PATH=$PWD/gzip:$PATH (cd %{root}/; tar -cpSf - *)|tar -xpsSf - -C %{buildroot}/ rm -rf %{root} - mkdir %{buildroot}/%{_lib} for model in libncurses libncursest libncursesw libncursestw libtinfo libtinfow libtic libticw do for lib in %{buildroot}%{_libdir}/${model}.so.* ; do test -e "${lib}" || continue - mv "${lib}" %{buildroot}/%{_lib}/ || continue + mv "${lib}" %{buildroot}%{_libdir}/ || continue done - for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do + for lib in %{buildroot}%{_libdir}/${model}.so.6 ; do test -e "${lib}" || continue test -L "${lib}" || continue lib=${lib#%{buildroot}} @@ -905,21 +904,21 @@ includedir5=%{_incdir}/ncurses5' "$pc" esac done done - /sbin/ldconfig -r %{buildroot}/ -n -v /%{_lib} + /sbin/ldconfig -r %{buildroot}/ -n -v %{_libdir} %if 0 lnk=%{buildroot}%{_libdir}/libtermcap.so echo '/* GNU ld script */' > ${lnk} echo "INPUT(AS_NEEDED(-ltinfo))" >> ${lnk} %endif - chmod 0755 %{buildroot}/%{_lib}/lib*.so.* - chmod 0755 %{buildroot}/%{_libdir}/lib*.so.* - chmod a-x %{buildroot}/%{_libdir}/lib*.a + chmod 0755 %{buildroot}%{_libdir}/lib*.so.* + chmod 0755 %{buildroot}%{_libdir}/lib*.so.* + chmod a-x %{buildroot}%{_libdir}/lib*.a if test -d %{buildroot}%{_libdir}/ncurses5 ; then mv %{buildroot}%{_libdir}/ncurses5/*.so.5* %{buildroot}%{_libdir}/ for lib in %{buildroot}%{_libdir}/ncurses5/*.so do lnk=$lib - lib=/%{_lib}/${lib##*/}.5 + lib=%{_libdir}/${lib##*/}.5 case "${lib##*/}" in libncursesw*) rm -f "${lnk}" @@ -944,9 +943,9 @@ includedir5=%{_incdir}/ncurses5' "$pc" do for lib in %{buildroot}%{_libdir}/${model}.so.* ; do test -e "${lib}" || continue - mv "${lib}" %{buildroot}/%{_lib}/ || continue + mv "${lib}" %{buildroot}%{_libdir}/ || continue done - for lib in %{buildroot}/%{_lib}/${model}.so.5 ; do + for lib in %{buildroot}%{_libdir}/${model}.so.5 ; do test -e "${lib}" || continue test -L "${lib}" || continue lib=${lib#%{buildroot}} @@ -968,9 +967,9 @@ includedir5=%{_incdir}/ncurses5' "$pc" esac done done - chmod 0755 %{buildroot}/%{_lib}/lib*.so.5* - chmod 0755 %{buildroot}/%{_libdir}/lib*.so.5* - chmod a-x %{buildroot}/%{_libdir}/ncurses5/lib*.a + chmod 0755 %{buildroot}%{_libdir}/lib*.so.5* + chmod 0755 %{buildroot}%{_libdir}/lib*.so.5* + chmod a-x %{buildroot}%{_libdir}/ncurses5/lib*.a fi test -n "%{buildroot}" || ldconfig -N mkdir -p %{buildroot}%{_defaultdocdir}/ncurses @@ -1093,11 +1092,11 @@ includedir5=%{_incdir}/ncurses5' "$pc" # No test here %else %check -LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir} +LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH -nm -D %{buildroot}/%{_lib}/libncursesw.so.%{basevers} | grep -q in_wch +nm -D %{buildroot}%{_libdir}/libncursesw.so.%{basevers} | grep -q in_wch %if %{with onlytinfo} -nm -D %{buildroot}/%{_lib}/libtinfo.so.%{basevers} | grep -q _nc_read_entry2 +nm -D %{buildroot}%{_libdir}/libtinfo.so.%{basevers} | grep -q _nc_read_entry2 %endif %if 0%{?suse_version} > 1500 pushd test @@ -1177,12 +1176,10 @@ popd %files -n libncurses5 %defattr(-,root,root) -/%{_lib}/lib*.so.5* %{_libdir}/lib*.so.5* %files -n libncurses6 %defattr(-,root,root) -/%{_lib}/lib*.so.6* %{_libdir}/lib*.so.6* %files -n ncurses-devel From 3959cd69abdeb5bb4e45f0e8dae2859facab927058298c528c482e186ab4f2d1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 23 Nov 2020 07:30:37 +0000 Subject: [PATCH 2/4] Update to ncurses 6.2 20201121 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=517 --- ncurses-5.9-ibm327x.dif | 2 +- ncurses-6.2-patches.tar.bz2 | 4 +-- ncurses-6.2.dif | 54 ++++++++++++++++++------------------- ncurses.changes | 28 +++++++++++++++++++ 4 files changed, 58 insertions(+), 30 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index e2df32c..d786803 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 -@@ -17201,8 +17201,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17218,8 +17218,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 03bd68a..806e700 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:a075af082c2a8fc49b74f9a82c1776e45d00fb7997fd1b1a0afbc1f2276759ad -size 1191942 +oid sha256:c0686f6309eacdc2482b693bdafb5097192297ecfdbd3b5a3f74007b59685e17 +size 1317181 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 7088b04..207a1c3 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -5519,12 +5519,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 -@@ -5649,9 +5652,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 -@@ -14578,9 +14581,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -739,7 +739,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, -@@ -12790,6 +12873,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12807,6 +12890,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) @@ -747,7 +747,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, -@@ -12799,7 +12883,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12816,7 +12900,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, @@ -756,7 +756,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, -@@ -17211,7 +17295,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17228,7 +17312,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, @@ -765,7 +765,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 -@@ -17469,7 +17553,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17486,7 +17570,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 181cfb2..5d8f1c0 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Nov 23 07:24:57 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20201121 + + fix some compiler-warnings in experimental Windows-10 driver. + + add the definitions needed in recent configure-check for clang + (report by Steven Pitman). + +------------------------------------------------------------------- +Mon Nov 16 11:06:57 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20201114 + + fix some compiler-warnings in experimental Windows-10 driver. + + modify a check for parameters in terminfo capabilities to handle the + special case where short extended capability strings were not + converted from terminfo to termcap format. + + modify CF_MIXEDCASE_FILENAMES macro, adding darwin as special case + when cross-compiling (report by Eli Rykoff). + +------------------------------------------------------------------- +Mon Nov 9 10:48:44 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20201107 + + update kitty+common -TD + + add putty+screen and putty-screen (suggested by Alexandre Montaron). + + explain in ncurses.3x that functions in the tinfo library do not rely + upon wide-characters (prompted by discussion with Reuben Thomas). + ------------------------------------------------------------------- Mon Nov 2 07:43:02 UTC 2020 - Dr. Werner Fink From f8dbf7f6b49eccf696fa073db7effb16370d1702cb8ef45ca6c67fd938a4c5c9 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 30 Nov 2020 09:00:20 +0000 Subject: [PATCH 3/4] Update to ncurses-6.2 patch 20201128 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=518 --- ncurses-5.9-ibm327x.dif | 2 +- ncurses-6.2-patches.tar.bz2 | 4 +- ncurses-6.2.dif | 122 ++++++++++++++++++------------------ ncurses.changes | 14 +++++ 4 files changed, 78 insertions(+), 64 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index d786803..60835d7 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 -@@ -17218,8 +17218,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17236,8 +17236,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 806e700..8d931c8 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:c0686f6309eacdc2482b693bdafb5097192297ecfdbd3b5a3f74007b59685e17 -size 1317181 +oid sha256:d9962bec509e6f0b019055a4a88088a4bcf7bf7bde9524f4007f5320c8dbd50b +size 1429637 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 207a1c3..49fe7be 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -21,7 +21,7 @@ 19 files changed, 249 insertions(+), 79 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2020-08-31 12:06:53.682411288 +0000 ++++ aclocal.m4 2020-11-30 08:57:40.380788178 +0000 @@ -639,7 +639,7 @@ AC_CHECK_SIZEOF(bool,,[ AC_CACHE_CHECK(for type of bool, cf_cv_type_of_bool,[ rm -f cf_test.out @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -5522,12 +5522,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 -@@ -5652,9 +5655,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 -@@ -14581,9 +14584,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, -@@ -4118,6 +4129,7 @@ mintty+common|shared capabilities for mi +@@ -4134,6 +4145,7 @@ mintty+common|shared capabilities for mi # retrieving the window title, and for setting the window size (i.e., using # "resize -s"), though it does not pass SIGWINCH to the application if the # user resizes the window with the mouse. @@ -470,7 +470,7 @@ teraterm2.3|Tera Term Pro, km, ncv#43, vt@, -@@ -4126,7 +4138,7 @@ teraterm2.3|Tera Term Pro, +@@ -4142,7 +4154,7 @@ teraterm2.3|Tera Term Pro, \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J, cnorm=\E[?25h, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, @@ -479,7 +479,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h$<200/>\E[?5l, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -4459,6 +4471,7 @@ xterm-mono|monochrome xterm, +@@ -4475,6 +4487,7 @@ xterm-mono|monochrome xterm, use=xterm-r6, # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # The name has been changed and some aliases have been removed. @@ -487,7 +487,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, XT, cols#80, it#8, lines#24, ncv@, -@@ -4468,7 +4481,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -4484,7 +4497,7 @@ xterm-xf86-v32|xterm terminal emulator ( 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, @@ -496,7 +496,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -5164,8 +5177,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5180,8 +5193,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -523,7 +523,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5510,7 +5541,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5526,7 +5557,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -532,7 +532,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5761,10 +5792,14 @@ mgt|Multi GNOME Terminal, +@@ -5777,10 +5808,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). @@ -548,7 +548,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6016,14 +6051,14 @@ mlterm3|multi lingual terminal emulator, +@@ -6032,14 +6067,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, @@ -566,7 +566,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=^?, -@@ -6080,6 +6115,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -6096,6 +6131,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". @@ -574,7 +574,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -6091,13 +6127,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6107,13 +6143,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, @@ -592,7 +592,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, -@@ -6108,7 +6145,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6124,7 +6161,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, @@ -601,7 +601,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -6191,8 +6228,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6207,8 +6244,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, @@ -612,7 +612,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~, -@@ -6283,6 +6320,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6299,6 +6336,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -651,7 +651,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, -@@ -6329,7 +6398,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -6345,7 +6414,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -660,7 +660,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 -@@ -6343,12 +6412,12 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6359,12 +6428,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, @@ -675,7 +675,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=, -@@ -7318,7 +7387,7 @@ pty|4bsd pseudo teletype, +@@ -7336,7 +7405,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 @@ -684,7 +684,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7331,6 +7400,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7349,6 +7418,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, @@ -698,7 +698,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, -@@ -7459,7 +7535,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7477,7 +7553,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, @@ -707,7 +707,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, -@@ -7581,6 +7657,13 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -7599,6 +7675,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -721,7 +721,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, -@@ -7668,7 +7751,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -7686,7 +7769,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, @@ -730,7 +730,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, -@@ -9576,7 +9659,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9594,7 +9677,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, @@ -739,7 +739,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, -@@ -12807,6 +12890,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12825,6 +12908,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) @@ -747,7 +747,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, -@@ -12816,7 +12900,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12834,7 +12918,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, @@ -756,7 +756,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, -@@ -17228,7 +17312,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17246,7 +17330,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, @@ -765,7 +765,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 -@@ -17486,7 +17570,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17504,7 +17588,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. @@ -775,7 +775,7 @@ 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 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/Makefile.in 2020-11-30 08:57:40.388788025 +0000 @@ -230,7 +230,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -786,7 +786,7 @@ ./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 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/curses.priv.h 2020-11-30 08:57:40.388788025 +0000 @@ -2277,6 +2277,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); @@ -797,7 +797,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 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/run_cmd.sh 2020-11-30 08:57:40.388788025 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -811,7 +811,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/tinfo/MKfallback.sh 2020-11-30 08:57:40.388788025 +0000 @@ -74,6 +74,12 @@ else tmp_info= fi @@ -844,7 +844,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/tinfo/access.c 2020-11-30 08:57:40.388788025 +0000 @@ -31,6 +31,10 @@ * Author: Thomas E. Dickey * ****************************************************************************/ @@ -888,7 +888,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/tinfo/lib_setup.c 2020-11-30 08:57:40.388788025 +0000 @@ -613,6 +613,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -900,7 +900,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/tinfo/read_entry.c 2020-11-30 08:57:40.388788025 +0000 @@ -552,6 +552,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -918,7 +918,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2020-08-31 12:06:53.690411143 +0000 ++++ ncurses/tinfo/read_termcap.c 2020-11-30 08:57:40.388788025 +0000 @@ -323,14 +323,18 @@ _nc_getent( */ if (fd >= 0) { @@ -965,7 +965,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2020-08-31 12:06:53.690411143 +0000 ++++ progs/Makefile.in 2020-11-30 08:57:40.388788025 +0000 @@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE @@ -985,7 +985,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2020-08-31 12:06:53.690411143 +0000 ++++ test/test.priv.h 2020-11-30 08:57:40.388788025 +0000 @@ -1024,12 +1024,12 @@ extern char *_nc_strstr(const char *, co #endif diff --git a/ncurses.changes b/ncurses.changes index 5d8f1c0..08351e3 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Nov 30 08:39:29 UTC 2020 - Dr. Werner Fink + +- Add ncurses patch 20201128 + + add Smulx to alacritty (Christian Duerr). + + add rep to PuTTY -TD + + add putty+keypad -TD + + add another fflush(stdout) in _nc_flush() to handle time-delays in + the middle of strings such as flash when the application uses + low-level calls rather than curses (cf: 20161217). + + modify configure check for c89/c99 aliases of clang to use its + -std option instead, because some platforms, in particular macOS, + do not provide workable c89/c99 aliases. + ------------------------------------------------------------------- Mon Nov 23 07:24:57 UTC 2020 - Dr. Werner Fink From 8c7105a9ce624e4594551a352b313d03d8b0545478075795e2f4bf0cc6dd9931 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 7 Dec 2020 07:56:20 +0000 Subject: [PATCH 4/4] Update to ncurses-6.2 patch 20201205 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=519 --- ncurses-6.2-patches.tar.bz2 | 4 ++-- ncurses-6.2.dif | 16 ++++++++-------- ncurses.changes | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 8d931c8..d304e9d 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:d9962bec509e6f0b019055a4a88088a4bcf7bf7bde9524f4007f5320c8dbd50b -size 1429637 +oid sha256:4e3632df5d3628ed4e492d2dd27fcad9c0f9ab34d6b16d611a4bcc8e76b9b4dc +size 1439256 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 49fe7be..1222ec6 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -5537,12 +5537,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 -@@ -5667,9 +5670,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < + +- Add ncurses patch 20201205 + + amend build-fixes for gnat 10 to work with certain systems lacking + gprbuild (cf: 20200627). + + eliminate an additional strlen and wsclen. + + eliminate an unnecessary strlen in waddnstr() (suggested by Benjamin + Abendroth). + + modify inopts manpage, separating the items for nodelay and notimeout + (patch by Benno Schulenberg). + + correct mlterm3 kf1-kf4 (Debian #975322) -TD + + add flash to mlterm3 -TD + ------------------------------------------------------------------- Mon Nov 30 08:39:29 UTC 2020 - Dr. Werner Fink