- up to 20210731

diff --git a/ncurses-gnome-terminal.patch b/ncurses-gnome-terminal.patch
index c1c4d2e8774b01522a4f3bb98b543267287563d2..81e18569c0853ee11e74d991043c5397402d49b3 100644 (file)
--- a/ncurses-gnome-terminal.patch
+++ b/ncurses-gnome-terminal.patch
@@ -1,13 +1,11 @@
-diff -urNp -x '*.orig' ncurses-6.2-20210123.org/misc/terminfo.src ncurses-6.2-20210123/misc/terminfo.src
---- ncurses-6.2-20210123.org/misc/terminfo.src 2021-03-21 12:52:56.867931009 +0100
-+++ ncurses-6.2-20210123/misc/terminfo.src     2021-03-21 12:52:57.068931009 +0100
-@@ -5569,7 +5569,8 @@ gnome-rh62|Gnome terminal,
+--- ncurses-6.2-20210731/misc/terminfo.src.orig        2021-08-03 10:54:27.561229179 +0200
++++ ncurses-6.2-20210731/misc/terminfo.src     2021-08-03 10:55:21.246238172 +0200
+@@ -5780,7 +5780,7 @@ gnome-rh62|Gnome terminal,
+ #     xterm alternate screen controls do not restore cursor position properly
  #     it hangs in tack after running function-keys test.
  gnome-rh72|GNOME Terminal,
-       bce, km@,
--      civis=\E[?25l, cnorm=\E[?25h, kdch1=\E[3~, kf1=\EOP,
-+      civis=\E[?25l, cnorm=\E[?25h, kbs=\177, khome=\E[1~, kend=\E[4~,
-+      kdch1=\E[3~, kf1=\EOP,
-       kf2=\EOQ, kf3=\EOR, kf4=\EOS, rmam=\E[?7l,
+-      bce, km@,
++      bce, km@, kbs=\177, khome=\E[1~, kend=\E[4~,
+       kdch1=\E[3~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+       rmam=\E[?7l,
        sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e
-           \017%;,

diff --git a/ncurses-xterm-home-end.patch b/ncurses-xterm-home-end.patch
index a37a74a78ece03c4ce521c771992b868c1207abf..8d6b1679f77f603f7baab3ace6df5b26e333a126 100644 (file)
--- a/ncurses-xterm-home-end.patch
+++ b/ncurses-xterm-home-end.patch
@@ -1,13 +1,17 @@
---- ncurses-5.6/misc/terminfo.src.orig 2006-12-30 17:00:26.335540848 +0100
-+++ ncurses-5.6/misc/terminfo.src      2006-12-30 17:02:11.377526850 +0100
-@@ -2910,8 +2910,8 @@
-       kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-       kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~,
-       kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
--      kfnd=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
--      kslt=\E[4~, meml=\El, memu=\Em, rc=\E8, rev=\E[7m, ri=\EM,
-+      khome=\EOH, kfnd=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
-+      kend=\EOF, kslt=\E[4~, meml=\El, memu=\Em, rc=\E8, rev=\E[7m, ri=\EM,
-       rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l,
-       rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
+--- ncurses-6.2-20210731/misc/terminfo.src.orig        2021-08-03 10:46:24.616144894 +0200
++++ ncurses-6.2-20210731/misc/terminfo.src     2021-08-03 10:53:55.626899023 +0200
+@@ -4655,12 +4655,12 @@ xterm-r6|xterm X11R6 version,
+       el=\E[K, enacs=\E)0, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL,
+       il1=\E[L, ind=\n,
+       is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8,
+-      kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\E[11~,
++      kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, 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~, kf2=\E[12~, kf20=\E[34~,
+       kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
+-      kf8=\E[19~, kf9=\E[20~, kmous=\E[M, meml=\El, memu=\Em,
++      kf8=\E[19~, kf9=\E[20~, khome=\EOH, kmous=\E[M, meml=\El, memu=\Em,
+       rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8,
+       rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
        rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, sc=\E7,

diff --git a/ncurses.spec b/ncurses.spec
index 71f967341019544be754660be8d172f2878a7680..0b84b247809b22e07a90a8efc7626afcc9f13d76 100644 (file)
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -9,7 +9,7 @@
 %endif
 
 %define        basever 6.2
-%define        patchlevel      20210123
+%define        patchlevel      20210731
 Summary:       curses terminal control library
 Summary(de.UTF-8):     curses-Terminal-Control-Library
 Summary(es.UTF-8):     Biblioteca de control de terminal curses
@@ -21,11 +21,11 @@ Summary(tr.UTF-8):  Terminal kontrol kitaplığı
 Summary(uk.UTF-8):     ncurses - нова бібліотека керування терміналами
 Name:          ncurses
 Version:       %{basever}.%{patchlevel}
-Release:       3
+Release:       1
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.invisible-island.net/ncurses/current/%{name}-%{basever}-%{patchlevel}.tgz
-# Source0-md5: c8dfd91008cfe33d5122330231077cfa
+# Source0-md5: dfc1239e003b0e330f9d7818afbcb1ce
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3b05ee835dc20c306e9af2a9d3fbf1f1
 Patch100:      %{name}-xterm-home-end.patch