From a9323cc700486ac440bc7911df2ece0c7c5cfbd6 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 17 Jan 2024 16:52:23 +0100
Subject: [PATCH] update to 6.4-20240113

---
 .gitignore        |  4 ++--
 ncurses-kbs.patch | 26 +++++++++++++-------------
 ncurses.spec      |  5 +++--
 sources           |  4 ++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82df4a2..48b2351 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/ncurses-6.4-20231001.tgz
-/ncurses-6.4-20231001.tgz.asc
+/ncurses-6.4-20240113.tgz
+/ncurses-6.4-20240113.tgz.asc
diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch
index 78d91e5..5e0cd14 100644
--- a/ncurses-kbs.patch
+++ b/ncurses-kbs.patch
@@ -1,25 +1,25 @@
-diff -up ncurses-6.4-20230107/misc/terminfo.src.kbs ncurses-6.4-20230107/misc/terminfo.src
---- ncurses-6.4-20230107/misc/terminfo.src.kbs	2023-01-09 14:47:05.097093771 +0100
-+++ ncurses-6.4-20230107/misc/terminfo.src	2023-01-09 14:47:05.100093766 +0100
-@@ -6711,7 +6711,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,
+diff -up ncurses-6.4-20240113/misc/terminfo.src.kbs ncurses-6.4-20240113/misc/terminfo.src
+--- ncurses-6.4-20240113/misc/terminfo.src.kbs	2024-01-17 16:03:13.370075862 +0100
++++ ncurses-6.4-20240113/misc/terminfo.src	2024-01-17 16:05:09.437021498 +0100
+@@ -6728,7 +6728,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,
- 	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	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,
-@@ -6722,7 +6722,7 @@ rxvt-basic|rxvt terminal base (X Window
- 	    %p9%t\016%e\017%;,
+@@ -6740,7 +6740,7 @@ rxvt-basic|rxvt terminal base (X Window
  	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,
+ 	smul=\E[4m, tbc=\E[3g, use=ansi+csr, use=ansi+idl,
+ 	use=ansi+local, 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
-@@ -8523,6 +8523,7 @@ screen.xterm-r6|screen customized for X1
+@@ -8641,6 +8641,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 d6b7580..d22f2c1 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,4 +1,4 @@
-%global revision 20231001
+%global revision 20240113
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 6.4
@@ -153,7 +153,7 @@ for abi in 5 6; do
         %configure $(
             echo $common_options --with-abi-version=$abi
             [ $abi = 5 ] && echo $abi5_options
-            [ $char = widec ] && echo --enable-widec
+            [ $char = widec ] && echo --enable-widec || echo --disable-widec
             [ $progs = yes ] || echo --without-progs
         )
 
@@ -228,6 +228,7 @@ echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so
 rm -f $RPM_BUILD_ROOT%{_bindir}/ncurses*5-config
 rm -f $RPM_BUILD_ROOT%{_libdir}/terminfo
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*_g.pc
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/init.1*
 
 xz NEWS
 
diff --git a/sources b/sources
index 99b0c34..bdb2ce6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ncurses-6.4-20231001.tgz) = 85a3191315ea02c317fa27c097df4a8892001abefd644cb12c6e68af05d7197ac1e2d0a08a8aeac6de2fc6fd98f30e7d643ed20ea95247398e3f24d2c600a0f4
-SHA512 (ncurses-6.4-20231001.tgz.asc) = a05d28871d0b1c7057241779ed111b0dae9423f311866498f656641f6f4d8f85a3d83b14ed59e369fc7d8a6617785b8e0527fe1c51623ff3cce3647de3448fc1
+SHA512 (ncurses-6.4-20240113.tgz) = 45a4fbfa7d6fa51f7226b35698f2ca9b9f5bbbf3243cfee28886751244d238f698d5eaae1498ae9f7965b2d618a669ff827cfbba830e3a52a26bef825dec8ed9
+SHA512 (ncurses-6.4-20240113.tgz.asc) = df94456e47857abfbb47f3a5a69f03b3d418a44542e1fa699c4b13eba812e5a85173cd651d77d07973f8f8d96bc301d7e413ad379f9ba1e9feb434c4da019f13