From 3253c1a7bc753bacbcd339d0aab3e9ed106353bd51549fa751940942716ff70d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 14 Nov 2023 20:41:44 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/ncurses revision 250 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=dedfdd2a35550123412500872bacacf7 --- ncurses-5.9-ibm327x.dif | 2 +- ncurses-6.4-patches.tar.bz2 | 4 +-- ncurses-6.4.dif | 62 ++++++++++++++++++------------------- ncurses.changes | 27 ++++++++++++++++ ncurses.spec | 8 ++--- 5 files changed, 65 insertions(+), 38 deletions(-) diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 78838ab..e10bb9a 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 -@@ -18105,8 +18105,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -18046,8 +18046,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 bb878a7..8e4fc27 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:b8940c0679a5a12464d504e2899a93f7918ba87412f9bd4ae2cf68fc77c6a6f7 -size 1641956 +oid sha256:1402f633b17e96c0e6201bb0994b8acb48339f2693bb22b63354ec6bf6d98468 +size 1749091 diff --git a/ncurses-6.4.dif b/ncurses-6.4.dif index aa654b7..231fc35 100644 --- a/ncurses-6.4.dif +++ b/ncurses-6.4.dif @@ -144,8 +144,8 @@ esac done --- configure -+++ configure 2023-10-23 07:50:44.755971468 +0000 -@@ -6442,7 +6442,7 @@ echo $ECHO_N "checking for an rpath opti ++++ configure 2023-11-13 08:41:15.954170137 +0000 +@@ -6441,7 +6441,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; (linux*|gnu*|k*bsd*-gnu|freebsd*) @@ -154,7 +154,7 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -6815,8 +6815,8 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat +@@ -6814,8 +6814,8 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat else cf_cv_shared_soname='`basename $@`' fi @@ -165,7 +165,7 @@ ;; (mingw*msvc*) cf_cv_shlib_version=msvcdll -@@ -8055,7 +8055,7 @@ echo "${ECHO_T}$with_pcre2" >&6 +@@ -8054,7 +8054,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 -@@ -15245,12 +15245,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 -@@ -15384,9 +15384,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\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, -@@ -6860,8 +6889,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6849,8 +6878,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~, -@@ -6949,6 +6978,38 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -6938,6 +6967,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, -@@ -7013,7 +7074,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -7001,7 +7062,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, -@@ -8129,7 +8190,7 @@ pty|4bsd pseudo teletype, +@@ -8098,7 +8159,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, -@@ -8141,6 +8202,13 @@ eterm|GNU Emacs term.el terminal emulati +@@ -8110,6 +8171,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, -@@ -8389,11 +8457,18 @@ screen.xterm-xfree86|screen.xterm-new|sc +@@ -8356,11 +8424,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. -@@ -8484,7 +8559,7 @@ screen2|VT 100/ANSI X3.64 virtual termin +@@ -8449,7 +8524,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, -@@ -10461,7 +10536,7 @@ hp700-wy|HP 700/41 emulating Wyse30, +@@ -10416,7 +10491,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,16 +698,16 @@ 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, -@@ -18115,7 +18190,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -18056,7 +18131,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, -ibm3151|IBM 3151 display, +ibm3151|i3151|IBM 3151 display, - is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, + 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 -@@ -18373,7 +18448,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -18301,7 +18376,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 42dab96..9348fa6 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Nov 13 08:32:53 UTC 2023 - Dr. Werner Fink + +- Add ncurses patch 20231111 + + used "infocmp -u" to help trim redundant capabilities -TD + + add limit checks in infocmp needed when processing extended + capabilities with the "-u" option. + + fix inconsistent sort-order in see-also sections of manpages. + + fix a few compiler warnings for Solaris 10. + + modify endwin() to return an error if it is called again without an + intervening screen update (report by Rajeev Pillai, NetBSD #57592). +- Add ncurses patch 20231104 + + modify reset command to avoid altering clocal if the terminal uses a + modem (prompted by discussion with Werner Fink, Michal Suchanek, + OpenSUSE #1201384, Debian #60377). + + build-fixes for --with-caps variations. + + correct a couple of section-references in INSTALL +- Add ncurses patch 20231028 + + move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as + fe/fd capabilities, like vim (vim-pr #13440). + + modify --with-pkg-config-libdir option to make "libdir" the default, + as documented, rather than "auto" (report by Branden Robinson). + + improve messages from configure script (patches by Branden Robinson). +- Fix offsets of patches + * ncurses-5.9-ibm327x.dif + * ncurses-6.4.dif + ------------------------------------------------------------------- Mon Oct 23 07:49:13 UTC 2023 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index f80a63f..f02e269 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -350,10 +350,10 @@ find -name '*.orig' -delete # separate tarball rm -fr tack mv tack-* tack -%patch1 -p0 -b .327x -%patch2 -p0 -b .hs -%patch0 -p0 -b .p0 -%patch3 -p1 +%patch -P1 -p0 -b .327x +%patch -P2 -p0 -b .hs +%patch -P0 -p0 -b .p0 +%patch -P3 -p1 %build #