From a2ba8176997585c9f7002d184bd3b94fff98b30f Mon Sep 17 00:00:00 2001 From: qrczak Date: Thu, 21 Mar 2002 16:16:15 +0000 Subject: [PATCH] - Update ncurses-rxvt.patch: add hpa capability description to rxvt. - New ncurses-xterm-home-end.patch: s/kfnd/khome/, s/kslt/kend/ in xterm. - New ncurses-mouse_trafo-warning.patch: Remove a duplicated #define. - Release 25. Changed files: ncurses-mouse_trafo-warning.patch -> 1.1 ncurses-rxvt.patch -> 1.3 ncurses-xterm-home-end.patch -> 1.1 ncurses.spec -> 1.89 --- ncurses-mouse_trafo-warning.patch | 11 +++++++++++ ncurses-rxvt.patch | 11 ++++++++--- ncurses-xterm-home-end.patch | 13 +++++++++++++ ncurses.spec | 6 +++++- 4 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 ncurses-mouse_trafo-warning.patch create mode 100644 ncurses-xterm-home-end.patch diff --git a/ncurses-mouse_trafo-warning.patch b/ncurses-mouse_trafo-warning.patch new file mode 100644 index 0000000..9201312 --- /dev/null +++ b/ncurses-mouse_trafo-warning.patch @@ -0,0 +1,11 @@ +--- ncurses-5.2/include/curses.tail~ Sat Jun 16 13:47:06 2001 ++++ ncurses-5.2/include/curses.tail Thu Mar 21 16:58:13 2002 +@@ -59,8 +59,6 @@ + extern NCURSES_EXPORT(int) mouseinterval (int); + extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW* win,int* y, int* x, bool to_screen); + +-#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen) +- + /* other non-XSI functions */ + + extern NCURSES_EXPORT(int) mcprint (char *, int); /* direct data to printer */ diff --git a/ncurses-rxvt.patch b/ncurses-rxvt.patch index c81bb43..ae19da8 100644 --- a/ncurses-rxvt.patch +++ b/ncurses-rxvt.patch @@ -1,6 +1,11 @@ ---- ncurses-5.2/misc/terminfo.src~ Mon Dec 3 12:39:56 2001 -+++ ncurses-5.2/misc/terminfo.src Mon Dec 3 12:42:24 2001 -@@ -2952,15 +2952,15 @@ +--- ncurses-5.2/misc/terminfo.src~ Thu Mar 21 16:45:39 2002 ++++ ncurses-5.2/misc/terminfo.src Thu Mar 21 16:47:16 2002 +@@ -2948,19 +2948,19 @@ + 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, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h\E[?5l, +- home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ++ home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$, diff --git a/ncurses-xterm-home-end.patch b/ncurses-xterm-home-end.patch new file mode 100644 index 0000000..df8bd4d --- /dev/null +++ b/ncurses-xterm-home-end.patch @@ -0,0 +1,13 @@ +--- ncurses-5.2/misc/terminfo.src~ Thu Mar 21 16:47:16 2002 ++++ ncurses-5.2/misc/terminfo.src Thu Mar 21 16:50:35 2002 +@@ -2550,8 +2550,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=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, ++ kend=\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, + rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>, sc=\E7, diff --git a/ncurses.spec b/ncurses.spec index 9afdd23..e10c046 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -11,7 +11,7 @@ Summary(pt_BR): Biblioteca de controle de terminal curses Summary(tr): Terminal kontrol kitaplýðý Name: ncurses Version: 5.2 -Release: 24 +Release: 25 License: distributable Group: Libraries Source0: ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz @@ -26,6 +26,8 @@ Patch5: %{name}-xterm_hpa_fix.patch Patch6: %{name}-rxvt.patch Patch7: %{name}-meta.patch Patch8: %{name}-ac_hack.patch +Patch9: %{name}-xterm-home-end.patch +Patch10: %{name}-mouse_trafo-warning.patch BuildRequires: sharutils BuildRequires: sed %{!?_without_cxx:BuildRequires: libstdc++-devel} @@ -212,6 +214,8 @@ sh %{SOURCE2} %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build CFLAGS="%{rpmcflags} -DPURE_TERMINFO" -- 2.44.0