From 810981d3a68167a7188d66c3c48edd2848215840 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 29 Nov 2022 17:21:17 +0100 Subject: [PATCH] update to 6.3-20221126 --- .gitignore | 4 ++-- ncurses-config.patch | 18 +++++++++--------- ncurses-kbs.patch | 24 ++++++++++++------------ ncurses.spec | 2 +- sources | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index d7bca4b..99505f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/ncurses-6.3-20220501.tgz -/ncurses-6.3-20220501.tgz.asc +/ncurses-6.3-20221126.tgz +/ncurses-6.3-20221126.tgz.asc diff --git a/ncurses-config.patch b/ncurses-config.patch index d6522b2..fc326fc 100644 --- a/ncurses-config.patch +++ b/ncurses-config.patch @@ -1,6 +1,6 @@ -diff -up ncurses-6.3-20220416/misc/gen-pkgconfig.in.config ncurses-6.3-20220416/misc/gen-pkgconfig.in ---- ncurses-6.3-20220416/misc/gen-pkgconfig.in.config 2021-08-07 23:36:33.000000000 +0200 -+++ ncurses-6.3-20220416/misc/gen-pkgconfig.in 2022-04-19 16:11:22.905367677 +0200 +diff -up ncurses-6.3-20221126/misc/gen-pkgconfig.in.config ncurses-6.3-20221126/misc/gen-pkgconfig.in +--- ncurses-6.3-20221126/misc/gen-pkgconfig.in.config 2022-10-08 18:45:20.000000000 +0200 ++++ ncurses-6.3-20221126/misc/gen-pkgconfig.in 2022-11-29 17:04:43.353766420 +0100 @@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; fi @@ -10,9 +10,9 @@ diff -up ncurses-6.3-20220416/misc/gen-pkgconfig.in.config ncurses-6.3-20220416/ do case $opt in -l*) # LIBS is handled specially below -diff -up ncurses-6.3-20220416/misc/ncurses-config.in.config ncurses-6.3-20220416/misc/ncurses-config.in ---- ncurses-6.3-20220416/misc/ncurses-config.in.config 2021-08-07 23:36:14.000000000 +0200 -+++ ncurses-6.3-20220416/misc/ncurses-config.in 2022-04-19 16:14:00.589997289 +0200 +diff -up ncurses-6.3-20221126/misc/ncurses-config.in.config ncurses-6.3-20221126/misc/ncurses-config.in +--- ncurses-6.3-20221126/misc/ncurses-config.in.config 2022-07-26 23:36:28.000000000 +0200 ++++ ncurses-6.3-20221126/misc/ncurses-config.in 2022-11-29 17:06:04.381597412 +0100 @@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@" bindir="@bindir@" @@ -30,7 +30,7 @@ diff -up ncurses-6.3-20220416/misc/ncurses-config.in.config ncurses-6.3-20220416 do case $opt in -specs*) # ignore linker specs-files which were used to build library -@@ -117,13 +116,13 @@ do +@@ -120,13 +119,13 @@ do lib_check=`echo "x$opt" | sed -e 's/^.-L//'` [ -d "$lib_check" ] || continue case "$lib_check" in @@ -46,8 +46,8 @@ diff -up ncurses-6.3-20220416/misc/ncurses-config.in.config ncurses-6.3-20220416 for lib_check in $LIBDIRS do if [ -d "$lib_check" ] -@@ -271,7 +270,6 @@ ENDECHO - echo $INCS +@@ -274,7 +273,6 @@ ENDECHO + echo "$INCS" ;; --libdir) - echo "${libdir}" diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch index 455ae3c..44baedd 100644 --- a/ncurses-kbs.patch +++ b/ncurses-kbs.patch @@ -1,25 +1,25 @@ -diff -up ncurses-6.2-20210306/misc/terminfo.src.kbs ncurses-6.2-20210306/misc/terminfo.src ---- ncurses-6.2-20210306/misc/terminfo.src.kbs 2021-03-11 12:05:15.951585254 +0100 -+++ ncurses-6.2-20210306/misc/terminfo.src 2021-03-11 12:11:24.568964629 +0100 -@@ -6276,7 +6276,7 @@ rxvt-basic|rxvt terminal base (X Window +diff -up ncurses-6.3-20221126/misc/terminfo.src.kbs ncurses-6.3-20221126/misc/terminfo.src +--- ncurses-6.3-20221126/misc/terminfo.src.kbs 2022-11-29 17:11:34.557911207 +0100 ++++ ncurses-6.3-20221126/misc/terminfo.src 2022-11-29 17:13:11.646709427 +0100 +@@ -6685,7 +6685,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, - 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, 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, -@@ -6288,7 +6288,7 @@ rxvt-basic|rxvt terminal base (X Window + 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, +@@ -6696,7 +6696,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, + sgr0=\E[0m\017, smacs=^N, smir=\E[4h, smkx=\E=, smso=\E[7m, + smul=\E[4m, tbc=\E[3g, use=xterm+alt47, use=vt100+enq, - use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, + use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, use=xterm+kbs, # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -7829,7 +7829,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -8351,7 +8351,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, @@ -28,7 +28,7 @@ diff -up ncurses-6.2-20210306/misc/terminfo.src.kbs ncurses-6.2-20210306/misc/te 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~, -@@ -7842,6 +7842,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -8364,6 +8364,7 @@ screen|VT 100/ANSI X3.64 virtual termina smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=vt220+pcedit, use=xterm+alt1049, use=ecma+color, use=vt100+enq, @@ -36,7 +36,7 @@ diff -up ncurses-6.2-20210306/misc/terminfo.src.kbs ncurses-6.2-20210306/misc/te # The bce and status-line entries are from screen 3.9.13 (and require some # changes to .screenrc). screen-bce|VT 100/ANSI X3.64 virtual terminal with bce, -@@ -7957,6 +7958,7 @@ screen.xterm-r6|screen customized for X1 +@@ -8479,6 +8480,7 @@ screen.xterm-r6|screen customized for X1 # on Solaris because Sun's curses implementation gets confused. screen.teraterm|disable ncv in teraterm, ncv#127, diff --git a/ncurses.spec b/ncurses.spec index 8f4340b..eee8c2e 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,4 +1,4 @@ -%global revision 20220501 +%global revision 20221126 Summary: Ncurses support utilities Name: ncurses Version: 6.3 diff --git a/sources b/sources index f404aa2..cb9c18f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ncurses-6.3-20220501.tgz) = 534caf17c9f6ce2f47c27174626239d189f04b8c89e7b9ccab4ebcb60446356d32b96b039debbad746ee56b1bfb58362f76a6ecf2309f2b3b33a42725dd1a926 -SHA512 (ncurses-6.3-20220501.tgz.asc) = de53de53e9128f32f01d1d9e59da21ac7f24e7e0ce8c2b5e6cbfc8032be1e2621414a59ebf3a027075928e6ba8c51f62104ef6acdf2de7b4019c9f07dce3a126 +SHA512 (ncurses-6.3-20221126.tgz) = 1a62091855610d48ac679fb418a7c118f6740c10f88e46e6b57117200eede1a54df61088b98c1079ad89f4cbc57ca0ae8e2066e36adb03d4509c0f2a4c2d49e9 +SHA512 (ncurses-6.3-20221126.tgz.asc) = 93742dcdc32dc66996d086d13613c15c6033de2fea51c933b61e152b9452e6eda9a9f42bf78589b01fe64029e9842864886a7df9920d05192ee74baa5f7b0782